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

1

Browse Source
This commit is contained in:
aozhiwei 2019-07-23 17:01:37 +08:00
parent e2229a9084
commit fb12f6f267
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server/gameserver/human.cc
View File

@ -2057,12 +2057,43 @@ void Human::GenBattleReportData(a8::MutableXObject* params)
params->SetVal("rank", stats.rank); params->SetVal("rank", stats.rank);
params->SetVal("kills", stats.kills); params->SetVal("kills", stats.kills);
params->SetVal("harm", stats.damage_amount_out); params->SetVal("harm", stats.damage_amount_out);
params->SetVal("skill", 0); params->SetVal("skill", stats.use_skill_times);
params->SetVal("tank1_kill", 0); params->SetVal("tank1_kill", 0);
params->SetVal("tank2_kill", 0); params->SetVal("tank2_kill", 0);
params->SetVal("tank3_kill", 0); params->SetVal("tank3_kill", 0);
params->SetVal("coin_num", 0); if (tank_meta_) {
params->SetVal("score", 0); switch (tank_meta_->i->type()) {
case 1:
{
params->SetVal("tank1_kill", stats.kills);
}
break;
case 2:
{
params->SetVal("tank2_kill", stats.kills);
}
break;
case 3:
{
params->SetVal("tank3_kill", stats.kills);
}
break;
default:
break;
}
}
{
float rank_param = MetaMgr::Instance()->GetRankRewardParam(stats.rank);
float kill_param = MetaMgr::Instance()->GetKillRewardParam(stats.kills);
int coin_num = (rank_param * MetaMgr::Instance()->rank_param) +
(kill_param * MetaMgr::Instance()->kill_param);
stats.gold = coin_num;
params->SetVal("coin_num", coin_num);
}
{
stats.score = stats.rank;
params->SetVal("score", stats.score);
}
params->SetVal("room_uuid", room->room_uuid); params->SetVal("room_uuid", room->room_uuid);
} }
@ -2165,3 +2196,4 @@ void Human::InternalSendGameOver()
delete params; delete params;
sending_gameover_ = true; sending_gameover_ = true;
} }

2
server/gameserver/types.h
View File

@ -106,6 +106,8 @@ struct PlayerStats
int rank = 0; int rank = 0;
int cup = 0; int cup = 0;
std::vector<std::pair<int, int>> extra_drop; std::vector<std::pair<int, int>> extra_drop;
int use_skill_times = 0;
}; };
struct HumanAbility struct HumanAbility

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

@ -223,7 +223,6 @@ message TankSkin
required int32 id = 1; required int32 id = 1;
optional int32 tank_id = 2; optional int32 tank_id = 2;
} }
//end //end
message DoorObjJson message DoorObjJson