diff --git a/CAPI/proto/Message2Clients.pb.cc b/CAPI/proto/Message2Clients.pb.cc index fdf445e..215a910 100644 --- a/CAPI/proto/Message2Clients.pb.cc +++ b/CAPI/proto/Message2Clients.pb.cc @@ -26,7 +26,7 @@ namespace protobuf ::_pbi::ConstantInitialized ) : _impl_{ - /*decltype(_impl_.buff_)*/ {}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, /*decltype(_impl_.x_)*/ 0, /*decltype(_impl_.y_)*/ 0, /*decltype(_impl_.speed_)*/ 0, /*decltype(_impl_.life_)*/ 0, /*decltype(_impl_.time_until_skill_available_)*/ 0, /*decltype(_impl_.hanged_time_)*/ 0, /*decltype(_impl_.place_)*/ 0, /*decltype(_impl_.prop_)*/ 0, /*decltype(_impl_.human_type_)*/ 0, /*decltype(_impl_.guid_)*/ int64_t{0}, /*decltype(_impl_.chair_time_)*/ 0, /*decltype(_impl_.on_chair_)*/ false, /*decltype(_impl_.on_ground_)*/ false, /*decltype(_impl_.view_range_)*/ 0, /*decltype(_impl_.ground_time_)*/ 0, /*decltype(_impl_.player_id_)*/ int64_t{0}, /*decltype(_impl_._cached_size_)*/ {}} + /*decltype(_impl_.buff_)*/ {}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, /*decltype(_impl_.x_)*/ 0, /*decltype(_impl_.y_)*/ 0, /*decltype(_impl_.speed_)*/ 0, /*decltype(_impl_.life_)*/ 0, /*decltype(_impl_.time_until_skill_available_)*/ 0, /*decltype(_impl_.hanged_time_)*/ 0, /*decltype(_impl_.place_)*/ 0, /*decltype(_impl_.prop_)*/ 0, /*decltype(_impl_.human_type_)*/ 0, /*decltype(_impl_.guid_)*/ int64_t{0}, /*decltype(_impl_.chair_time_)*/ 0, /*decltype(_impl_.on_chair_)*/ false, /*decltype(_impl_.on_ground_)*/ false, /*decltype(_impl_.view_range_)*/ 0, /*decltype(_impl_.ground_time_)*/ 0, /*decltype(_impl_.player_id_)*/ int64_t{0}, /*decltype(_impl_.radius_)*/ 0, /*decltype(_impl_._cached_size_)*/ {}} { } struct MessageOfHumanDefaultTypeInternal @@ -48,7 +48,7 @@ namespace protobuf ::_pbi::ConstantInitialized ) : _impl_{ - /*decltype(_impl_.buff_)*/ {}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, /*decltype(_impl_.x_)*/ 0, /*decltype(_impl_.y_)*/ 0, /*decltype(_impl_.speed_)*/ 0, /*decltype(_impl_.damage_)*/ 0, /*decltype(_impl_.time_until_skill_available_)*/ 0, /*decltype(_impl_.place_)*/ 0, /*decltype(_impl_.prop_)*/ 0, /*decltype(_impl_.guid_)*/ int64_t{0}, /*decltype(_impl_.butcher_type_)*/ 0, /*decltype(_impl_.movable_)*/ false, /*decltype(_impl_.playerid_)*/ int64_t{0}, /*decltype(_impl_.view_range_)*/ 0, /*decltype(_impl_._cached_size_)*/ {}} + /*decltype(_impl_.buff_)*/ {}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, /*decltype(_impl_.x_)*/ 0, /*decltype(_impl_.y_)*/ 0, /*decltype(_impl_.speed_)*/ 0, /*decltype(_impl_.damage_)*/ 0, /*decltype(_impl_.time_until_skill_available_)*/ 0, /*decltype(_impl_.place_)*/ 0, /*decltype(_impl_.prop_)*/ 0, /*decltype(_impl_.guid_)*/ int64_t{0}, /*decltype(_impl_.butcher_type_)*/ 0, /*decltype(_impl_.movable_)*/ false, /*decltype(_impl_.playerid_)*/ int64_t{0}, /*decltype(_impl_.view_range_)*/ 0, /*decltype(_impl_.radius_)*/ 0, /*decltype(_impl_._cached_size_)*/ {}} { } struct MessageOfButcherDefaultTypeInternal @@ -270,6 +270,7 @@ const uint32_t TableStruct_Message2Clients_2eproto::offsets[] PROTOBUF_SECTION_V PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.ground_time_), PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.player_id_), PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.view_range_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.radius_), PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfHuman, _impl_.buff_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _internal_metadata_), @@ -289,6 +290,7 @@ const uint32_t TableStruct_Message2Clients_2eproto::offsets[] PROTOBUF_SECTION_V PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.movable_), PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.playerid_), PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.view_range_), + PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.radius_), PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfButcher, _impl_.buff_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::protobuf::MessageOfProp, _internal_metadata_), @@ -366,15 +368,15 @@ const uint32_t TableStruct_Message2Clients_2eproto::offsets[] PROTOBUF_SECTION_V }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { {0, -1, -1, sizeof(::protobuf::MessageOfHuman)}, - {23, -1, -1, sizeof(::protobuf::MessageOfButcher)}, - {42, -1, -1, sizeof(::protobuf::MessageOfProp)}, - {56, -1, -1, sizeof(::protobuf::MessageOfPickedProp)}, - {67, -1, -1, sizeof(::protobuf::MessageOfMap_Row)}, - {74, -1, -1, sizeof(::protobuf::MessageOfMap)}, - {81, -1, -1, sizeof(::protobuf::MessageToClient)}, - {91, -1, -1, sizeof(::protobuf::MoveRes)}, - {99, -1, -1, sizeof(::protobuf::BoolRes)}, - {106, -1, -1, sizeof(::protobuf::MsgRes)}, + {24, -1, -1, sizeof(::protobuf::MessageOfButcher)}, + {44, -1, -1, sizeof(::protobuf::MessageOfProp)}, + {58, -1, -1, sizeof(::protobuf::MessageOfPickedProp)}, + {69, -1, -1, sizeof(::protobuf::MessageOfMap_Row)}, + {76, -1, -1, sizeof(::protobuf::MessageOfMap)}, + {83, -1, -1, sizeof(::protobuf::MessageToClient)}, + {93, -1, -1, sizeof(::protobuf::MoveRes)}, + {101, -1, -1, sizeof(::protobuf::BoolRes)}, + {108, -1, -1, sizeof(::protobuf::MsgRes)}, }; static const ::_pb::Message* const file_default_instances[] = { @@ -392,7 +394,7 @@ static const ::_pb::Message* const file_default_instances[] = { const char descriptor_table_protodef_Message2Clients_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = "\n\025Message2Clients.proto\022\010protobuf\032\021Messa" - "geType.proto\"\225\003\n\016MessageOfHuman\022\t\n\001x\030\001 \001" + "geType.proto\"\245\003\n\016MessageOfHuman\022\t\n\001x\030\001 \001" "(\005\022\t\n\001y\030\002 \001(\005\022\r\n\005speed\030\003 \001(\005\022\014\n\004life\030\004 \001" "(\005\022\023\n\013hanged_time\030\005 \001(\005\022\"\n\032time_until_sk" "ill_available\030\006 \001(\001\022\"\n\005place\030\007 \001(\0162\023.pro" @@ -401,36 +403,37 @@ const char descriptor_table_protodef_Message2Clients_2eproto[] PROTOBUF_SECTION_ ".HumanType\022\014\n\004guid\030\n \001(\003\022\020\n\010on_chair\030\013 \001" "(\010\022\022\n\nchair_time\030\014 \001(\001\022\021\n\ton_ground\030\r \001(" "\010\022\023\n\013ground_time\030\016 \001(\001\022\021\n\tplayer_id\030\017 \001(" - "\003\022\022\n\nview_range\030\020 \001(\005\022%\n\004buff\030\021 \003(\0162\027.pr" - "otobuf.HumanBuffType\"\314\002\n\020MessageOfButche" - "r\022\t\n\001x\030\001 \001(\005\022\t\n\001y\030\002 \001(\005\022\r\n\005speed\030\003 \001(\005\022\016" - "\n\006damage\030\004 \001(\005\022\"\n\032time_until_skill_avail" - "able\030\005 \001(\001\022\"\n\005place\030\006 \001(\0162\023.protobuf.Pla" - "ceType\022 \n\004prop\030\007 \001(\0162\022.protobuf.PropType" - "\022+\n\014butcher_type\030\010 \001(\0162\025.protobuf.Butche" - "rType\022\014\n\004guid\030\t \001(\003\022\017\n\007movable\030\n \001(\010\022\020\n\010" - "playerID\030\013 \001(\003\022\022\n\nview_range\030\014 \001(\005\022\'\n\004bu" - "ff\030\r \003(\0162\031.protobuf.ButcherBuffType\"\264\001\n\r" - "MessageOfProp\022 \n\004type\030\001 \001(\0162\022.protobuf.P" - "ropType\022\t\n\001x\030\002 \001(\005\022\t\n\001y\030\003 \001(\005\022\030\n\020facing_" - "direction\030\004 \001(\001\022\014\n\004guid\030\005 \001(\003\022\"\n\005place\030\006" - " \001(\0162\023.protobuf.PlaceType\022\014\n\004size\030\007 \001(\005\022" - "\021\n\tis_moving\030\010 \001(\010\"{\n\023MessageOfPickedPro" - "p\022 \n\004type\030\001 \001(\0162\022.protobuf.PropType\022\t\n\001x" - "\030\002 \001(\005\022\t\n\001y\030\003 \001(\005\022\030\n\020facing_direction\030\004 " - "\001(\001\022\022\n\nmapping_id\030\005 \001(\003\"`\n\014MessageOfMap\022" - "\'\n\003row\030\002 \003(\0132\032.protobuf.MessageOfMap.Row" - "\032\'\n\003Row\022 \n\003col\030\001 \003(\0162\023.protobuf.PlaceTyp" - "e\"\323\001\n\017MessageToClient\022/\n\rhuman_message\030\001" - " \003(\0132\030.protobuf.MessageOfHuman\0223\n\017butche" - "r_message\030\002 \003(\0132\032.protobuf.MessageOfButc" - "her\022-\n\014prop_message\030\003 \003(\0132\027.protobuf.Mes" - "sageOfProp\022+\n\013map_massage\030\004 \001(\0132\026.protob" - "uf.MessageOfMap\"5\n\007MoveRes\022\024\n\014actual_spe" - "ed\030\001 \001(\003\022\024\n\014actual_angle\030\002 \001(\001\"\036\n\007BoolRe" - "s\022\023\n\013act_success\030\001 \001(\010\"P\n\006MsgRes\022\024\n\014have" - "_message\030\001 \001(\010\022\026\n\016from_player_id\030\002 \001(\003\022\030" - "\n\020message_received\030\003 \001(\tb\006proto3"; + "\003\022\022\n\nview_range\030\020 \001(\005\022\016\n\006radius\030\021 \001(\005\022%\n" + "\004buff\030\022 \003(\0162\027.protobuf.HumanBuffType\"\334\002\n" + "\020MessageOfButcher\022\t\n\001x\030\001 \001(\005\022\t\n\001y\030\002 \001(\005\022" + "\r\n\005speed\030\003 \001(\005\022\016\n\006damage\030\004 \001(\005\022\"\n\032time_u" + "ntil_skill_available\030\005 \001(\001\022\"\n\005place\030\006 \001(" + "\0162\023.protobuf.PlaceType\022 \n\004prop\030\007 \001(\0162\022.p" + "rotobuf.PropType\022+\n\014butcher_type\030\010 \001(\0162\025" + ".protobuf.ButcherType\022\014\n\004guid\030\t \001(\003\022\017\n\007m" + "ovable\030\n \001(\010\022\020\n\010playerID\030\013 \001(\003\022\022\n\nview_r" + "ange\030\014 \001(\005\022\016\n\006radius\030\r \001(\005\022\'\n\004buff\030\016 \003(\016" + "2\031.protobuf.ButcherBuffType\"\264\001\n\rMessageO" + "fProp\022 \n\004type\030\001 \001(\0162\022.protobuf.PropType\022" + "\t\n\001x\030\002 \001(\005\022\t\n\001y\030\003 \001(\005\022\030\n\020facing_directio" + "n\030\004 \001(\001\022\014\n\004guid\030\005 \001(\003\022\"\n\005place\030\006 \001(\0162\023.p" + "rotobuf.PlaceType\022\014\n\004size\030\007 \001(\005\022\021\n\tis_mo" + "ving\030\010 \001(\010\"{\n\023MessageOfPickedProp\022 \n\004typ" + "e\030\001 \001(\0162\022.protobuf.PropType\022\t\n\001x\030\002 \001(\005\022\t" + "\n\001y\030\003 \001(\005\022\030\n\020facing_direction\030\004 \001(\001\022\022\n\nm" + "apping_id\030\005 \001(\003\"`\n\014MessageOfMap\022\'\n\003row\030\002" + " \003(\0132\032.protobuf.MessageOfMap.Row\032\'\n\003Row\022" + " \n\003col\030\001 \003(\0162\023.protobuf.PlaceType\"\323\001\n\017Me" + "ssageToClient\022/\n\rhuman_message\030\001 \003(\0132\030.p" + "rotobuf.MessageOfHuman\0223\n\017butcher_messag" + "e\030\002 \003(\0132\032.protobuf.MessageOfButcher\022-\n\014p" + "rop_message\030\003 \003(\0132\027.protobuf.MessageOfPr" + "op\022+\n\013map_massage\030\004 \001(\0132\026.protobuf.Messa" + "geOfMap\"5\n\007MoveRes\022\024\n\014actual_speed\030\001 \001(\003" + "\022\024\n\014actual_angle\030\002 \001(\001\"\036\n\007BoolRes\022\023\n\013act" + "_success\030\001 \001(\010\"P\n\006MsgRes\022\024\n\014have_message" + "\030\001 \001(\010\022\026\n\016from_player_id\030\002 \001(\003\022\030\n\020messag" + "e_received\030\003 \001(\tb\006proto3"; static const ::_pbi::DescriptorTable* const descriptor_table_Message2Clients_2eproto_deps[1] = { &::descriptor_table_MessageType_2eproto, }; @@ -438,7 +441,7 @@ static ::_pbi::once_flag descriptor_table_Message2Clients_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_Message2Clients_2eproto = { false, false, - 1592, + 1624, descriptor_table_protodef_Message2Clients_2eproto, "Message2Clients.proto", &descriptor_table_Message2Clients_2eproto_once, @@ -481,10 +484,10 @@ namespace protobuf MessageOfHuman* const _this = this; (void)_this; new (&_impl_) Impl_{ - decltype(_impl_.buff_){from._impl_.buff_}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){}, decltype(_impl_.y_){}, decltype(_impl_.speed_){}, decltype(_impl_.life_){}, decltype(_impl_.time_until_skill_available_){}, decltype(_impl_.hanged_time_){}, decltype(_impl_.place_){}, decltype(_impl_.prop_){}, decltype(_impl_.human_type_){}, decltype(_impl_.guid_){}, decltype(_impl_.chair_time_){}, decltype(_impl_.on_chair_){}, decltype(_impl_.on_ground_){}, decltype(_impl_.view_range_){}, decltype(_impl_.ground_time_){}, decltype(_impl_.player_id_){}, /*decltype(_impl_._cached_size_)*/ {}}; + decltype(_impl_.buff_){from._impl_.buff_}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){}, decltype(_impl_.y_){}, decltype(_impl_.speed_){}, decltype(_impl_.life_){}, decltype(_impl_.time_until_skill_available_){}, decltype(_impl_.hanged_time_){}, decltype(_impl_.place_){}, decltype(_impl_.prop_){}, decltype(_impl_.human_type_){}, decltype(_impl_.guid_){}, decltype(_impl_.chair_time_){}, decltype(_impl_.on_chair_){}, decltype(_impl_.on_ground_){}, decltype(_impl_.view_range_){}, decltype(_impl_.ground_time_){}, decltype(_impl_.player_id_){}, decltype(_impl_.radius_){}, /*decltype(_impl_._cached_size_)*/ {}}; _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - ::memcpy(&_impl_.x_, &from._impl_.x_, static_cast(reinterpret_cast(&_impl_.player_id_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.player_id_)); + ::memcpy(&_impl_.x_, &from._impl_.x_, static_cast(reinterpret_cast(&_impl_.radius_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.radius_)); // @@protoc_insertion_point(copy_constructor:protobuf.MessageOfHuman) } @@ -495,7 +498,7 @@ namespace protobuf (void)arena; (void)is_message_owned; new (&_impl_) Impl_{ - decltype(_impl_.buff_){arena}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){0}, decltype(_impl_.y_){0}, decltype(_impl_.speed_){0}, decltype(_impl_.life_){0}, decltype(_impl_.time_until_skill_available_){0}, decltype(_impl_.hanged_time_){0}, decltype(_impl_.place_){0}, decltype(_impl_.prop_){0}, decltype(_impl_.human_type_){0}, decltype(_impl_.guid_){int64_t{0}}, decltype(_impl_.chair_time_){0}, decltype(_impl_.on_chair_){false}, decltype(_impl_.on_ground_){false}, decltype(_impl_.view_range_){0}, decltype(_impl_.ground_time_){0}, decltype(_impl_.player_id_){int64_t{0}}, /*decltype(_impl_._cached_size_)*/ {}}; + decltype(_impl_.buff_){arena}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){0}, decltype(_impl_.y_){0}, decltype(_impl_.speed_){0}, decltype(_impl_.life_){0}, decltype(_impl_.time_until_skill_available_){0}, decltype(_impl_.hanged_time_){0}, decltype(_impl_.place_){0}, decltype(_impl_.prop_){0}, decltype(_impl_.human_type_){0}, decltype(_impl_.guid_){int64_t{0}}, decltype(_impl_.chair_time_){0}, decltype(_impl_.on_chair_){false}, decltype(_impl_.on_ground_){false}, decltype(_impl_.view_range_){0}, decltype(_impl_.ground_time_){0}, decltype(_impl_.player_id_){int64_t{0}}, decltype(_impl_.radius_){0}, /*decltype(_impl_._cached_size_)*/ {}}; } MessageOfHuman::~MessageOfHuman() @@ -528,7 +531,7 @@ namespace protobuf (void)cached_has_bits; _impl_.buff_.Clear(); - ::memset(&_impl_.x_, 0, static_cast(reinterpret_cast(&_impl_.player_id_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.player_id_)); + ::memset(&_impl_.x_, 0, static_cast(reinterpret_cast(&_impl_.radius_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.radius_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -706,14 +709,24 @@ namespace protobuf else goto handle_unusual; continue; - // repeated .protobuf.HumanBuffType buff = 17; + // int32 radius = 17; case 17: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 138)) + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 136)) + { + _impl_.radius_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } + else + goto handle_unusual; + continue; + // repeated .protobuf.HumanBuffType buff = 18; + case 18: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 146)) { ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedEnumParser(_internal_mutable_buff(), ptr, ctx); CHK_(ptr); } - else if (static_cast(tag) == 136) + else if (static_cast(tag) == 144) { uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -886,13 +899,20 @@ namespace protobuf target = ::_pbi::WireFormatLite::WriteInt32ToArray(16, this->_internal_view_range(), target); } - // repeated .protobuf.HumanBuffType buff = 17; + // int32 radius = 17; + if (this->_internal_radius() != 0) + { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(17, this->_internal_radius(), target); + } + + // repeated .protobuf.HumanBuffType buff = 18; { int byte_size = _impl_._buff_cached_byte_size_.load(std::memory_order_relaxed); if (byte_size > 0) { target = stream->WriteEnumPacked( - 17, _impl_.buff_, byte_size, target + 18, _impl_.buff_, byte_size, target ); } } @@ -916,7 +936,7 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - // repeated .protobuf.HumanBuffType buff = 17; + // repeated .protobuf.HumanBuffType buff = 18; { size_t data_size = 0; unsigned int count = static_cast(this->_internal_buff_size()); @@ -1050,6 +1070,15 @@ namespace protobuf total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_player_id()); } + // int32 radius = 17; + if (this->_internal_radius() != 0) + { + total_size += 2 + + ::_pbi::WireFormatLite::Int32Size( + this->_internal_radius() + ); + } + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } @@ -1147,6 +1176,10 @@ namespace protobuf { _this->_internal_set_player_id(from._internal_player_id()); } + if (from._internal_radius() != 0) + { + _this->_internal_set_radius(from._internal_radius()); + } _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } @@ -1170,7 +1203,7 @@ namespace protobuf _internal_metadata_.InternalSwap(&other->_internal_metadata_); _impl_.buff_.InternalSwap(&other->_impl_.buff_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(MessageOfHuman, _impl_.player_id_) + sizeof(MessageOfHuman::_impl_.player_id_) - PROTOBUF_FIELD_OFFSET(MessageOfHuman, _impl_.x_)>( + PROTOBUF_FIELD_OFFSET(MessageOfHuman, _impl_.radius_) + sizeof(MessageOfHuman::_impl_.radius_) - PROTOBUF_FIELD_OFFSET(MessageOfHuman, _impl_.x_)>( reinterpret_cast(&_impl_.x_), reinterpret_cast(&other->_impl_.x_) ); @@ -1202,10 +1235,10 @@ namespace protobuf MessageOfButcher* const _this = this; (void)_this; new (&_impl_) Impl_{ - decltype(_impl_.buff_){from._impl_.buff_}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){}, decltype(_impl_.y_){}, decltype(_impl_.speed_){}, decltype(_impl_.damage_){}, decltype(_impl_.time_until_skill_available_){}, decltype(_impl_.place_){}, decltype(_impl_.prop_){}, decltype(_impl_.guid_){}, decltype(_impl_.butcher_type_){}, decltype(_impl_.movable_){}, decltype(_impl_.playerid_){}, decltype(_impl_.view_range_){}, /*decltype(_impl_._cached_size_)*/ {}}; + decltype(_impl_.buff_){from._impl_.buff_}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){}, decltype(_impl_.y_){}, decltype(_impl_.speed_){}, decltype(_impl_.damage_){}, decltype(_impl_.time_until_skill_available_){}, decltype(_impl_.place_){}, decltype(_impl_.prop_){}, decltype(_impl_.guid_){}, decltype(_impl_.butcher_type_){}, decltype(_impl_.movable_){}, decltype(_impl_.playerid_){}, decltype(_impl_.view_range_){}, decltype(_impl_.radius_){}, /*decltype(_impl_._cached_size_)*/ {}}; _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - ::memcpy(&_impl_.x_, &from._impl_.x_, static_cast(reinterpret_cast(&_impl_.view_range_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.view_range_)); + ::memcpy(&_impl_.x_, &from._impl_.x_, static_cast(reinterpret_cast(&_impl_.radius_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.radius_)); // @@protoc_insertion_point(copy_constructor:protobuf.MessageOfButcher) } @@ -1216,7 +1249,7 @@ namespace protobuf (void)arena; (void)is_message_owned; new (&_impl_) Impl_{ - decltype(_impl_.buff_){arena}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){0}, decltype(_impl_.y_){0}, decltype(_impl_.speed_){0}, decltype(_impl_.damage_){0}, decltype(_impl_.time_until_skill_available_){0}, decltype(_impl_.place_){0}, decltype(_impl_.prop_){0}, decltype(_impl_.guid_){int64_t{0}}, decltype(_impl_.butcher_type_){0}, decltype(_impl_.movable_){false}, decltype(_impl_.playerid_){int64_t{0}}, decltype(_impl_.view_range_){0}, /*decltype(_impl_._cached_size_)*/ {}}; + decltype(_impl_.buff_){arena}, /*decltype(_impl_._buff_cached_byte_size_)*/ {0}, decltype(_impl_.x_){0}, decltype(_impl_.y_){0}, decltype(_impl_.speed_){0}, decltype(_impl_.damage_){0}, decltype(_impl_.time_until_skill_available_){0}, decltype(_impl_.place_){0}, decltype(_impl_.prop_){0}, decltype(_impl_.guid_){int64_t{0}}, decltype(_impl_.butcher_type_){0}, decltype(_impl_.movable_){false}, decltype(_impl_.playerid_){int64_t{0}}, decltype(_impl_.view_range_){0}, decltype(_impl_.radius_){0}, /*decltype(_impl_._cached_size_)*/ {}}; } MessageOfButcher::~MessageOfButcher() @@ -1249,7 +1282,7 @@ namespace protobuf (void)cached_has_bits; _impl_.buff_.Clear(); - ::memset(&_impl_.x_, 0, static_cast(reinterpret_cast(&_impl_.view_range_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.view_range_)); + ::memset(&_impl_.x_, 0, static_cast(reinterpret_cast(&_impl_.radius_) - reinterpret_cast(&_impl_.x_)) + sizeof(_impl_.radius_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -1387,14 +1420,24 @@ namespace protobuf else goto handle_unusual; continue; - // repeated .protobuf.ButcherBuffType buff = 13; + // int32 radius = 13; case 13: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 106)) + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 104)) + { + _impl_.radius_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + CHK_(ptr); + } + else + goto handle_unusual; + continue; + // repeated .protobuf.ButcherBuffType buff = 14; + case 14: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 114)) { ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedEnumParser(_internal_mutable_buff(), ptr, ctx); CHK_(ptr); } - else if (static_cast(tag) == 104) + else if (static_cast(tag) == 112) { uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); @@ -1531,13 +1574,20 @@ namespace protobuf target = ::_pbi::WireFormatLite::WriteInt32ToArray(12, this->_internal_view_range(), target); } - // repeated .protobuf.ButcherBuffType buff = 13; + // int32 radius = 13; + if (this->_internal_radius() != 0) + { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray(13, this->_internal_radius(), target); + } + + // repeated .protobuf.ButcherBuffType buff = 14; { int byte_size = _impl_._buff_cached_byte_size_.load(std::memory_order_relaxed); if (byte_size > 0) { target = stream->WriteEnumPacked( - 13, _impl_.buff_, byte_size, target + 14, _impl_.buff_, byte_size, target ); } } @@ -1561,7 +1611,7 @@ namespace protobuf // Prevent compiler warnings about cached_has_bits being unused (void)cached_has_bits; - // repeated .protobuf.ButcherBuffType buff = 13; + // repeated .protobuf.ButcherBuffType buff = 14; { size_t data_size = 0; unsigned int count = static_cast(this->_internal_buff_size()); @@ -1660,6 +1710,12 @@ namespace protobuf total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_view_range()); } + // int32 radius = 13; + if (this->_internal_radius() != 0) + { + total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_radius()); + } + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } @@ -1733,6 +1789,10 @@ namespace protobuf { _this->_internal_set_view_range(from._internal_view_range()); } + if (from._internal_radius() != 0) + { + _this->_internal_set_radius(from._internal_radius()); + } _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } @@ -1756,7 +1816,7 @@ namespace protobuf _internal_metadata_.InternalSwap(&other->_internal_metadata_); _impl_.buff_.InternalSwap(&other->_impl_.buff_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(MessageOfButcher, _impl_.view_range_) + sizeof(MessageOfButcher::_impl_.view_range_) - PROTOBUF_FIELD_OFFSET(MessageOfButcher, _impl_.x_)>( + PROTOBUF_FIELD_OFFSET(MessageOfButcher, _impl_.radius_) + sizeof(MessageOfButcher::_impl_.radius_) - PROTOBUF_FIELD_OFFSET(MessageOfButcher, _impl_.x_)>( reinterpret_cast(&_impl_.x_), reinterpret_cast(&other->_impl_.x_) ); diff --git a/CAPI/proto/Message2Clients.pb.h b/CAPI/proto/Message2Clients.pb.h index 56dd925..2e55046 100644 --- a/CAPI/proto/Message2Clients.pb.h +++ b/CAPI/proto/Message2Clients.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -265,7 +265,7 @@ namespace protobuf enum : int { - kBuffFieldNumber = 17, + kBuffFieldNumber = 18, kXFieldNumber = 1, kYFieldNumber = 2, kSpeedFieldNumber = 3, @@ -282,8 +282,9 @@ namespace protobuf kViewRangeFieldNumber = 16, kGroundTimeFieldNumber = 14, kPlayerIdFieldNumber = 15, + kRadiusFieldNumber = 17, }; - // repeated .protobuf.HumanBuffType buff = 17; + // repeated .protobuf.HumanBuffType buff = 18; int buff_size() const; private: @@ -463,6 +464,16 @@ namespace protobuf int64_t _internal_player_id() const; void _internal_set_player_id(int64_t value); + public: + // int32 radius = 17; + void clear_radius(); + int32_t radius() const; + void set_radius(int32_t value); + + private: + int32_t _internal_radius() const; + void _internal_set_radius(int32_t value); + public: // @@protoc_insertion_point(class_scope:protobuf.MessageOfHuman) @@ -493,6 +504,7 @@ namespace protobuf int32_t view_range_; double ground_time_; int64_t player_id_; + int32_t radius_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union @@ -661,7 +673,7 @@ namespace protobuf enum : int { - kBuffFieldNumber = 13, + kBuffFieldNumber = 14, kXFieldNumber = 1, kYFieldNumber = 2, kSpeedFieldNumber = 3, @@ -674,8 +686,9 @@ namespace protobuf kMovableFieldNumber = 10, kPlayerIDFieldNumber = 11, kViewRangeFieldNumber = 12, + kRadiusFieldNumber = 13, }; - // repeated .protobuf.ButcherBuffType buff = 13; + // repeated .protobuf.ButcherBuffType buff = 14; int buff_size() const; private: @@ -815,6 +828,16 @@ namespace protobuf int32_t _internal_view_range() const; void _internal_set_view_range(int32_t value); + public: + // int32 radius = 13; + void clear_radius(); + int32_t radius() const; + void set_radius(int32_t value); + + private: + int32_t _internal_radius() const; + void _internal_set_radius(int32_t value); + public: // @@protoc_insertion_point(class_scope:protobuf.MessageOfButcher) @@ -841,6 +864,7 @@ namespace protobuf bool movable_; int64_t playerid_; int32_t view_range_; + int32_t radius_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union @@ -3063,7 +3087,31 @@ namespace protobuf // @@protoc_insertion_point(field_set:protobuf.MessageOfHuman.view_range) } - // repeated .protobuf.HumanBuffType buff = 17; + // int32 radius = 17; + inline void MessageOfHuman::clear_radius() + { + _impl_.radius_ = 0; + } + inline int32_t MessageOfHuman::_internal_radius() const + { + return _impl_.radius_; + } + inline int32_t MessageOfHuman::radius() const + { + // @@protoc_insertion_point(field_get:protobuf.MessageOfHuman.radius) + return _internal_radius(); + } + inline void MessageOfHuman::_internal_set_radius(int32_t value) + { + _impl_.radius_ = value; + } + inline void MessageOfHuman::set_radius(int32_t value) + { + _internal_set_radius(value); + // @@protoc_insertion_point(field_set:protobuf.MessageOfHuman.radius) + } + + // repeated .protobuf.HumanBuffType buff = 18; inline int MessageOfHuman::_internal_buff_size() const { return _impl_.buff_.size(); @@ -3409,7 +3457,31 @@ namespace protobuf // @@protoc_insertion_point(field_set:protobuf.MessageOfButcher.view_range) } - // repeated .protobuf.ButcherBuffType buff = 13; + // int32 radius = 13; + inline void MessageOfButcher::clear_radius() + { + _impl_.radius_ = 0; + } + inline int32_t MessageOfButcher::_internal_radius() const + { + return _impl_.radius_; + } + inline int32_t MessageOfButcher::radius() const + { + // @@protoc_insertion_point(field_get:protobuf.MessageOfButcher.radius) + return _internal_radius(); + } + inline void MessageOfButcher::_internal_set_radius(int32_t value) + { + _impl_.radius_ = value; + } + inline void MessageOfButcher::set_radius(int32_t value) + { + _internal_set_radius(value); + // @@protoc_insertion_point(field_set:protobuf.MessageOfButcher.radius) + } + + // repeated .protobuf.ButcherBuffType buff = 14; inline int MessageOfButcher::_internal_buff_size() const { return _impl_.buff_.size(); diff --git a/CAPI/proto/Message2Server.pb.h b/CAPI/proto/Message2Server.pb.h index 5fc361c..3dd7f2d 100644 --- a/CAPI/proto/Message2Server.pb.h +++ b/CAPI/proto/Message2Server.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/CAPI/proto/MessageType.pb.h b/CAPI/proto/MessageType.pb.h index 3f01977..b5021c0 100644 --- a/CAPI/proto/MessageType.pb.h +++ b/CAPI/proto/MessageType.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/CAPI/proto/Services.pb.h b/CAPI/proto/Services.pb.h index 10d177e..da6d296 100644 --- a/CAPI/proto/Services.pb.h +++ b/CAPI/proto/Services.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/dependency/proto/.clang-format b/dependency/proto/.clang-format old mode 100644 new mode 100755 diff --git a/dependency/proto/Message2Clients.proto b/dependency/proto/Message2Clients.proto old mode 100644 new mode 100755 index baa48f0..fc24392 --- a/dependency/proto/Message2Clients.proto +++ b/dependency/proto/Message2Clients.proto @@ -22,7 +22,8 @@ message MessageOfHuman double ground_time = 14; // 倒地时间 int64 player_id = 15; int32 view_range = 16; // 视野距离 - repeated HumanBuffType buff = 17; + int32 radius = 17; // 半径 + repeated HumanBuffType buff = 18; } message MessageOfButcher @@ -39,7 +40,8 @@ message MessageOfButcher bool movable = 10; // 是否进入了攻击后摇 int64 playerID = 11; int32 view_range = 12; // 视野距离 - repeated ButcherBuffType buff = 13; + int32 radius = 13; // 半径 + repeated ButcherBuffType buff = 14; } message MessageOfProp // 可拾取道具的信息 diff --git a/dependency/proto/Message2Server.proto b/dependency/proto/Message2Server.proto old mode 100644 new mode 100755 diff --git a/dependency/proto/MessageType.proto b/dependency/proto/MessageType.proto old mode 100644 new mode 100755 diff --git a/dependency/proto/README.md b/dependency/proto/README.md old mode 100644 new mode 100755 diff --git a/dependency/proto/cpp_output.sh b/dependency/proto/cpp_output.sh old mode 100644 new mode 100755 diff --git a/dependency/proto/format.sh b/dependency/proto/format.sh old mode 100644 new mode 100755