diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index cd0734b0..537c5bb3 100755 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -142,6 +142,12 @@ enum BuffEffectType_e kBET_HunLuan = 23, //混乱,在烟雾弹中不自动瞄准 kBET_Jump = 24, //跳伞中 kBET_ThroughWall = 25, //穿墙 + kBET_InGrass = 26, //在草丛 + kBET_InWater = 27, //在水里 + kBET_InIce = 27, //在冰里 + kBET_Driver = 28, //驾驶中 + kBET_Passenger = 29, //乘座 + kBET_End }; diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 5c375f67..9bb1d348 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -1136,6 +1136,10 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) #ifdef DEBUG room->CheckPartObjects(); #endif + #if 1 + real_dead = true; + OnDie(); + #else int max_revive_times = MetaMgr::Instance()->GetSysParamAsInt("max_revive_times", 1); if (weapon_id != VW_Spectate && dead_times <= max_revive_times && @@ -1146,6 +1150,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) real_dead = true; OnDie(); } + #endif DoGetDown(); } }