diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc
index b7012fb..da9f9b9 100644
--- a/server/imserver/guild.cc
+++ b/server/imserver/guild.cc
@@ -278,9 +278,9 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
 
     cs::SMGuildAgree respmsg;
     if (IsFull()) {
-        SendErrorMsg(hdr.socket_handle, forward_msg->context(), "战斗人数已达上限");
+        SendErrorMsg(hdr.socket_handle, forward_msg->context(), "战队人数已达上限");
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("战斗人数已达上限");
+        respmsg.set_errmsg("战队人数已达上限");
         GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
                                                 forward_msg->context(),
                                                 respmsg);
@@ -359,7 +359,7 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
                               );
                          guild->ClearApplyBySenderId(msg_copy->apply().base_data().account_id());
                      } else {
-                         guild->SendErrorMsg(param.param2, forward_msg_copy->context(), "对方已经有战斗");
+                         guild->SendErrorMsg(param.param2, forward_msg_copy->context(), "对方已经有战队");
                      }
                  }
              }
@@ -943,9 +943,9 @@ void Guild::_CMGuildAgreeInvite(f8::MsgHdr& hdr, const cs::CMGuildAgreeInvite& m
         return;
     }
     if (IsFull()) {
-        SendErrorMsg(hdr.socket_handle, forward_msg->context(), "战斗人数已达上限");
+        SendErrorMsg(hdr.socket_handle, forward_msg->context(), "战队人数已达上限");
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("战斗人数已达上限");
+        respmsg.set_errmsg("战队人数已达上限");
         GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
                                                 forward_msg->context(),
                                                 respmsg);
@@ -1467,9 +1467,9 @@ void Guild::GuildAgreeCb(int socket_handle, const ss::MFIMMsgConext& context, co
         return;
     }
     if (IsFull()) {
-        SendErrorMsg(socket_handle, context, "战斗人数已达上限");
+        SendErrorMsg(socket_handle, context, "战队人数已达上限");
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("战斗人数已达上限");
+        respmsg.set_errmsg("战队人数已达上限");
         GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
                                                 context,
                                                 respmsg);
diff --git a/server/imserver/guildmgr.cc b/server/imserver/guildmgr.cc
index 3b75199..404b116 100644
--- a/server/imserver/guildmgr.cc
+++ b/server/imserver/guildmgr.cc
@@ -48,7 +48,7 @@ public:
             hdr.user_data = &forward_msg;
             if (guild->Status() == kGuildDismissed) {
                 cs::SMShowErrorMsg notifymsg;
-                notifymsg.set_msg("战斗已解散");
+                notifymsg.set_msg("战队已解散");
                 GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
                                                         forward_msg.context(),
                                                         notifymsg);
diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 62d8a31..3a14dfd 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -655,7 +655,7 @@ void Player::_CMGuildInfo(f8::MsgHdr& hdr, const cs::CMGuildInfo& msg)
     cs::SMGuildInfo respmsg;
     if (msg.guild_id() == 0 && GuildId() == 0) {
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("你还没有战斗");
+        respmsg.set_errmsg("你还没有战队");
         SendMsg(respmsg);
         return;
     }
@@ -666,16 +666,16 @@ void Player::_CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg)
 {
     cs::SMGuildCreate respmsg;
     if (GuildId() != 0) {
-        ShowErrorMsg("你已经有战斗");
+        ShowErrorMsg("你已经有战队");
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("你已经有战斗");
+        respmsg.set_errmsg("你已经有战队");
         SendMsg(respmsg);
         return;
     }
     if (role_data.today_create_guild_times >= MAX_DAILY_CREATE_GUILD_TIMES) {
-        ShowErrorMsg("今日创建战斗次数已达上限");
+        ShowErrorMsg("今日创建战队次数已达上限");
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("今日创建战斗次数已达上限");
+        respmsg.set_errmsg("今日创建战队次数已达上限");
         SendMsg(respmsg);
         return;
     }
@@ -757,14 +757,14 @@ void Player::_CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg)
     cs::SMGuildJoin respmsg;
     if (msg.guild_id() == 0 && GuildId() == 0) {
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("你已经有战斗");
+        respmsg.set_errmsg("你已经有战队");
         SendMsg(respmsg);
         return;
     }
     if (role_data.today_apply_guild_times >= MAX_DAILY_APPPLY_GUILD_TIMES) {
-        ShowErrorMsg("今日申请战斗次数已达上限");
+        ShowErrorMsg("今日申请战队次数已达上限");
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("今日申请战斗次数已达上限");
+        respmsg.set_errmsg("今日申请战队次数已达上限");
         SendMsg(respmsg);
         return;
     }
@@ -790,7 +790,7 @@ void Player::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
     cs::SMGuildAgree respmsg;
     if (GuildId() == 0) {
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("你还没有战斗");
+        respmsg.set_errmsg("你还没有战队");
         SendMsg(respmsg);
         return;
     }
@@ -802,7 +802,7 @@ void Player::_CMGuildRefuse(f8::MsgHdr& hdr, const cs::CMGuildRefuse& msg)
     cs::SMGuildRefuse respmsg;
     if (GuildId() == 0) {
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("你还没有战斗");
+        respmsg.set_errmsg("你还没有战队");
         SendMsg(respmsg);
         return;
     }
@@ -814,7 +814,7 @@ void Player::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg)
     cs::SMGuildKick respmsg;
     if (GuildId() == 0) {
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("你还没有战斗");
+        respmsg.set_errmsg("你还没有战队");
         SendMsg(respmsg);
         return;
     }
