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

1

Browse Source
This commit is contained in:
aozhiwei 2019-08-26 11:19:03 +08:00
parent 91a29b88c9
commit 2793d472ed
5 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/human.cc
View File

@ -2063,7 +2063,9 @@ void Human::GenBattleReportData(a8::MutableXObject* params)
}
{
stats.pass_score = MetaMgr::Instance()->GetKillPointParam1(stats.kills);
stats.rank_score = MetaMgr::Instance()->GetKillPointParam1(stats.kills);
stats.pass_score += MetaMgr::Instance()->GetRankPointParam1(rank);
stats.rank_score = MetaMgr::Instance()->GetKillPointParam2(stats.kills);
stats.rank_score += MetaMgr::Instance()->GetRankPointParam2(rank);
}
params->SetVal("score", 0);
params->SetVal("pass_score", has_pass ? stats.pass_score * 2 : stats.pass_score);

5
server/gameserver/metadata.h
View File

@ -170,6 +170,11 @@ namespace MetaData
const metatable::KillReward* i = nullptr;
};
struct RankPoint
{
const metatable::RankPoint* i = nullptr;
};
struct KillPoint
{
const metatable::KillPoint* i = nullptr;

22
server/gameserver/metamgr.cc
View File

@ -43,6 +43,8 @@ public:
std::list<MetaData::EquipUpgrade> equipupgrade_list;
std::list<metatable::KillReward> killreward_meta_list;
std::list<MetaData::KillReward> killreward_list;
std::list<metatable::RankPoint> rankpoint_meta_list;
std::list<MetaData::RankPoint> rankpoint_list;
std::list<metatable::KillPoint> killpoint_meta_list;
std::list<MetaData::KillPoint> killpoint_list;
std::list<metatable::Robot> robot_meta_list;
@ -64,6 +66,7 @@ public:
std::map<int, MetaData::Skill*> skill_hash;
std::map<int, MetaData::RankReward*> rankreward_hash;
std::map<int, MetaData::KillReward*> killreward_hash;
std::map<int, MetaData::RankPoint*> rankpoint_hash;
std::map<int, MetaData::KillPoint*> killpoint_hash;
std::map<int, MetaData::EquipUpgrade*> equipupgrade_hash;
std::map<int, MetaData::Robot*> robot_hash;
@ -102,6 +105,7 @@ public:
f8::ReadCsvMetaFile(res_path + "rankReward@rankReward.csv", rankreward_meta_list);
f8::ReadCsvMetaFile(res_path + "killReward@killReward.csv", killreward_meta_list);
f8::ReadCsvMetaFile(res_path + "killPoint@killPoint.csv", killpoint_meta_list);
f8::ReadCsvMetaFile(res_path + "rankPoint@rankPoint.csv", rankpoint_meta_list);
f8::ReadCsvMetaFile(res_path + "equipUpgrade@equipUpgrade.csv", equipupgrade_meta_list);
f8::ReadCsvMetaFile(res_path + "robot@robot.csv", robot_meta_list);
BindToMetaData();
@ -264,6 +268,12 @@ private:
killpoint_hash[item.i->kill_num()] = &item;
}
for (auto& meta : rankpoint_meta_list) {
MetaData::RankPoint& item = a8::FastAppend(rankpoint_list);
item.i = &meta;
rankpoint_hash[item.i->rank()] = &item;
}
for (auto& meta : equipupgrade_meta_list) {
MetaData::EquipUpgrade& item = a8::FastAppend(equipupgrade_list);
item.i = &meta;
@ -419,6 +429,18 @@ float MetaMgr::GetKillRewardParam(int kill_num)
return itr != loader_->killreward_hash.end() ? itr->second->i->parameter() : 0.0f;
}
int MetaMgr::GetRankPointParam1(int rank)
{
auto itr = loader_->rankpoint_hash.find(rank);
return itr != loader_->rankpoint_hash.end() ? itr->second->i->parameter() : 0;
}
int MetaMgr::GetRankPointParam2(int rank)
{
auto itr = loader_->rankpoint_hash.find(rank);
return itr != loader_->rankpoint_hash.end() ? itr->second->i->parameter2() : 0;
}
int MetaMgr::GetKillPointParam1(int kill_num)
{
auto itr = loader_->killpoint_hash.find(kill_num);

2
server/gameserver/metamgr.h
View File

@ -35,6 +35,8 @@ class MetaMgr : public a8::Singleton<MetaMgr>
MetaData::Dress* GetDress(int dress_id);
float GetRankRewardParam(int rank);
float GetKillRewardParam(int kill_num);
int GetRankPointParam1(int rank);
int GetRankPointParam2(int rank);
int GetKillPointParam1(int kill_num);
int GetKillPointParam2(int kill_num);
std::vector<MetaData::Robot>* GetRobotList();

7
server/tools/protobuild/metatable.proto
View File

@ -165,6 +165,13 @@ message RankReward
optional float parameter = 2;
}
message RankPoint
{
optional int32 rank = 1;
optional int32 parameter = 2;
optional int32 parameter2 = 3;
}
message KillReward
{
optional int32 kill_num = 1;