From eb52effa0f45c36047811a1a0ffd15acbe3dc8e6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 14 Mar 2019 16:34:22 +0800
Subject: [PATCH] add android.* human.*

---
 server/gameserver/android.cc           |  3 +++
 server/gameserver/android.h            |  8 ++++++++
 server/gameserver/entity.h             |  2 ++
 server/gameserver/human.cc             |  5 +++++
 server/gameserver/human.h              |  8 ++++++++
 server/gameserver/player.h             |  4 ++--
 server/tools/protobuild/cs_proto.proto | 12 ++++++------
 7 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 server/gameserver/android.cc
 create mode 100644 server/gameserver/android.h
 create mode 100644 server/gameserver/human.cc
 create mode 100644 server/gameserver/human.h

diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc
new file mode 100644
index 0000000..fdfc80a
--- /dev/null
+++ b/server/gameserver/android.cc
@@ -0,0 +1,3 @@
+#include "precompile.h"
+
+#include "android.h"
diff --git a/server/gameserver/android.h b/server/gameserver/android.h
new file mode 100644
index 0000000..5c7ee38
--- /dev/null
+++ b/server/gameserver/android.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "human.h"
+
+class Android : public Human
+{
+
+};
diff --git a/server/gameserver/entity.h b/server/gameserver/entity.h
index e1fff2a..4fb3843 100644
--- a/server/gameserver/entity.h
+++ b/server/gameserver/entity.h
@@ -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;
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
new file mode 100644
index 0000000..1efcc8b
--- /dev/null
+++ b/server/gameserver/human.cc
@@ -0,0 +1,5 @@
+#include "precompile.h"
+
+#include "human.h"
+
+
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
new file mode 100644
index 0000000..0101cfb
--- /dev/null
+++ b/server/gameserver/human.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "entity.h"
+
+class Human : public Entity
+{
+
+};
diff --git a/server/gameserver/player.h b/server/gameserver/player.h
index 5f06768..0878c5d 100644
--- a/server/gameserver/player.h
+++ b/server/gameserver/player.h
@@ -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 };
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index c4b8fa2..6000787 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -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;