@@ -836,7 +836,7 @@ void Player::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg)
     cs::SMGuildDismiss respmsg;
     if (GuildId() == 0) {
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("你还没有战斗");
+        respmsg.set_errmsg("你还没有战队");
         SendMsg(respmsg);
         return;
     }
@@ -848,7 +848,7 @@ void Player::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg)
     cs::SMGuildChange respmsg;
     if (GuildId() == 0) {
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("你还没有战斗");
+        respmsg.set_errmsg("你还没有战队");
         SendMsg(respmsg);
         return;
     }
@@ -992,7 +992,7 @@ void Player::_CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& ms
     cs::SMGuildMemberList respmsg;
     if (GuildId() == 0) {
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("你还没有战斗");
+        respmsg.set_errmsg("你还没有战队");
         SendMsg(respmsg);
         return;
     }
@@ -1014,7 +1014,7 @@ void Player::_CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg)
     cs::SMGuildApplyList respmsg;
     if (GuildId() == 0) {
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("你还没有战斗");
+        respmsg.set_errmsg("你还没有战队");
         SendMsg(respmsg);
         return;
     }
@@ -1028,7 +1028,7 @@ void Player::_CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob
     cs::SMGuildMemberSetJob respmsg;
     if (GuildId() == 0) {
         respmsg.set_errcode(1);
-        respmsg.set_errmsg("你还没有战斗");
+        respmsg.set_errmsg("你还没有战队");
         SendMsg(respmsg);
         return;
     }
@@ -1044,7 +1044,7 @@ void Player::_CMGuildAgreeInvite(f8::MsgHdr& hdr, const cs::CMGuildAgreeInvite&
             SendMsg(respmsg);
         } else {
             respmsg.set_errcode(1);
-            respmsg.set_errmsg("你已经有战斗");
+            respmsg.set_errmsg("你已经有战队");
             SendMsg(respmsg);
         }
         return;
diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc
index cc9e8fe..c8b879c 100644
--- a/server/rankserver/guildmgr.cc
+++ b/server/rankserver/guildmgr.cc
@@ -149,7 +149,7 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
     TypeConvert::Convert(request, guild);
     if (guild->guild_name().empty()) {
         request->resp_xobj->SetVal("errcode", 2);
-        request->resp_xobj->SetVal("errmsg", "战斗名字不能为空");
+        request->resp_xobj->SetVal("errmsg", "战队名字不能为空");
         delete guild;
         return;
     }
@@ -161,7 +161,7 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
                        guild->guild_name()
                        )) {
         request->resp_xobj->SetVal("errcode", 3);
-        request->resp_xobj->SetVal("errmsg", "战斗名已经存在");
+        request->resp_xobj->SetVal("errmsg", "战队名已经存在");
         delete guild;
         return;
     }
@@ -179,13 +179,13 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
     }
     if (MetaMgr::Instance()->HasDirtyWord(guild->guild_name())) {
         request->resp_xobj->SetVal("errcode", 4);
-        request->resp_xobj->SetVal("errmsg", "战斗名含有违禁字符");
+        request->resp_xobj->SetVal("errmsg", "战队名含有违禁字符");
         delete guild;
         return;
     }
     if (MetaMgr::Instance()->HasDirtyWord(guild->guild_declaration())) {
         request->resp_xobj->SetVal("errcode", 5);
-        request->resp_xobj->SetVal("errmsg", "战斗宣言含有违禁字符");
+        request->resp_xobj->SetVal("errmsg", "战队宣言含有违禁字符");
         delete guild;
         return;
     }
@@ -369,7 +369,7 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
     if (guild->guild_declaration() != guild_declaration) {
         if (MetaMgr::Instance()->HasDirtyWord(guild_declaration)) {
             request->resp_xobj->SetVal("errcode", 1);
-            request->resp_xobj->SetVal("errmsg", "战斗宣言含有违禁字符");
+            request->resp_xobj->SetVal("errmsg", "战队宣言含有违禁字符");
             return;
         }
     }
@@ -380,7 +380,7 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
     }
     if (guild_name.empty()) {
         request->resp_xobj->SetVal("errcode", 1);
-        request->resp_xobj->SetVal("errmsg", "战斗名不能为空");
+        request->resp_xobj->SetVal("errmsg", "战队名不能为空");
         return;
     }
     if (GetGuildByName(guild->_gameid(),
@@ -389,7 +389,7 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
                        guild->_name_ext2(),
                        guild_name)) {
         request->resp_xobj->SetVal("errcode", 1);
-        request->resp_xobj->SetVal("errmsg", "战斗名已经存在");
+        request->resp_xobj->SetVal("errmsg", "战队名已经存在");
         return;
     }
     if (a8::GetUtf8Length(guild_name.c_str()) > MAX_GUILD_NAME_LEN) {
@@ -406,7 +406,7 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
     }
     if (MetaMgr::Instance()->HasDirtyWord(guild_name)) {
         request->resp_xobj->SetVal("errcode", 1);
-        request->resp_xobj->SetVal("errmsg", "战斗名含有违禁字符");
+        request->resp_xobj->SetVal("errmsg", "战队名含有违禁字符");
         return;
     }
 
@@ -525,13 +525,13 @@ void GuildMgr::__GenTestData(f8::JsonHttpRequest* request)
              {
               gameid,
               guild_id,
-              a8::Format("测试战斗%d", { i + 1}),
+              a8::Format("测试战队%d", { i + 1}),
               1,
               1,
               1,
               0,
               "",
-              "战斗宣言",
+              "战队宣言",
               "",
               1,
               "1",