From 6f848bd96ea08d67c571de4e18767465dc40da1d Mon Sep 17 00:00:00 2001
From: wangyuan <wangyuan@qq.com>
Date: Tue, 19 Mar 2019 18:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8B=B1=E9=9B=84=E8=A1=8C?=
 =?UTF-8?q?=E5=8A=A8=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua_out/CommonProto_pb.lua | 17 +++--------------
 protos/CommonProto.proto   |  4 ++--
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/lua_out/CommonProto_pb.lua b/lua_out/CommonProto_pb.lua
index 10f984f..0fe1180 100644
--- a/lua_out/CommonProto_pb.lua
+++ b/lua_out/CommonProto_pb.lua
@@ -40,7 +40,6 @@ local HERO_STAR_FIELD = protobuf.FieldDescriptor();
 local HERO_SKINID_FIELD = protobuf.FieldDescriptor();
 local HERO_SKILLIDLIST_FIELD = protobuf.FieldDescriptor();
 local HERO_EQUIPIDLIST_FIELD = protobuf.FieldDescriptor();
-local HERO_ACTIONPOWER_FIELD = protobuf.FieldDescriptor();
 local HERO_CREATETIME_FIELD = protobuf.FieldDescriptor();
 HEROFIGHTINFO = protobuf.Descriptor();
 local HEROFIGHTINFO_HERO_FIELD = protobuf.FieldDescriptor();
@@ -458,20 +457,10 @@ HERO_EQUIPIDLIST_FIELD.default_value = {}
 HERO_EQUIPIDLIST_FIELD.type = 9
 HERO_EQUIPIDLIST_FIELD.cpp_type = 9
 
-HERO_ACTIONPOWER_FIELD.name = "actionPower"
-HERO_ACTIONPOWER_FIELD.full_name = ".com.ljsd.jieling.protocols.Hero.actionPower"
-HERO_ACTIONPOWER_FIELD.number = 9
-HERO_ACTIONPOWER_FIELD.index = 8
-HERO_ACTIONPOWER_FIELD.label = 1
-HERO_ACTIONPOWER_FIELD.has_default_value = false
-HERO_ACTIONPOWER_FIELD.default_value = 0
-HERO_ACTIONPOWER_FIELD.type = 5
-HERO_ACTIONPOWER_FIELD.cpp_type = 1
-
 HERO_CREATETIME_FIELD.name = "createTime"
 HERO_CREATETIME_FIELD.full_name = ".com.ljsd.jieling.protocols.Hero.createTime"
-HERO_CREATETIME_FIELD.number = 10
-HERO_CREATETIME_FIELD.index = 9
+HERO_CREATETIME_FIELD.number = 9
+HERO_CREATETIME_FIELD.index = 8
 HERO_CREATETIME_FIELD.label = 1
 HERO_CREATETIME_FIELD.has_default_value = false
 HERO_CREATETIME_FIELD.default_value = 0
@@ -482,7 +471,7 @@ HERO.name = "Hero"
 HERO.full_name = ".com.ljsd.jieling.protocols.Hero"
 HERO.nested_types = {}
 HERO.enum_types = {}
-HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_SKILLIDLIST_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_ACTIONPOWER_FIELD, HERO_CREATETIME_FIELD}
+HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_SKILLIDLIST_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD}
 HERO.is_extendable = false
 HERO.extensions = {}
 HEROFIGHTINFO_HERO_FIELD.name = "hero"
diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index e9e2022..a3238a1 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -61,8 +61,8 @@ option optimize_for = SPEED;
 
 		repeated int32 skillIdList = 7; 
 		repeated string equipIdList = 8;
-		optional int32 actionPower = 9 ; //行动力
-		optional int32 createTime = 10; //入手时间
+
+		optional int32 createTime = 9; //入手时间
 
 	}