diff --git a/server/gameserver/mt/Param.cc b/server/gameserver/mt/Param.cc index e90ced94..5b6d57e1 100644 --- a/server/gameserver/mt/Param.cc +++ b/server/gameserver/mt/Param.cc @@ -412,4 +412,14 @@ namespace mt } } + int Param::GetCritEffect(float E) + { + + } + + int Param::GetBlockEffect(float E) + { + + } + } diff --git a/server/gameserver/mt/Param.h b/server/gameserver/mt/Param.h index c170294f..a2947250 100644 --- a/server/gameserver/mt/Param.h +++ b/server/gameserver/mt/Param.h @@ -149,6 +149,9 @@ namespace mt int nature_recover_hp_interval = 1; float nature_recover_hp_rate = 0.1f; + std::vector block_effect_range; + std::vector crit_effect_range; + std::vector> rank_mode_confs; }; static void StaticPostInit(); @@ -162,6 +165,8 @@ namespace mt static const RankMatchConf* GetRankModeConfByHeroLv(int hero_lv); static const RankMatchConf* GetRankModeConfByRoomType(int room_type); static int RandHeroLv(int room_type); + static int GetCritEffect(float E); + static int GetBlockEffect(float E); private: static S s_; }; diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index 6e93f28e..240f714c 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -2252,9 +2252,8 @@ void Team::FillSMGameOver(cs::SMGameOver& msg) member->set_sex(hum->sex); member->set_hero_id(hum->meta->id()); member->set_dead(hum->dead); - Skin* skin = hum->GetSkinByIdx(0); - if (skin) { - member->set_skin_id(skin->skin_id); + if (hum->GetNetData()->GetSkinId() != 0) { + member->set_skin_id(hum->GetNetData()->GetSkinId()); } member->set_is_mvp(0);