diff --git a/server/gameserver/human.h b/server/gameserver/human.h index 9b966fb..41c29d2 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -45,6 +45,8 @@ class Human : public Entity int sdmg = 0; bool poisoning = false; long long poisoning_time = 0; + long long dead_frameno = 0; + bool game_over = false; HumanFrameData frame_data; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 6dfce06..e3f23b7 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -457,26 +457,18 @@ message MFPlayerStats optional int32 time_alive = 3; //存活时间 optional int32 kills = 4; //击杀敌人数 optional int32 dead = 5; //是否已死亡 - optional int32 damage_type = 6; - optional int32 source_type = 30; optional int32 killer_id = 7; //杀手id(自杀时为自己) - optional int32 damage_given = 8; - optional int32 damage_taken = 9; + optional int32 damage_amount = 8; //伤害总量 optional int32 gold = 10; //金币 optional int32 all_score = 11; //所有积分 - optional int32 score_rank = 12; - optional int32 score_kill = 13; - optional int32 score_dmg_given = 14; - optional int32 heal_cnt = 15; - optional int32 score_alivetm = 16; + optional int32 heal_cnt = 15; //治疗次数 + optional int32 heal_amount = 20; //治疗总量 optional int32 old_elo = 17; optional int32 new_elo = 18; optional int32 chg_elo = 19; - optional int32 heal_heath = 20; optional string account_id = 21; //账号id - repeated MFGoods annual_goods = 22; } @@ -641,13 +633,13 @@ message SMPlayerStats //游戏结束 message SMGameOver { - optional int32 team_id = 1; - optional int32 team_rank = 2; + optional int32 team_id = 1; //队伍id + optional int32 team_rank = 2; //队伍排名 optional int32 team_allcnt = 3; - optional int32 game_over = 4; - optional int32 victory = 5; + optional bool game_over = 4; //是否结束 + optional bool victory = 5; //是否胜利 - repeated MFPlayerStats player_stats = 6; + repeated MFPlayerStats player_stats = 6; //玩家信息统计 } //拾取