diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index be8b6ab0..06176413 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -493,7 +493,6 @@ void Human::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data p->set_user_data(user_data); } p->set_vip(vip); - p->set_sdmg(sdmg); p->set_kill_count(stats.kills); if (emoji1 != 0) { p->set_emoji1(emoji1); diff --git a/server/gameserver/human.h b/server/gameserver/human.h index df5de64b..915dd7b1 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -175,7 +175,6 @@ class Human : public Creature int energy_shield = 0; int max_energy_shield = 0; int vip = 0; - int sdmg = 0; long long join_frameno = 0; long long enable_frameno = 0; int emoji1 = 0; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index a9060a3f..0e158e1d 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -229,10 +229,6 @@ message MFPlayerFull optional bool dead = 7; //是否已死亡 optional bool downed = 8; //是否跌倒 optional bool disconnected = 9; //是否断网 - optional int32 anim_type = 10; // - optional int32 anim_seq = 11; // - //optional int32 action_type = 12; //0: none 1:reload 2:useitem 3:relive 4: rescue - //optional int32 action_duration = 22; //持续时间毫秒 repeated MFSkin skin = 13; //皮肤id optional int32 backpack = 14; //背包 optional int32 helmet = 16; //头盔 @@ -240,7 +236,6 @@ message MFPlayerFull optional MFWeapon weapon = 18; //武器 optional int32 energy_shield = 19; //能量护盾 optional int32 vip = 20; //vip - optional int32 sdmg = 21; optional int32 max_energy_shield = 22; //最大能量护盾 repeated MFBodyState states = 23; //角色状态 optional int32 kill_count = 24; //击杀数 @@ -575,8 +570,6 @@ message MFShot { optional int32 player_id = 1; //玩家id optional MFWeapon weapon = 2; //武器id - optional bool offhand = 3; //没用的 - optional int32 bullskin = 4; //没用到 optional int32 hole = 5 [default = 0]; //炮孔(从0开始) }