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

rankreward add param3

Browse Source
This commit is contained in:
aozhiwei 2020-07-14 17:07:19 +08:00
parent 2299898b3c
commit a9210d720f
5 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/human.cc
View File

@ -2077,8 +2077,12 @@ void Human::GenBattleReportData(a8::MutableXObject* params)
stats.pass_score = MetaMgr::Instance()->GetKillPointParam1(stats.kills); stats.pass_score = MetaMgr::Instance()->GetKillPointParam1(stats.kills);
stats.pass_score += MetaMgr::Instance()->GetRankPointParam1(rank); stats.pass_score += MetaMgr::Instance()->GetRankPointParam1(rank);
stats.rank_score = MetaMgr::Instance()->GetKillPointParam2(stats.kills); stats.rank_score = MetaMgr::Instance()->GetKillPointParam2(stats.kills);
if (room->IsMiniRoom()) {
stats.rank_score += MetaMgr::Instance()->GetRankPointParam3(rank);
} else {
stats.rank_score += MetaMgr::Instance()->GetRankPointParam2(rank); stats.rank_score += MetaMgr::Instance()->GetRankPointParam2(rank);
} }
}
params->SetVal("score", 0); params->SetVal("score", 0);
params->SetVal("pass_score", has_pass ? stats.pass_score * 2 : stats.pass_score); params->SetVal("pass_score", has_pass ? stats.pass_score * 2 : stats.pass_score);
params->SetVal("rank_score", stats.rank_score); params->SetVal("rank_score", stats.rank_score);

6
server/gameserver/metamgr.cc
View File

@ -701,6 +701,12 @@ int MetaMgr::GetRankPointParam2(int rank)
return itr != loader_->rankpoint_hash.end() ? itr->second->i->parameter2() : 0; return itr != loader_->rankpoint_hash.end() ? itr->second->i->parameter2() : 0;
} }
int MetaMgr::GetRankPointParam3(int rank)
{
auto itr = loader_->rankpoint_hash.find(rank);
return itr != loader_->rankpoint_hash.end() ? itr->second->i->parameter3() : 0;
}
int MetaMgr::GetKillPointParam1(int kill_num) int MetaMgr::GetKillPointParam1(int kill_num)
{ {
auto itr = loader_->killpoint_hash.find(kill_num); auto itr = loader_->killpoint_hash.find(kill_num);

1
server/gameserver/metamgr.h
View File

@ -42,6 +42,7 @@ class MetaMgr : public a8::Singleton<MetaMgr>
float GetKillRewardParam(int kill_num); float GetKillRewardParam(int kill_num);
int GetRankPointParam1(int rank); int GetRankPointParam1(int rank);
int GetRankPointParam2(int rank); int GetRankPointParam2(int rank);
int GetRankPointParam3(int rank);
int GetKillPointParam1(int kill_num); int GetKillPointParam1(int kill_num);
int GetKillPointParam2(int kill_num); int GetKillPointParam2(int kill_num);
MetaData::Robot* RandRobot(std::set<int>& refreshed_robot_set); MetaData::Robot* RandRobot(std::set<int>& refreshed_robot_set);

2
server/gameserver/room.h
View File

@ -122,6 +122,7 @@ public:
void GetAlivePlayers(std::vector<Player*>& humans, size_t num); void GetAlivePlayers(std::vector<Player*>& humans, size_t num);
int GetCanShuaNum(int shua_num); int GetCanShuaNum(int shua_num);
void AdjustPosInnerMap(a8::Vec2& pos, float radius); void AdjustPosInnerMap(a8::Vec2& pos, float radius);
bool IsMiniRoom();
private: private:
int AllocUniid(); int AllocUniid();
@ -196,7 +197,6 @@ private:
void CheckShowHand(); void CheckShowHand();
void ShowHand(); void ShowHand();
void ShuaLastGas(); void ShuaLastGas();
bool IsMiniRoom();
size_t GetRoomMaxPlayerNum(); size_t GetRoomMaxPlayerNum();
#ifdef DEBUG #ifdef DEBUG

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

@ -220,6 +220,7 @@ message RankPoint
optional int32 rank = 1; optional int32 rank = 1;
optional int32 parameter = 2; optional int32 parameter = 2;
optional int32 parameter2 = 3; optional int32 parameter2 = 3;
optional int32 parameter3 = 4;
} }
message KillReward message KillReward