diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc index 562a82d..8656840 100644 --- a/server/gameserver/metadata.cc +++ b/server/gameserver/metadata.cc @@ -753,8 +753,8 @@ namespace MetaData for (int buff_id : buff_list) { MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id); if (!buff_meta) { - #if 0 - return; + #if 1 + continue; #else abort(); #endif @@ -939,9 +939,11 @@ namespace MetaData } } if (i->buff_effect() == kBET_CondAddBuff) { + #if 0 if (!IsValidCondBuff(int_param1)) { abort(); } + #endif } } diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 8d61b9d..cef9d82 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -453,6 +453,7 @@ message MFSmokeFull optional int32 obj_uniid = 1; //唯一id optional MFVec2 pos = 2; //位置 optional float rad = 3; //半径 + optional float time_addition = 4; //烟雾弹时间加成(单位毫秒) } //载具-部分