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-05-16 14:35:22 +08:00
parent 1da6231116
commit 15b3a997e7
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/ability.cc
View File

@ -374,7 +374,7 @@ void Ability::GMClearAttr()
std::vector<std::string> Ability::GMShowAttrs() std::vector<std::string> Ability::GMShowAttrs()
{ {
std::vector<std::string> strings; std::vector<std::string> strings;
strings.push_back(a8::Format("curr_hp:%f max_hp:%f atk:%f def:%f block:%f crit:%f level:%d exp:%f", strings.push_back(a8::Format("curr_hp:%f max_hp:%f atk:%f def:%f block:%f crit:%f level:%d exp:%f speed:%f",
{ {
owner_.Get()->GetHP(), owner_.Get()->GetHP(),
owner_.Get()->GetNetData()->GetMaxHP(), owner_.Get()->GetNetData()->GetMaxHP(),
@ -383,7 +383,8 @@ std::vector<std::string> Ability::GMShowAttrs()
owner_.Get()->GetNetData()->GetBlock(), owner_.Get()->GetNetData()->GetBlock(),
owner_.Get()->GetNetData()->GetCrit(), owner_.Get()->GetNetData()->GetCrit(),
owner_.Get()->GetHeroLevel(), owner_.Get()->GetHeroLevel(),
owner_.Get()->GetHeroExp() owner_.Get()->GetHeroExp(),
owner_.Get()->GetSpeed()
})); }));
{ {
std::vector<std::string> tmp_strings; std::vector<std::string> tmp_strings;

6
server/gameserver/creature.cc
View File

@ -3429,8 +3429,12 @@ float Creature::InternalGetSpeed()
ruduce = 1.0f - ruduce; ruduce = 1.0f - ruduce;
} }
addition += GetAbility()->GetAttrAddition(kHAT_vSpeedRateIn); addition += GetAbility()->GetAttrAddition(kHAT_vSpeedRateIn);
#if 1
ruduce = std::min(ruduce, GetAbility()->GetAttrRuduce(kHAT_vSpeedRateIn));
#else
ruduce = std::max(ruduce, GetAbility()->GetAttrRuduce(kHAT_vSpeedRateIn)); ruduce = std::max(ruduce, GetAbility()->GetAttrRuduce(kHAT_vSpeedRateIn));
float rate = addition - ruduce; #endif
float rate = addition + ruduce;
finaly_speed *= 1.0f + rate; finaly_speed *= 1.0f + rate;
#ifdef MYDEBUG #ifdef MYDEBUG
if (IsPlayer() && finaly_speed > 500) { if (IsPlayer() && finaly_speed > 500) {

4
server/gameserver/trigger.cc
View File

@ -681,7 +681,7 @@ void Trigger::EnterBattleMode()
if (buff_id > 0) { if (buff_id > 0) {
owner_->TryAddBuff(owner_, buff_id, buff->skill_meta); owner_->TryAddBuff(owner_, buff_id, buff->skill_meta);
} else { } else {
owner_->ClearBuffById(buff_id); owner_->ClearBuffById(-buff_id);
} }
} }
}); });
@ -697,7 +697,7 @@ void Trigger::LeaveBattleMode()
if (buff_id > 0) { if (buff_id > 0) {
owner_->TryAddBuff(owner_, buff_id, buff->skill_meta); owner_->TryAddBuff(owner_, buff_id, buff->skill_meta);
} else { } else {
owner_->ClearBuffById(buff_id); owner_->ClearBuffById(-buff_id);
} }
} }
}); });