From 5afbef0beb5869eccc08bca673be8b5b97e8ae8b Mon Sep 17 00:00:00 2001
From: wangyuan <wangyuan@qq.com>
Date: Tue, 19 Mar 2019 17:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E5=8A=9B=20=E8=8B=B1=E9=9B=84->?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/CommonProto.proto | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index d553c54..a312a00 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -19,6 +19,9 @@ option optimize_for = SPEED;
 		optional string familyId = 6;
 		optional string head = 7;
 		optional int32 curMapId = 8;
+
+		optional int32 energy = 9; //精力
+		optional int32 lastUpdateEnergyTime = 10 ;// 上次更新精力时间，-1 代表在队伍中，不需要进行定时恢复。
 	}
 
 
@@ -61,9 +64,6 @@ option optimize_for = SPEED;
 		optional int32 actionPower = 9 ; //行动力
 		optional int32 createTime = 10; //入手时间
 
-		optional int32 energy = 11; //精力
-		optional int32 lastUpdateEnergyTime = 13 ;// 上次更新精力时间，-1 代表在队伍中，不需要进行定时恢复。
-
 	}
 
 	message HeroFightInfo {