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

1

Browse Source
This commit is contained in:
aozhiwei 2019-08-12 14:27:50 +08:00
parent f22a50de88
commit 0936d69779
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/bullet.cc
View File

@ -57,7 +57,7 @@ void Bullet::OnHit(std::set<Entity*>& objects)
if (hum != player && !hum->dead && if (hum != player && !hum->dead &&
(hum->team_id == 0 || player->team_id != hum->team_id)) { (hum->team_id == 0 || player->team_id != hum->team_id)) {
#endif #endif
float dmg = gun_meta->i->atk() * (1 + player->buff.damage_add); float dmg = gun_meta->i->atk() * (1 + player->buff.damage_add + player->atk_add);
float def = hum->def + hum->buff.def_add; float def = hum->def + hum->buff.def_add;
float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K); float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K);
player->stats.damage_amount_out += finaly_dmg; player->stats.damage_amount_out += finaly_dmg;
@ -75,7 +75,7 @@ void Bullet::OnHit(std::set<Entity*>& objects)
{ {
Obstacle* obstacle = (Obstacle*)target; Obstacle* obstacle = (Obstacle*)target;
if (!obstacle->dead && obstacle->meta->i->attack_type() == 1) { if (!obstacle->dead && obstacle->meta->i->attack_type() == 1) {
float dmg = gun_meta->i->atk() * (1 + player->buff.damage_add); float dmg = gun_meta->i->atk() * (1 + player->buff.damage_add + player->atk_add);
float def = 0; float def = 0;
float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K); float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K);
#if 0 #if 0

1
server/gameserver/playermgr.cc
View File

@ -55,6 +55,7 @@ Player* PlayerMgr::CreatePlayerByCMJoin(long ip_saddr, int socket, const cs::CMJ
hum->account_registertime = f8::ExtractRegisterTimeFromSessionId(msg.session_id()); hum->account_registertime = f8::ExtractRegisterTimeFromSessionId(msg.session_id());
hum->atk_add = msg.atk_add(); hum->atk_add = msg.atk_add();
if (hum->atk_add > 0.9999f) { if (hum->atk_add > 0.9999f) {
hum->atk_add = hum->atk_add / 100.0f;
a8::SetBitFlag(hum->status, HS_AtkAdd); a8::SetBitFlag(hum->status, HS_AtkAdd);
} }
for (auto& weapon : msg.weapons()) { for (auto& weapon : msg.weapons()) {