diff --git a/game-server/app/services/guildActivityService.ts b/game-server/app/services/guildActivityService.ts
index ce111206e..34cdb613f 100644
--- a/game-server/app/services/guildActivityService.ts
+++ b/game-server/app/services/guildActivityService.ts
@@ -4,7 +4,7 @@ import { reduceCe } from "../pubUtils/util";
 import { GUILDACTIVITY } from "../pubUtils/dicParam";
 import { gameData, getGuildAuctionRewards, getCityActivityRewards } from "../pubUtils/data";
 import { getCurDay, nowSeconds, getTimeFun } from "../pubUtils/timeUtil";
-import { GUILD_ACTIVITY_STATUS, GET_POINT_WAYS, GUILD_ACTIVITY_TYPE, REDIS_KEY, AUCTION_SOURCE, MAIL_TYPE, CITY_STATUS } from "../consts";
+import { GUILD_ACTIVITY_STATUS, GET_POINT_WAYS, GUILD_ACTIVITY_TYPE, REDIS_KEY, AUCTION_SOURCE, MAIL_TYPE, CITY_STATUS, DEBUG_MAGIC_WORD } from "../consts";
 import { Record, UserGuildActivityRecModel } from "../db/UserGuildActivityRec";
 import { GateMembersRec, CityParam, Member, WoodenHorse } from "../domain/battleField/guildActivity";
 import { DicGuildActivity } from "../pubUtils/dictionary/DicGuildActivity";
@@ -21,6 +21,7 @@ import { DicCityActivity } from "../pubUtils/dictionary/DicCityActivity";
 import { GateActivityObject, CityActivityObject, RaceActivityObject } from "./guildActivityObjService";
 import { Rank } from "./rankService";
 import { BossInstanceModel } from "../db/BossInstance";
+import { UserGuildModel } from "../db/UserGuild";
 
 let gateActivityObj: GateActivityObject;
 let cityActivityObj: CityActivityObject;
@@ -506,6 +507,13 @@ export async function autoDeclare(serverId: number) {
  * @param sourceCode 活动唯一code
  */
 export async function participants(guildCode: string, sourceType: number, sourceCode: string) {
+    if(sourceCode == DEBUG_MAGIC_WORD) {
+        let userGuilds = await UserGuildModel.getListByGuild(guildCode);
+        return userGuilds.map(cur => {
+            return { roleId: cur.roleId, job: cur.job }
+        })
+    }
+
     if (sourceType == AUCTION_SOURCE.BOSS) {
         let rec = await BossInstanceModel.findBySourceCode(guildCode, sourceCode);
         if (!rec) return [];
diff --git a/shared/resource/jsons/dic_zyz_auction_basicPool.json b/shared/resource/jsons/dic_zyz_auction_basicPool.json
index 3effe6aa6..3d5d5e5ed 100644
--- a/shared/resource/jsons/dic_zyz_auction_basicPool.json
+++ b/shared/resource/jsons/dic_zyz_auction_basicPool.json
@@ -11,7 +11,7 @@
     {
         "id": 2,
         "name": "国士将魂",
-        "rewardBasicPool": "21008&60&1|21010&60&1|21011&60&1|21012&60&1|21014&60&1|21025&60&1|21026&60&1|21027&60&1|21028&60&1|21029&60&1|21030&60&1|21036&60&1|21037&60&1|21038&60&1|21039&60&1|21050&60&1|21051&60&1|21052&60&1|21053&60&1|21064&60&1",
+        "rewardBasicPool": "21008&60&1|21010&60&1|21011&60&1|21012&60&1|21014&60&1|21025&60&1|21026&60&1|21027&60&1|21028&60&1|21029&60&1|21030&60&1|21036&60&1|21037&60&1|21038&60&1|21050&60&1|21051&60&1|21052&60&1|21053&60&1|21064&60&1",
         "totalCount": 22,
         "itid": 25,
         "basePrice": "31002&1500",
diff --git a/shared/resource/jsons/dic_zyz_gk_armyboss.json b/shared/resource/jsons/dic_zyz_gk_armyboss.json
index 790800dff..41c68652f 100644
--- a/shared/resource/jsons/dic_zyz_gk_armyboss.json
+++ b/shared/resource/jsons/dic_zyz_gk_armyboss.json
@@ -3,7 +3,7 @@
         "war_id": 8001,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "10级张角",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -14,13 +14,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8002,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "10级董卓",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -31,13 +32,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8003,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "10级吕布",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -48,13 +50,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8004,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "10级狼王",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -65,13 +68,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8005,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "20级张角",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -82,13 +86,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8006,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "20级董卓",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -99,13 +104,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8007,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "20级吕布",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -116,13 +122,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8008,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "20级狼王",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -133,13 +140,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8009,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "30级张角",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -150,13 +158,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8010,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "30级董卓",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -167,13 +176,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8011,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "30级吕布",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -184,13 +194,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8012,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "30级狼王",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -201,13 +212,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8013,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "40级张角",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -218,13 +230,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8014,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "40级董卓",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -235,13 +248,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8015,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "40级吕布",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -252,13 +266,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8016,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "40级狼王",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -269,13 +284,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8017,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "50级张角",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -286,13 +302,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8018,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "50级董卓",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -303,13 +320,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8019,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "50级吕布",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -320,13 +338,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8020,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "50级狼王",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -337,13 +356,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8021,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "60级张角",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -354,13 +374,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8022,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "60级董卓",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -371,13 +392,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8023,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "60级吕布",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -388,13 +410,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8024,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "60级狼王",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -405,13 +428,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8025,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "70级张角",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -422,13 +446,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8026,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "70级董卓",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -439,13 +464,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8027,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "70级吕布",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -456,13 +482,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8028,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "70级狼王",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -473,13 +500,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8029,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "80级张角",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -490,13 +518,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8030,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "80级董卓",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -507,13 +536,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8031,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "80级吕布",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -524,13 +554,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8032,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "80级狼王",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -541,13 +572,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8033,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "90级张角",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -558,13 +590,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8034,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "90级董卓",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -575,13 +608,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8035,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "90级吕布",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -592,13 +626,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8036,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "90级狼王",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -609,13 +644,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8037,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "100级张角",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -626,13 +662,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8038,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "100级董卓",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -643,13 +680,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8039,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "100级吕布",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -660,13 +698,14 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&1",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     },
     {
         "war_id": 8040,
         "dispatchJsonId": 8001,
         "bg_img_id": 550,
-        "warType": 11,
+        "warType": 20,
         "gk_name": "100级狼王",
         "lvLimted": 1,
         "turnLimted": 20,
@@ -677,6 +716,7 @@
         "iconName": "怒狼洞穴",
         "iconInMap": "city&2",
         "bossSkill": "18&19",
-        "heroId": 58
+        "heroId": 22,
+        "needPrepare": 1
     }
 ]
\ No newline at end of file