diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index 69727d5..62c64f0 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -63,7 +63,7 @@ message Equip optional int32 range = 14; //射程 optional int32 use_time = 15; //使用时间 optional int32 heal = 16; //瞬间生命恢复 - optional int32 energy = 17; //能量值 + optional int32 time = 17; //时间 optional int32 volume = 19; //装备容量 optional int32 bullet_rad = 20; //子弹半径 optional string bullet_born_offset = 30; //子弹出生偏移 diff --git a/third_party/a8engine b/third_party/a8engine index 4ce247a..bf2310b 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit 4ce247a7a34fd3e16e0a4d5412b4bb795ed28b88 +Subproject commit bf2310bf6f9ef891874ff1f0bddfd9dc68db5863