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

1

Browse Source
This commit is contained in:
aozhiwei 2022-09-07 16:03:48 +08:00
parent 96845f3b1f
commit cbef507ddd
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/gameserver/battledatacontext.cc
View File

@ -417,7 +417,24 @@ void BattleDataContext::GetSkillList(std::vector<int>& skill_list)
MetaData::Skill* skill1 = MetaMgr::Instance()->GetSkill(hero_ability_->hero_meta->i->skill1list()); 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* skill2 = MetaMgr::Instance()->GetSkill(hero_ability_->hero_meta->i->skill2list());
MetaData::Skill* skill3 = MetaMgr::Instance()->GetSkill(hero_ability_->hero_meta->i->skill3list()); 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());
}
} }
} }

4
server/gameserver/roommgr.cc
View File

@ -752,9 +752,9 @@ void RoomMgr::SendGetBattleData(int mode,
std::string url; std::string url;
JsonDataMgr::Instance()->GetApiUrl(url); JsonDataMgr::Instance()->GetApiUrl(url);
if (url.find('?') != std::string::npos) { if (url.find('?') != std::string::npos) {
url += "&c=Battle&a=getBattleData"; url += "&c=Battle&a=getBattleDataNew";
} else { } else {
url += "?&c=Battle&a=getBattleData"; url += "?&c=Battle&a=getBattleDataNew";
} }
auto url_params = a8::MutableXObject::CreateObject(); auto url_params = a8::MutableXObject::CreateObject();
{ {