From 441383e134ef12728cb26b0dd863e45e43ca2b18 Mon Sep 17 00:00:00 2001
From: wangyuan <wangyuan@qq.com>
Date: Tue, 19 Mar 2019 19:51:25 +0800
Subject: [PATCH] server time

---
 lua_out/CommonProto_pb.lua | 13 ++++++++++++-
 protos/CommonProto.proto   |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lua_out/CommonProto_pb.lua b/lua_out/CommonProto_pb.lua
index 0fe1180..942a6a4 100644
--- a/lua_out/CommonProto_pb.lua
+++ b/lua_out/CommonProto_pb.lua
@@ -17,6 +17,7 @@ local PLAYER_HEAD_FIELD = protobuf.FieldDescriptor();
 local PLAYER_CURMAPID_FIELD = protobuf.FieldDescriptor();
 local PLAYER_ENERGY_FIELD = protobuf.FieldDescriptor();
 local PLAYER_LASTUPDATEENERGYTIME_FIELD = protobuf.FieldDescriptor();
+local PLAYER_SERVERTIME_FIELD = protobuf.FieldDescriptor();
 ITEM = protobuf.Descriptor();
 local ITEM_ITEMID_FIELD = protobuf.FieldDescriptor();
 local ITEM_ITEMNUM_FIELD = protobuf.FieldDescriptor();
@@ -240,11 +241,21 @@ PLAYER_LASTUPDATEENERGYTIME_FIELD.default_value = 0
 PLAYER_LASTUPDATEENERGYTIME_FIELD.type = 5
 PLAYER_LASTUPDATEENERGYTIME_FIELD.cpp_type = 1
 
+PLAYER_SERVERTIME_FIELD.name = "serverTime"
+PLAYER_SERVERTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.serverTime"
+PLAYER_SERVERTIME_FIELD.number = 11
+PLAYER_SERVERTIME_FIELD.index = 10
+PLAYER_SERVERTIME_FIELD.label = 1
+PLAYER_SERVERTIME_FIELD.has_default_value = false
+PLAYER_SERVERTIME_FIELD.default_value = 0
+PLAYER_SERVERTIME_FIELD.type = 5
+PLAYER_SERVERTIME_FIELD.cpp_type = 1
+
 PLAYER.name = "Player"
 PLAYER.full_name = ".com.ljsd.jieling.protocols.Player"
 PLAYER.nested_types = {}
 PLAYER.enum_types = {}
-PLAYER.fields = {PLAYER_UID_FIELD, PLAYER_NICKNAME_FIELD, PLAYER_LEVEL_FIELD, PLAYER_EXP_FIELD, PLAYER_VIPLEVEL_FIELD, PLAYER_FAMILYID_FIELD, PLAYER_HEAD_FIELD, PLAYER_CURMAPID_FIELD, PLAYER_ENERGY_FIELD, PLAYER_LASTUPDATEENERGYTIME_FIELD}
+PLAYER.fields = {PLAYER_UID_FIELD, PLAYER_NICKNAME_FIELD, PLAYER_LEVEL_FIELD, PLAYER_EXP_FIELD, PLAYER_VIPLEVEL_FIELD, PLAYER_FAMILYID_FIELD, PLAYER_HEAD_FIELD, PLAYER_CURMAPID_FIELD, PLAYER_ENERGY_FIELD, PLAYER_LASTUPDATEENERGYTIME_FIELD, PLAYER_SERVERTIME_FIELD}
 PLAYER.is_extendable = false
 PLAYER.extensions = {}
 ITEM_ITEMID_FIELD.name = "itemId"
diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index a3238a1..68cecb3 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -22,6 +22,8 @@ option optimize_for = SPEED;
 
 		optional int32 energy = 9; //精力
 		optional int32 lastUpdateEnergyTime = 10 ;// 上次更新精力时间，-1 代表在队伍中，不需要进行定时恢复。
+
+		optional int32 serverTime = 11; //服务器时间
 	}