From 99c0d04c5293507027f2d64773d32c3473411904 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 25 Sep 2023 12:05:31 +0800 Subject: [PATCH 1/3] 1 --- server/gameserver/netdata.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index ea4ec79e..8609ac0e 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -445,6 +445,7 @@ void BattleDataContext::ParseResult(a8::XObject& obj) revive_coin_ = obj.Get("revive_coin"); match_mode_ = obj.Get("match_mode"); rank_ = obj.Get("rank"); + elo_ = obj.Get("elo"); battle_times_ = obj.Get("battle_times"); current_get_star_ = obj.Get("current_get_star"); } From 6782199f287dab1759ff80905a3a8568c6eb6aac Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 25 Sep 2023 12:59:29 +0800 Subject: [PATCH 2/3] 1 --- server/gameserver/room.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 8a8e4b05..264c8a8e 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -106,6 +106,7 @@ void Room::InitData(RoomInitInfo& init_info) map_instance = init_info.map_instance; map_meta_ = init_info.map_meta; poly_ext_datas_ = map_instance->GetPolyExtDatas(); + rank_match_conf_ = mt::Param::GetRankModeConfByRoomType(room_type_); } void Room::Init() From 6ea187f7ee6e463648314335b802802e88ffe294 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 25 Sep 2023 13:40:29 +0800 Subject: [PATCH 3/3] 1 --- server/gameserver/netdata.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index 8609ac0e..73b5031e 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -51,6 +51,7 @@ public: std::shared_ptr hero_dto; int spec_skill_id = 0; int main_skill_id = 0; + const mt::NpcStandard* standard_meta = nullptr; float GetHP() { @@ -155,7 +156,6 @@ private: #endif } } else { - const mt::NpcStandard* standard_meta = nullptr; auto match_conf = c->room->GetRankMatchConf(); if (match_conf) { standard_meta = mt::NpcStandard::GetByHeroAndLv @@ -1126,6 +1126,9 @@ float BattleDataContext::GetRecoverHpAdd() int BattleDataContext::GetHeroLevel() { + if (!owner_.Get()->IsPlayer() && hero_ability_ && hero_ability_->standard_meta) { + return hero_ability_->standard_meta->level(); + } return std::max(hero_lv_, 1); }