diff --git a/server/gameserver/mt/Param.cc b/server/gameserver/mt/Param.cc index 98c2eaea..3a97fecf 100644 --- a/server/gameserver/mt/Param.cc +++ b/server/gameserver/mt/Param.cc @@ -436,7 +436,7 @@ namespace mt int effect = 0; for (int i = 0; i < s().crit_effect_range.size(); ++i) { if (E_abs <= s().crit_effect_range.at(i)) { - effect = i +1; + effect = i + 1; break; } } @@ -449,7 +449,7 @@ namespace mt int effect = 0; for (int i = 0; i < s().block_effect_range.size(); ++i) { if (E_abs <= s().block_effect_range.at(i)) { - effect = i +1; + effect = i + 11; break; } } diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index 8ec4ea60..1d6e1f32 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -859,7 +859,7 @@ float BattleDataContext::CalcDmg(Creature* target, IBullet* bullet) if (owner_.Get()->IsPlayer()) { dbg_strings.push_back(a8::Format ("finaly_dmg:%f vEcb:%f vEd:%f X:%f vCritBon:%f E:%f vBlock:%f vAttack:%f vBullet:%f BDM:%f " - "vNormalDamageDealtRateIn:%f vNormalDamageTakenRateIn:%f vDmg:%f DDR:%f DTR:%f self.id:%d target.id:%f", + "vNormalDamageDealtRateIn:%f vNormalDamageTakenRateIn:%f vDmg:%f DDR:%f DTR:%f self.id:%d target.id:%f dmg_type:%d", { finaly_dmg, vEbc, @@ -877,7 +877,8 @@ float BattleDataContext::CalcDmg(Creature* target, IBullet* bullet) DDR, DTR, owner_.Get()->GetUniId(), - target->GetUniId() + target->GetUniId(), + g_calc_dmg_context.dmg_bp } ) ); diff --git a/server/gameserver/team.cc b/server/gameserver/team.cc index 21442758..8b3a8fd4 100644 --- a/server/gameserver/team.cc +++ b/server/gameserver/team.cc @@ -360,6 +360,11 @@ void Team::GenBattleReportData(Human* player, a8::MutableXObject* params) member_pb->SetVal("sex", hum->sex); member_pb->SetVal("dead", hum->dead); member_pb->SetVal("is_mvp", 0); + if (hum->GetNetData()->GetSkinId() != 0) { + member_pb->SetVal("skin_id", hum->GetNetData()->GetSkinId()); + } else { + member_pb->SetVal("skin_id", 0); + } member_pb->SetVal("hero_id", hum->meta->id()); member_pb->SetVal("hero_uniid", hum->hero_uniid);