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

add android.* human.*

Browse Source
This commit is contained in:
aozhiwei 2019-03-14 16:34:22 +08:00
parent f1c2776777
commit eb52effa0f
7 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/android.cc Normal file
View File

@ -0,0 +1,3 @@
#include "precompile.h"
#include "android.h"

8
server/gameserver/android.h Normal file
View File

@ -0,0 +1,8 @@
#pragma once
#include "human.h"
class Android : public Human
{
};

2
server/gameserver/entity.h
View File

@ -2,6 +2,7 @@
enum EntityType_e
{
ET_None = 0,
ET_Player = 1,
ET_Obstacle = 2,
ET_Building = 3,
@ -17,6 +18,7 @@ class Entity
{
public:
unsigned short entity_uniid = 0;
EntityType_e entity_type = ET_None;
Vector2D pos;
Vector2D dir;
int updated_times = 0;

5
server/gameserver/human.cc Normal file
View File

@ -0,0 +1,5 @@
#include "precompile.h"
#include "human.h"

8
server/gameserver/human.h Normal file
View File

@ -0,0 +1,8 @@
#pragma once
#include "entity.h"
class Human : public Entity
{
};

4
server/gameserver/player.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "entity.h"
#include "human.h"
#include "GGListener.h"
namespace cs
@ -16,7 +16,7 @@ namespace cs
}
class Room;
class Player : public Entity
class Player : public Human
{
public:
enum { HID = HID_Player };

12
server/tools/protobuild/cs_proto.proto
View File

@ -601,18 +601,18 @@ message SMPlayerInfo
//帧事件
message SMUpdate
{
repeated int32 del_objids = 2;
repeated MFObjectFull full_objects = 3;
repeated MFObjectPart part_objects = 4;
optional int32 active_player_id = 5; //当前活跃玩家id
optional MFPlayerData active_player_data = 6; //活跃玩家数据
repeated int32 del_objids = 2; //对象-待删除(移出视野)
repeated MFObjectFull full_objects = 3; //对象-全量(出现在视野)
repeated MFObjectPart part_objects = 4; //对象-部分(用于插值更新)
optional int32 active_player_id = 5; //当前活跃玩家id(如果玩家死亡后是观战对象的id)
optional MFPlayerData active_player_data = 6; //活跃玩家数据(如果玩家死亡后是观战对象的数据)
optional int32 alive_count = 15; //存活数量
optional int32 gasT = 16;
optional MFGasData gas_data = 17;
repeated MFTeamData team_data = 18;
repeated MFTeamData teams = 19;
repeated MFBullet bullets = 20; //子弹
repeated MFShot shots = 21;
repeated MFShot shots = 21; //射击
repeated MFExplosion explosions = 22;
repeated MFEmote emotes = 23;
optional int32 ack = 24;