server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2021-09-13 10:20:58 +00:00
parent 1e4cfa3363
commit e4ee1dd69f
5 changed files with 448 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/buff.cc
View File

@ -361,15 +361,12 @@ void Buff::ProcSprint()
Buff* buff = (Buff*)param.sender.GetUserData();
std::set<int>* hited_objects = (std::set<int>*)param.param1.GetUserData();
std::set<Creature*> enemys;
buff->owner->GetHitEnemys(enemys, buff->meta->param4);
buff->owner->GetHitEnemys(enemys, buff->meta->param2);
for (auto& enemy : enemys) {
if (!buff->meta->int_param5 && enemy->IsEntityType(ET_Car)) {
if (enemy->IsEntityType(ET_Car)) {
continue;
}
if (enemy->IsHuman() && enemy->AsHuman()->GetCar()) {
continue;
}
if (hited_objects->find(enemy->GetUniId()) == hited_objects->end()) {
if (hited_objects->find(enemy->GetUniId()) != hited_objects->end()) {
hited_objects->insert(enemy->GetUniId());
for (int buff_id : buff->meta->param3_int_list) {
enemy->TryAddBuff(buff->owner, buff_id);

9
server/gameserver/framedata.cc
View File

@ -82,15 +82,6 @@ void FrameData::ClearFrameData(Human* hum)
if (!chged_weapon_ammo_.empty()) {
chged_weapon_ammo_.clear();
}
if (!chged_level_.empty()) {
chged_level_.clear();
}
if (!chged_exp_.empty()) {
chged_exp_.clear();
}
if (!chged_race_.empty()) {
chged_race_.clear();
}
if (!dead_alive_objs_.empty()) {
dead_alive_objs_.clear();
}

3
server/gameserver/framedata.h
View File

@ -35,9 +35,6 @@ class FrameData
std::vector<int> chged_skill_curr_times_;
std::vector<int> chged_items_;
std::vector<int> chged_weapon_ammo_;
std::vector<int> chged_level_;
std::vector<int> chged_exp_;
std::vector<int> chged_race_;
std::vector<int> dead_alive_objs_;
std::vector<int> chged_cars_;
std::vector<int> chged_props_;

339
server/gameserver/framemaker.cc
View File

@ -70,15 +70,60 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
{
FrameData* framedata = &hum->framedata_;
cs::SMUpdate* msg = new cs::SMUpdate;
{
Room* room = hum->room;
msg->set_frameno(room->GetFrameNo() / 2);
if (room->GetGasData().gas_mode == GasJump) {
cs::MFPlane* p = msg->mutable_plane();
TypeConvert::ToPb(room->plane.start_point, p->mutable_start_point());
TypeConvert::ToPb(room->plane.end_point, p->mutable_end_point());
TypeConvert::ToPb(room->plane.curr_pos, p->mutable_pos());
{
}
SerializeNewObjects(msg, room, hum, framedata);
SerializePartObjects(msg, room, hum, framedata);
SerializeDelObjects(msg, room, hum, framedata);
SerializeOutObjects(msg, room, hum, framedata);
SerializeShots(msg, room, hum, framedata);
SerializeBullets(msg, room, hum, framedata);
SerializeDelBullets(msg, room, hum, framedata);
SerializeExplosions(msg, room, hum, framedata);
SerializeSmokes(msg, room, hum, framedata);
SerializePlaySkills(msg, room, hum, framedata);
SerializeEmotes(msg, room, hum, framedata);
SerializeChgedBulletNums(msg, room, hum, framedata);
SerializeChgedBuffs(msg, room, hum, framedata);
SerializeChgedSkillCds(msg, room, hum, framedata);
SerializeChgedSkillCurrTimes(msg, room, hum, framedata);
SerializeChgedHps(msg, room, hum, framedata);
SerializeChgedItems(msg, room, hum, framedata);
SerializeChgedWeaponAmmo(msg, room, hum, framedata);
SerializeDeadAliveObjs(msg, room, hum, framedata);
SerializeChgedCars(msg, room, hum, framedata);
SerializeChgedProps(msg, room, hum, framedata);
{
if (room->frame_event.airdrops_.size() > 0) {
*msg->mutable_airdrop() = room->frame_event.airdrops_.Get(0);
}
if (room->frame_event.airraids_.size() > 0) {
*msg->mutable_airraid() = room->frame_event.airraids_.Get(0);
}
if (room->GetGasData().gas_mode == GasMoving) {
msg->set_gas_progress(room->GetGasData().gas_progress);
TypeConvert::ToPb(room->GetGasData().pos_old, msg->mutable_gas_pos_old());
}
if (room->GetFrameNo() - room->AliveCountChgFrameNo() <= 4 ||
room->GetFrameNo() - hum->join_frameno <= 2) {
msg->set_alive_count(room->AliveCount());
}
}
return msg;
}
void FrameMaker::SerializeNewObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
#if 0
msg->set_frameno(hum->room->GetFrameNo() / 2);
if (hum->room->GetGasData().gas_mode == GasJump) {
cs::MFPlane* p = msg->mutable_plane();
TypeConvert::ToPb(hum->room->plane.start_point, p->mutable_start_point());
TypeConvert::ToPb(hum->room->plane.end_point, p->mutable_end_point());
TypeConvert::ToPb(hum->room->plane.curr_pos, p->mutable_pos());
}
#endif
#ifdef DEBUG
Debug_FullObject(hum);
#endif
@ -105,18 +150,21 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
}
#endif
}
#ifdef DEBUG
#ifdef DEBUG
if (App::Instance()->HasFlag(2) && e->GetEntityType() == ET_Player) {
room->BroadcastDebugMsg(a8::Format("投放 %d pos:%d,%d 出现",
hum->room->BroadcastDebugMsg(a8::Format("投放 %d pos:%d,%d 出现",
{
e->GetUniId(),
e->GetPos().x,
e->GetPos().y,
}));
}
#endif
#endif
}
{
}
void FrameMaker::SerializePartObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
int deleted_uniid = 0;
for (auto& pair : framedata->part_objects) {
Entity* entity = pair.second.object.Get();
@ -148,18 +196,25 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
if (deleted_uniid > 0) {
framedata->part_objects.erase(deleted_uniid);
}
}
}
void FrameMaker::SerializeDelObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (auto& itr : framedata->del_objects) {
msg->add_del_objids(itr);
#ifdef DEBUG
#ifdef DEBUG
if (App::Instance()->HasFlag(2)) {
room->BroadcastDebugMsg(a8::Format("投放 删除对象%d",
{
itr
}));
}
#endif
#endif
}
}
void FrameMaker::SerializeOutObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
#ifdef DEBUG
Debug_OutObject(hum);
#endif
@ -174,6 +229,10 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
}
#endif
}
}
void FrameMaker::SerializeShots(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->shots_) {
if (idx < room->frame_event.shots_.size()) {
auto& tuple = room->frame_event.shots_[idx];
@ -190,6 +249,22 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
#endif
}
}
}
void FrameMaker::SerializeEmotes(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->emotes_) {
if (idx < room->frame_event.emotes_.size()) {
auto& tuple = room->frame_event.emotes_[idx];
if (std::get<0>(tuple).Get() && hum->CanSee(std::get<0>(tuple).Get())) {
*msg->add_emotes() = std::get<1>(tuple);
}
}
}
}
void FrameMaker::SerializeBullets(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->bullets_) {
if (idx < room->frame_event.bullets_.size()) {
auto& tuple = room->frame_event.bullets_[idx];
@ -198,12 +273,34 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
}
}
}
for (size_t idx : framedata->del_bullets_) {
if (idx < room->frame_event.del_bullets_.size()) {
int bullet_uniid = room->frame_event.del_bullets_[idx];
msg->add_del_bullets(bullet_uniid);
}
void FrameMaker::SerializeSmokes(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->smokes_) {
if (idx < room->frame_event.smokes_.size()) {
auto& tuple = room->frame_event.smokes_[idx];
if (std::get<0>(tuple).Get() && hum->CanSee(std::get<0>(tuple).Get())) {
*msg->add_smokes() = std::get<1>(tuple);
}
}
}
}
void FrameMaker::SerializePlaySkills(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->play_skills_) {
if (idx < room->frame_event.play_skills_.size()) {
auto& tuple = room->frame_event.play_skills_[idx];
if (std::get<0>(tuple).Get() && hum->CanSee(std::get<0>(tuple).Get())) {
*msg->add_play_skill_list() = std::get<1>(tuple);
}
}
}
}
void FrameMaker::SerializeExplosions(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->explosions_) {
if (idx < room->frame_event.explosions_.size()) {
auto& tuple = room->frame_event.explosions_[idx];
@ -220,30 +317,20 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
#endif
}
}
for (size_t idx : framedata->smokes_) {
if (idx < room->frame_event.smokes_.size()) {
auto& tuple = room->frame_event.smokes_[idx];
if (std::get<0>(tuple).Get() && hum->CanSee(std::get<0>(tuple).Get())) {
*msg->add_smokes() = std::get<1>(tuple);
}
}
}
for (size_t idx : framedata->play_skills_) {
if (idx < room->frame_event.play_skills_.size()) {
auto& tuple = room->frame_event.play_skills_[idx];
if (std::get<0>(tuple).Get() && hum->CanSee(std::get<0>(tuple).Get())) {
*msg->add_play_skill_list() = std::get<1>(tuple);
}
}
}
for (size_t idx : framedata->emotes_) {
if (idx < room->frame_event.emotes_.size()) {
auto& tuple = room->frame_event.emotes_[idx];
if (std::get<0>(tuple).Get() && hum->CanSee(std::get<0>(tuple).Get())) {
*msg->add_emotes() = std::get<1>(tuple);
}
}
void FrameMaker::SerializeChgedBuffs(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->chged_buffs_) {
if (idx < room->frame_event.chged_buffs_.size()) {
auto p = msg->add_chged_buff_list();
*p = std::get<1>(room->frame_event.chged_buffs_[idx]);
}
}
}
void FrameMaker::SerializeChgedBulletNums(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->chged_bullet_nums_) {
if (idx < room->frame_event.chged_bullet_nums_.size()) {
CreatureWeakPtr& target = room->frame_event.chged_bullet_nums_[idx];
@ -255,75 +342,10 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
}
}
}
#if 0
for (size_t idx : hum->chged_tank_bullet_nums_) {
if (idx < room->frame_event.chged_tank_bullet_nums_.size()) {
Human* target = room->frame_event.chged_tank_bullet_nums_[idx];
if (target->GetCurrWeapon()) {
auto p = msg->add_chged_property_list();
p->set_obj_id(target->GetUniId());
p->set_property_type(kPropTankBulletNum);
p->set_value(target->tank_weapon.ammo);
}
}
}
for (size_t idx : hum->chged_tank_oil_max_) {
if (idx < room->frame_event.chged_tank_oil_max_.size()) {
Human* target = room->frame_event.chged_tank_oil_max_[idx];
auto p = msg->add_chged_property_list();
p->set_obj_id(target->GetUniId());
p->set_property_type(kPropTankOil);
p->set_property_subtype(1);
p->set_value(target->tank_oil_max);
}
}
for (size_t idx : hum->chged_tank_oil_value_) {
if (idx < room->frame_event.chged_tank_oil_value_.size()) {
Human* target = room->frame_event.chged_tank_oil_value_[idx];
auto p = msg->add_chged_property_list();
p->set_obj_id(target->GetUniId());
p->set_property_type(kPropTankOil);
p->set_property_subtype(0);
p->set_value(target->tank_oil_value);
}
}
#endif
for (size_t idx : framedata->chged_buffs_) {
if (idx < room->frame_event.chged_buffs_.size()) {
auto p = msg->add_chged_buff_list();
*p = std::get<1>(room->frame_event.chged_buffs_[idx]);
}
}
for (size_t idx : framedata->chged_skillcds_) {
if (idx < room->frame_event.chged_skillcds_.size()) {
auto tuple = room->frame_event.chged_skillcds_[idx];
CreatureWeakPtr target = std::get<0>(tuple);
int skill_id = std::get<1>(tuple);
int left_time = std::get<2>(tuple);
if (target.Get()) {
auto p = msg->add_chged_property_list();
p->set_obj_id(target.Get()->GetUniId());
p->set_property_type(kPropSkillLeftTime);
p->set_property_subtype(skill_id);
p->set_value(left_time);
}
}
}
for (size_t idx : framedata->chged_skill_curr_times_) {
if (idx < room->frame_event.chged_skill_curr_times_.size()) {
auto tuple = room->frame_event.chged_skill_curr_times_[idx];
CreatureWeakPtr& target = std::get<0>(tuple);
int skill_id = std::get<1>(tuple);
int curr_times = std::get<2>(tuple);
if (target.Get()) {
auto p = msg->add_chged_property_list();
p->set_obj_id(target.Get()->GetUniId());
p->set_property_type(kPropSkillCurrTimes);
p->set_property_subtype(skill_id);
p->set_value(curr_times);
}
}
}
}
void FrameMaker::SerializeChgedHps(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->chged_hps_) {
if (idx < room->frame_event.chged_hps_.size()) {
CreatureWeakPtr& target = room->frame_event.chged_hps_[idx];
@ -343,6 +365,48 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
}
}
}
}
void FrameMaker::SerializeChgedSkillCds(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->chged_skillcds_) {
if (idx < room->frame_event.chged_skillcds_.size()) {
auto tuple = room->frame_event.chged_skillcds_[idx];
CreatureWeakPtr target = std::get<0>(tuple);
int skill_id = std::get<1>(tuple);
int left_time = std::get<2>(tuple);
if (target.Get()) {
auto p = msg->add_chged_property_list();
p->set_obj_id(target.Get()->GetUniId());
p->set_property_type(kPropSkillLeftTime);
p->set_property_subtype(skill_id);
p->set_value(left_time);
}
}
}
}
void FrameMaker::SerializeChgedSkillCurrTimes(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->chged_skill_curr_times_) {
if (idx < room->frame_event.chged_skill_curr_times_.size()) {
auto tuple = room->frame_event.chged_skill_curr_times_[idx];
CreatureWeakPtr& target = std::get<0>(tuple);
int skill_id = std::get<1>(tuple);
int curr_times = std::get<2>(tuple);
if (target.Get()) {
auto p = msg->add_chged_property_list();
p->set_obj_id(target.Get()->GetUniId());
p->set_property_type(kPropSkillCurrTimes);
p->set_property_subtype(skill_id);
p->set_value(curr_times);
}
}
}
}
void FrameMaker::SerializeChgedItems(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->chged_items_) {
if (idx < room->frame_event.chged_items_.size()) {
auto& tuple = room->frame_event.chged_items_[idx];
@ -355,6 +419,10 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
}
}
}
}
void FrameMaker::SerializeChgedWeaponAmmo(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->chged_weapon_ammo_) {
if (idx < room->frame_event.chged_weapon_ammo_.size()) {
auto& tuple = room->frame_event.chged_weapon_ammo_[idx];
@ -367,6 +435,25 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
}
}
}
}
void FrameMaker::SerializeChgedLevel(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
}
void FrameMaker::SerializeChgedExp(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
}
void FrameMaker::SerializeChgedRace(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
}
void FrameMaker::SerializeDeadAliveObjs(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->dead_alive_objs_) {
if (idx < room->frame_event.dead_alive_objs_.size()) {
auto p = msg->add_dead_alive_objs();
@ -375,6 +462,10 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
p->add_values(std::get<2>(room->frame_event.dead_alive_objs_[idx]));
}
}
}
void FrameMaker::SerializeChgedCars(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->chged_cars_) {
if (idx < room->frame_event.chged_cars_.size()) {
CreatureWeakPtr& target = room->frame_event.chged_cars_[idx];
@ -392,6 +483,10 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
}
}
}
}
void FrameMaker::SerializeChgedProps(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->chged_props_) {
if (idx < room->frame_event.chged_props_.size()) {
auto& p = room->frame_event.chged_props_[idx];
@ -401,20 +496,14 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
}
}
}
if (room->frame_event.airdrops_.size() > 0) {
*msg->mutable_airdrop() = room->frame_event.airdrops_.Get(0);
}
if (room->frame_event.airraids_.size() > 0) {
*msg->mutable_airraid() = room->frame_event.airraids_.Get(0);
}
if (room->GetGasData().gas_mode == GasMoving) {
msg->set_gas_progress(room->GetGasData().gas_progress);
TypeConvert::ToPb(room->GetGasData().pos_old, msg->mutable_gas_pos_old());
}
if (room->GetFrameNo() - room->AliveCountChgFrameNo() <= 4 ||
room->GetFrameNo() - hum->join_frameno <= 2) {
msg->set_alive_count(room->AliveCount());
}
}
return msg;
}
void FrameMaker::SerializeDelBullets(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
{
for (size_t idx : framedata->del_bullets_) {
if (idx < room->frame_event.del_bullets_.size()) {
int bullet_uniid = room->frame_event.del_bullets_[idx];
msg->add_del_bullets(bullet_uniid);
}
}
}

26
server/gameserver/framemaker.h
View File

@ -4,6 +4,7 @@
class Human;
class Room;
class FrameData;
class FrameMaker
{
public:
@ -13,4 +14,29 @@ class FrameMaker
private:
void Debug_FullObject(Human* hum);
void Debug_OutObject(Human* hum);
void SerializeNewObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializePartObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeDelObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeOutObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeShots(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeEmotes(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeBullets(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeSmokes(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializePlaySkills(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeExplosions(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedBuffs(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedBulletNums(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedHps(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedSkillCds(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedSkillCurrTimes(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedItems(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedWeaponAmmo(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedLevel(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedExp(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedRace(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeDeadAliveObjs(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedCars(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeChgedProps(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
void SerializeDelBullets(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
};