From cbef507ddd09d0e2aac6b3de155870e3947d9c7c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Sep 2022 16:03:48 +0800 Subject: [PATCH] 1 --- server/gameserver/battledatacontext.cc | 19 ++++++++++++++++++- server/gameserver/roommgr.cc | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc index a3b1c4fd..fee10685 100644 --- a/server/gameserver/battledatacontext.cc +++ b/server/gameserver/battledatacontext.cc @@ -417,7 +417,24 @@ void BattleDataContext::GetSkillList(std::vector& skill_list) MetaData::Skill* skill1 = MetaMgr::Instance()->GetSkill(hero_ability_->hero_meta->i->skill1list()); MetaData::Skill* skill2 = MetaMgr::Instance()->GetSkill(hero_ability_->hero_meta->i->skill2list()); MetaData::Skill* skill3 = MetaMgr::Instance()->GetSkill(hero_ability_->hero_meta->i->skill3list()); - if (skill1 && skill2 && skill3) { + if (skill1 && skill2 && skill3 && skill1_lv > 0 && skill2_lv > 0 && skill3_lv > 0) { + if (MetaMgr::Instance()->GetSkill(skill1->i->skill_id() + skill1_lv - 1)) { + skill_list.push_back(skill1->i->skill_id() + skill1_lv - 1); + } else { + skill_list.push_back(skill1->i->skill_id()); + } + + if (MetaMgr::Instance()->GetSkill(skill2->i->skill_id() + skill2_lv - 2)) { + skill_list.push_back(skill2->i->skill_id() + skill2_lv - 2); + } else { + skill_list.push_back(skill2->i->skill_id()); + } + + if (MetaMgr::Instance()->GetSkill(skill3->i->skill_id() + skill3_lv - 3)) { + skill_list.push_back(skill3->i->skill_id() + skill3_lv - 3); + } else { + skill_list.push_back(skill3->i->skill_id()); + } } } diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 7769ab7a..0c74f26a 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -752,9 +752,9 @@ void RoomMgr::SendGetBattleData(int mode, std::string url; JsonDataMgr::Instance()->GetApiUrl(url); if (url.find('?') != std::string::npos) { - url += "&c=Battle&a=getBattleData"; + url += "&c=Battle&a=getBattleDataNew"; } else { - url += "?&c=Battle&a=getBattleData"; + url += "?&c=Battle&a=getBattleDataNew"; } auto url_params = a8::MutableXObject::CreateObject(); {