diff --git a/server/gameserver/human.h b/server/gameserver/human.h index 443688f9..1688e211 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -118,6 +118,7 @@ class Human : public Creature int account_registertime = 0; int channel = 0; std::string hero_uniid; + long long battle_uuid = 0; HumanBehavior behavior; MetaData::Player* meta = nullptr; MetaData::Equip* helmet_meta = nullptr; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index b2c58f89..5bdfd6f4 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -1183,6 +1183,7 @@ message SMJoinedNotify optional bool elo_start = 6; //目前没用到 optional int32 error_code = 7; //错误 1:服务器维护中 2:服务器繁忙请稍后再进入 + optional int32 error_msg = 10; //错误描述 optional int32 room_mode = 8; //0:吃鸡模式 1:僵尸模式 optional string server_info = 9; //服务器信息(重连时使用) 已经废弃移动到SMMapInfo diff --git a/server/tools/protobuild/out/cs_proto.proto b/server/tools/protobuild/out/cs_proto.proto index fccf8775..16afff47 100644 --- a/server/tools/protobuild/out/cs_proto.proto +++ b/server/tools/protobuild/out/cs_proto.proto @@ -943,6 +943,7 @@ message SMJoinedNotify optional bool elo_start = 6; optional int32 error_code = 7; + optional int32 error_msg = 10; optional int32 room_mode = 8; optional string server_info = 9;