diff --git a/server/gameserver/compose.cc b/server/gameserver/compose.cc index 890e62c2..627cd766 100644 --- a/server/gameserver/compose.cc +++ b/server/gameserver/compose.cc @@ -58,7 +58,7 @@ void Compose::IncNum() if ((num_ + 1) % 3 == 0 && num_ < 9) { TakeOnWeapon(owner_->GetCurrWeapon()); } - if (num_ >= 0) { + if (num_ >= 8) { owner_->room->NotifyNewsTicker (1, { diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index 69bc7cdf..91f0cfd6 100644 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -260,6 +260,7 @@ enum PropertyType_e kPropPurpleStone = 48, kPropArmorShield = 49, + kPropEliminateTime = 50, }; enum SkinSlot_e diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 5a025f47..310069da 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -226,6 +226,8 @@ message MFVec3 property_type: 49 护甲 property_subtype: 当前护甲值 value: max护甲值 + property_type: 50 淘汰倒计时(只有在读取里才会发送) + value: 倒计时(秒) */ message MFPropertyChg {