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 2024-04-01 16:15:03 +08:00
parent 333533b0ca
commit 6c9aa323c9
2 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
server/gameserver/ingamevoice.cc
View File

@ -314,6 +314,9 @@ void InGameVoice::TriggerEvent(Human* killer, Human* deader)
if (sent) { if (sent) {
return; return;
} }
if (is_first_boold) {
return;
}
{ {
if (!is_first_boold) { if (!is_first_boold) {
int val = GetIntMap(personal_nodead_series_kills_, killer->GetUniId()); int val = GetIntMap(personal_nodead_series_kills_, killer->GetUniId());
@ -335,7 +338,7 @@ void InGameVoice::TriggerEvent(Human* killer, Human* deader)
return; return;
} }
{ {
if (!is_first_boold) { {
int val = GetIntMap(personal_series_kills_, killer->GetUniId()); int val = GetIntMap(personal_series_kills_, killer->GetUniId());
mt::InGameVoice::Traverse mt::InGameVoice::Traverse
( (
@ -351,7 +354,7 @@ void InGameVoice::TriggerEvent(Human* killer, Human* deader)
} }
} }
{ {
if (!is_first_boold) { {
int val = GetIntMap(personal_kills_, killer->GetUniId()); int val = GetIntMap(personal_kills_, killer->GetUniId());
mt::InGameVoice::Traverse mt::InGameVoice::Traverse
( (
@ -367,39 +370,21 @@ void InGameVoice::TriggerEvent(Human* killer, Human* deader)
} }
} }
{ {
if (!is_first_boold) { if (deader->GetTeam()->AllIsDead()) {
mt::InGameVoice::Traverse mt::InGameVoice::Traverse
( (
room_->IsMobaModeRoom(), room_->IsMobaModeRoom(),
InGameVoiceEventType_e::kMyTeamateBeKill, InGameVoiceEventType_e::kTeamAllDead,
[this, killer, deader] (const mt::InGameVoice* meta) -> bool [this, killer, deader] (const mt::InGameVoice* meta) -> bool
{ {
Notify(killer, deader, meta); Notify(killer, deader, meta);
return true; return true;
}); });
} } else {
} mt::InGameVoice::Traverse
{ (
if (!is_first_boold) { room_->IsMobaModeRoom(),
if (deader->GetTeam()->AllIsDead()) { InGameVoiceEventType_e::kHeroBeKill,
mt::InGameVoice::Traverse
(
room_->IsMobaModeRoom(),
InGameVoiceEventType_e::kMyTeamAllDead,
[this, killer, deader] (const mt::InGameVoice* meta) -> bool
{
Notify(killer, deader, meta);
return true;
});
}
}
}
{
if (!is_first_boold) {
mt::InGameVoice::Traverse
(
room_->IsMobaModeRoom(),
InGameVoiceEventType_e::kEnemyTeamBekill,
[this, killer, deader] (const mt::InGameVoice* meta) -> bool [this, killer, deader] (const mt::InGameVoice* meta) -> bool
{ {
Notify(killer, deader, meta); Notify(killer, deader, meta);
@ -407,4 +392,5 @@ void InGameVoice::TriggerEvent(Human* killer, Human* deader)
}); });
} }
} }
} }

5
server/gameserver/mt/InGameVoice.h
View File

@ -6,9 +6,8 @@
A8_DECLARE_ENUM(InGameVoiceEventType_e, A8_DECLARE_ENUM(InGameVoiceEventType_e,
kGlobalKills = 1, kGlobalKills = 1,
kPersonalExceptFirstBooldKills = 2, kPersonalExceptFirstBooldKills = 2,
kMyTeamateBeKill = 3, kHeroBeKill = 3,
kEnemyTeamBekill = 4, kTeamAllDead = 5,
kMyTeamAllDead = 5,
kSeriesKills = 11, kSeriesKills = 11,
kNoDeadSeriesKills = 21, kNoDeadSeriesKills = 21,
kFail = 99, kFail = 99,