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

1

Browse Source
This commit is contained in:
aozhiwei 2023-07-04 15:43:45 +08:00
parent 90ae2edddd
commit 55c5b101ac
4 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/car.cc
View File

@ -426,7 +426,7 @@ void Car::DecHP(float dec_hp, int killer_id, const std::string killer_name, int
GetUniId(), GetUniId(),
real_dmg_out, real_dmg_out,
0, 0,
0, killer->GetUniId(),
true); true);
} else if (killer->IsHero() && } else if (killer->IsHero() &&
killer->AsHero()->master.Get() && killer->AsHero()->master.Get() &&
@ -438,7 +438,7 @@ void Car::DecHP(float dec_hp, int killer_id, const std::string killer_name, int
GetUniId(), GetUniId(),
real_dmg_out, real_dmg_out,
0, 0,
0, killer->AsHero()->master.Get()->GetUniId(),
true); true);
} }
} }

4
server/gameserver/hero.cc
View File

@ -295,7 +295,7 @@ void Hero::DecHP(float dec_hp, int killer_id, const std::string killer_name, int
GetUniId(), GetUniId(),
real_dmg_out, real_dmg_out,
0, 0,
0, killer->GetUniId(),
true); true);
} else if (killer->IsHero() && } else if (killer->IsHero() &&
killer->AsHero()->master.Get() && killer->AsHero()->master.Get() &&
@ -307,7 +307,7 @@ void Hero::DecHP(float dec_hp, int killer_id, const std::string killer_name, int
GetUniId(), GetUniId(),
real_dmg_out, real_dmg_out,
0, 0,
0, killer->AsHero()->master.Get()->GetUniId(),
true); true);
} }
} }

52
server/gameserver/human.cc
View File

@ -363,7 +363,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string killer_name, in
} }
Creature* killer = room->GetCreatureByUniId(real_killer_id); Creature* killer = room->GetCreatureByUniId(real_killer_id);
if (killer && real_dmg_out > 0.999) { if (killer && real_dmg_out > 0.999) {
if (killer->IsPlayer()) { if (killer->IsHuman()) {
room->frame_event.AddPropChgEx room->frame_event.AddPropChgEx
( (
killer->GetWeakPtrRef(), killer->GetWeakPtrRef(),
@ -371,20 +371,44 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string killer_name, in
GetUniId(), GetUniId(),
real_dmg_out, real_dmg_out,
0, 0,
0, killer->GetUniId(),
true);
} else if (killer->IsHero() &&
killer->AsHero()->master.Get() &&
killer->AsHero()->master.Get()->IsPlayer()) {
room->frame_event.AddPropChgEx
(
killer->AsHero()->master.Get()->GetWeakPtrRef(),
kPropDmgShow,
GetUniId(),
real_dmg_out,
0,
0,
true); true);
if (IsPlayer()) {
room->frame_event.AddPropChgEx
(
GetWeakPtrRef(),
kPropDmgShow,
GetUniId(),
real_dmg_out,
0,
killer->GetUniId(),
true);
}
} else if (killer->IsHero()) {
if (killer->AsHero()->master.Get() &&
killer->AsHero()->master.Get()->IsPlayer()) {
room->frame_event.AddPropChgEx
(
killer->AsHero()->master.Get()->GetWeakPtrRef(),
kPropDmgShow,
GetUniId(),
real_dmg_out,
0,
killer->AsHero()->master.Get()->GetUniId(),
true);
}
if (IsPlayer()) {
room->frame_event.AddPropChgEx
(
GetWeakPtrRef(),
kPropDmgShow,
GetUniId(),
real_dmg_out,
0,
killer->AsHero()->master.Get() ?
killer->AsHero()->master.Get()->GetUniId() : killer->GetUniId(),
true);
}
} }
} }
GetTrigger()->HpChg(); GetTrigger()->HpChg();

3
server/tools/protobuild/cs_proto.proto
View File

@ -230,9 +230,10 @@ message MFVec3
property_type: 50 淘汰倒计时(只有在读取里才会发送) property_type: 50 淘汰倒计时(只有在读取里才会发送)
value: 倒计时（秒） value: 倒计时（秒）
property_type: 51 伤害数值 property_type: 51 伤害数值
property_subtype: 目标对象uniid property_subtype: 受击方uniid
value: 造成伤害 value: 造成伤害
value2: 0: 普通伤害 1：暴击 value2: 0: 普通伤害 1：暴击
value3: 攻击方uniid
*/ */
message MFPropertyChg message MFPropertyChg
{ {