diff --git a/bin/proto/net.proto b/bin/proto/net.proto index c9d5c95b..4474cad1 100644 --- a/bin/proto/net.proto +++ b/bin/proto/net.proto @@ -579,4 +579,15 @@ message PROBUFF_NET_FAMIL_LIST_RESPONSE { optional int64 m_familid = 1; repeated pbdb.db_family m_family = 2; +} + +message PROBUFF_NET_CHANGE_FAMILNAME +{ + optional int64 m_familid = 1; + optional string m_name = 2; // 修改军团名称 +} + +message PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE +{ + optional int32 m_stat = 1; // 状态 } \ No newline at end of file diff --git a/public/cpp/actor/actor_logic/game/actor_role_cmd.cpp b/public/cpp/actor/actor_logic/game/actor_role_cmd.cpp index 6f415f70..0c8e2b91 100644 --- a/public/cpp/actor/actor_logic/game/actor_role_cmd.cpp +++ b/public/cpp/actor/actor_logic/game/actor_role_cmd.cpp @@ -119,6 +119,59 @@ namespace ngl role->handle_forward(lmessage); } ); + + handle_cmd::push("/create_family", [](actor_role* role, const char* aparm) + { + auto pro = std::make_shared(); + pro->set_m_name(aparm); + message lmessage(1, nullptr, pro); + role->handle_forward(lmessage); + } + ); + + handle_cmd::push("/family", [](actor_role* role, const char* aparm) + { + auto pro = std::make_shared(); + if(aparm != std::string("")) + pro->set_m_familid(tools::lexical_cast(aparm)); + else + pro->set_m_familid(-1); + message lmessage(1, nullptr, pro); + role->handle_forward(lmessage); + } + ); + + handle_cmd::push("/join_family", [](actor_role* role, const char* aparm) + { + auto pro = std::make_shared(); + pro->set_m_familid(tools::lexical_cast(aparm)); + message lmessage(1, nullptr, pro); + role->handle_forward(lmessage); + } + ); + + handle_cmd::push("/leave_family", [](actor_role* role, const char* aparm) + { + auto pro = std::make_shared(); + pro->set_m_familid(tools::lexical_cast(aparm)); + message lmessage(1, nullptr, pro); + role->handle_forward(lmessage); + } + ); + + handle_cmd::push("/change_familyname", [](actor_role* role, const char* aparm) + { + auto pro = std::make_shared(); + int64_t lfamilylid = 0; + std::string lfamilylname; + if (tools::splite(aparm, "*", lfamilylid, lfamilylname) == false) + return; + pro->set_m_familid(lfamilylid); + pro->set_m_name(lfamilylname); + message lmessage(1, nullptr, pro); + role->handle_forward(lmessage); + } + ); } std::string& lkey = lvec[0]; diff --git a/public/cpp/actor/actor_logic/robot/actor_robot.cpp b/public/cpp/actor/actor_logic/robot/actor_robot.cpp index c7138c1c..8e2fe2c0 100644 --- a/public/cpp/actor/actor_logic/robot/actor_robot.cpp +++ b/public/cpp/actor/actor_logic/robot/actor_robot.cpp @@ -204,21 +204,82 @@ namespace ngl bool actor_robot::handle(message& adata) { + auto lstream = log_error(); + (*lstream) << + std::format( + "创建军团{}！err={}", + adata.get_data()->m_stat() == 0 ? "成功" : "失败", + adata.get_data()->m_stat() + ); + lstream->print(""); return true; } bool actor_robot::handle(message& adata) { + auto lstream = log_error(); + (*lstream) << + std::format( + "加入军团{}！err={}", + adata.get_data()->m_stat() == 0 ? "成功" : "失败", + adata.get_data()->m_stat() + ); + lstream->print(""); return true; } bool actor_robot::handle(message& adata) { + auto lstream = log_error(); + (*lstream) << + std::format( + "离开军团{}！err={}", + adata.get_data()->m_stat() == 0 ? "成功" : "失败", + adata.get_data()->m_stat() + ); + lstream->print(""); return true; } bool actor_robot::handle(message& adata) { + pbnet::PROBUFF_NET_FAMIL_LIST_RESPONSE* lpdata = adata.get_data(); + auto lstream = log_error(); + (*lstream) << "##############famil list start##############" << std::endl; + for (const auto& item : lpdata->m_family()) + { + std::strstream lstrstream; + for (const auto& [_roleid, _familyer] : item.m_member()) + { + lstrstream << _roleid << "*"; + } + + (*lstream) << std::format( + "id:{} name:{} lv:{} exp:{} createutc:{} leader:{} m_member:[{}]", + item.m_id(), + item.m_name(), + item.m_lv(), + item.m_exp(), + item.m_createutc(), + item.m_leader(), + lstrstream.str() + ) << std::endl; + } + (*lstream) << "##############famil list finish##############" << std::endl; + lstream->print(""); + return true; + } + + bool actor_robot::handle(message& adata) + { + auto lstream = log_error(); + (*lstream) << + std::format( + "修改军团名称{}！err={}", + adata.get_data()->m_stat() == 0 ? "成功" : "失败", + adata.get_data()->m_stat() + ); + lstream->print(""); return true; } diff --git a/public/cpp/actor/actor_logic/robot/actor_robot.h b/public/cpp/actor/actor_logic/robot/actor_robot.h index 900a5ea7..7090a1b6 100644 --- a/public/cpp/actor/actor_logic/robot/actor_robot.h +++ b/public/cpp/actor/actor_logic/robot/actor_robot.h @@ -52,6 +52,7 @@ namespace ngl bool handle(message& adata); bool handle(message& adata); bool handle(message& adata); + bool handle(message& adata); }; class actor_manage_robot : public actor diff --git a/public/cpp/actor/nactor_auto.cpp b/public/cpp/actor/nactor_auto.cpp index 165fad22..64752461 100644 --- a/public/cpp/actor/nactor_auto.cpp +++ b/public/cpp/actor/nactor_auto.cpp @@ -240,6 +240,7 @@ namespace ngl , pbnet::PROBUFF_NET_JOIN_FAMIL , pbnet::PROBUFF_NET_LEAVE_FAMIL , pbnet::PROBUFF_NET_FAMIL_LIST + , pbnet::PROBUFF_NET_CHANGE_FAMILNAME >(); } @@ -263,6 +264,7 @@ namespace ngl , pbnet::PROBUFF_NET_JOIN_FAMIL_RESPONSE , pbnet::PROBUFF_NET_LEAVE_FAMIL_RESPONSE , pbnet::PROBUFF_NET_FAMIL_LIST_RESPONSE + , pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE >(); } }//namespace ngl \ No newline at end of file diff --git a/public/cpp/logic/public/public/family/actor_family.h b/public/cpp/logic/public/public/family/actor_family.h index bd08e5ba..0ffdbf2d 100644 --- a/public/cpp/logic/public/public/family/actor_family.h +++ b/public/cpp/logic/public/public/family/actor_family.h @@ -73,7 +73,7 @@ namespace ngl return true; } - // # + // # 뿪 bool handle(message>& adata) { i64_actorid lroleid = adata.get_data()->identifier(); @@ -90,6 +90,16 @@ namespace ngl m_family.sync_family(adata.get_data()->identifier(), adata.get_data()->data()->m_familid()); return true; } + // # ޸ľ + bool handle(message>& adata) + { + m_family.change_familyname( + adata.get_data()->identifier(), + adata.get_data()->data()->m_familid(), + adata.get_data()->data()->m_name() + ); + return true; + } using handle_cmd = cmd; // ## GMmail diff --git a/public/cpp/logic/public/public/family/family.cpp b/public/cpp/logic/public/public/family/family.cpp index 11c2ea16..73ef0905 100644 --- a/public/cpp/logic/public/public/family/family.cpp +++ b/public/cpp/logic/public/public/family/family.cpp @@ -132,6 +132,11 @@ namespace ngl { return; } + if (aroleid != -1) + { + if (lpconstfamily->m_leader() != aroleid) + return; + } pbdb::db_family* lpfamily = get_family(afamilyid); if (lpfamily == nullptr) { diff --git a/public/cpp/protocol/protobuf/net.pb.cc b/public/cpp/protocol/protobuf/net.pb.cc index f9142d5f..1811cefa 100644 --- a/public/cpp/protocol/protobuf/net.pb.cc +++ b/public/cpp/protocol/protobuf/net.pb.cc @@ -342,6 +342,14 @@ class PROBUFF_NET_FAMIL_LIST_RESPONSEDefaultTypeInternal { public: ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _PROBUFF_NET_FAMIL_LIST_RESPONSE_default_instance_; +class PROBUFF_NET_CHANGE_FAMILNAMEDefaultTypeInternal { + public: + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; +} _PROBUFF_NET_CHANGE_FAMILNAME_default_instance_; +class PROBUFF_NET_CHANGE_FAMILNAME_RESPONSEDefaultTypeInternal { + public: + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; +} _PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE_default_instance_; } // namespace pbnet static void InitDefaultsscc_info_MATCHING_MEMBER_net_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -487,6 +495,34 @@ ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_PROBUFF_NET_CHANGE_ANGLE_ {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 1, 0, InitDefaultsscc_info_PROBUFF_NET_CHANGE_ANGLE_net_2eproto}, { &scc_info_UNIT_POSITION_net_2eproto.base,}}; +static void InitDefaultsscc_info_PROBUFF_NET_CHANGE_FAMILNAME_net_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::pbnet::_PROBUFF_NET_CHANGE_FAMILNAME_default_instance_; + new (ptr) ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME(); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + } + ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME::InitAsDefaultInstance(); +} + +::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_PROBUFF_NET_CHANGE_FAMILNAME_net_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_PROBUFF_NET_CHANGE_FAMILNAME_net_2eproto}, {}}; + +static void InitDefaultsscc_info_PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE_net_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::pbnet::_PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE_default_instance_; + new (ptr) ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE(); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + } + ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::InitAsDefaultInstance(); +} + +::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE_net_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE_net_2eproto}, {}}; + static void InitDefaultsscc_info_PROBUFF_NET_CHAT_net_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -1441,7 +1477,7 @@ static void InitDefaultsscc_info_drop_item_net_2eproto() { ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_drop_item_net_2eproto = {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_drop_item_net_2eproto}, {}}; -static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_net_2eproto[77]; +static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_net_2eproto[79]; static const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* file_level_enum_descriptors_net_2eproto[8]; static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_net_2eproto = nullptr; @@ -2126,6 +2162,22 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_net_2eproto::offsets[] PROTOBU PROTOBUF_FIELD_OFFSET(::pbnet::PROBUFF_NET_FAMIL_LIST_RESPONSE, m_family_), 0, ~0u, + PROTOBUF_FIELD_OFFSET(::pbnet::PROBUFF_NET_CHANGE_FAMILNAME, _has_bits_), + PROTOBUF_FIELD_OFFSET(::pbnet::PROBUFF_NET_CHANGE_FAMILNAME, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::pbnet::PROBUFF_NET_CHANGE_FAMILNAME, m_familid_), + PROTOBUF_FIELD_OFFSET(::pbnet::PROBUFF_NET_CHANGE_FAMILNAME, m_name_), + 1, + 0, + PROTOBUF_FIELD_OFFSET(::pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE, _has_bits_), + PROTOBUF_FIELD_OFFSET(::pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE, m_stat_), + 0, }; static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::pbnet::PROBUFF_NET_HEARTBEAT)}, @@ -2205,6 +2257,8 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOB { 657, 663, sizeof(::pbnet::PROBUFF_NET_LEAVE_FAMIL_RESPONSE)}, { 664, 670, sizeof(::pbnet::PROBUFF_NET_FAMIL_LIST)}, { 671, 678, sizeof(::pbnet::PROBUFF_NET_FAMIL_LIST_RESPONSE)}, + { 680, 687, sizeof(::pbnet::PROBUFF_NET_CHANGE_FAMILNAME)}, + { 689, 695, sizeof(::pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE)}, }; static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { @@ -2285,6 +2339,8 @@ static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = reinterpret_cast(&::pbnet::_PROBUFF_NET_LEAVE_FAMIL_RESPONSE_default_instance_), reinterpret_cast(&::pbnet::_PROBUFF_NET_FAMIL_LIST_default_instance_), reinterpret_cast(&::pbnet::_PROBUFF_NET_FAMIL_LIST_RESPONSE_default_instance_), + reinterpret_cast(&::pbnet::_PROBUFF_NET_CHANGE_FAMILNAME_default_instance_), + reinterpret_cast(&::pbnet::_PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE_default_instance_), }; const char descriptor_table_protodef_net_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = @@ -2487,33 +2543,37 @@ const char descriptor_table_protodef_net_2eproto[] PROTOBUF_SECTION_VARIABLE(pro "T_FAMIL_LIST\022\026\n\tm_familid\030\001 \001(\003H\000\210\001\001B\014\n\n" "_m_familid\"j\n\037PROBUFF_NET_FAMIL_LIST_RES" "PONSE\022\026\n\tm_familid\030\001 \001(\003H\000\210\001\001\022!\n\010m_famil" - "y\030\002 \003(\0132\017.pbdb.db_familyB\014\n\n_m_familid*F" - "\n\017enum_logic_chat\022\021\n\rget_chat_list\020\000\022\016\n\n" - "chat_speak\020\001\022\020\n\014updata_speck\020\002*<\n\005eunit\022" - "\016\n\neunit_role\020\000\022\021\n\reunit_monster\020\001\022\020\n\014eu" - "nit_region\020\002*s\n\teunitstat\022\024\n\020eunitstat_n" - "ormal\020\000\022\024\n\020eunitstat_nomove\020\001\022\034\n\030eunitst" - "at_nonormalattack\020\002\022\034\n\030eunitstat_norelea" - "seskill\020\004*;\n\006eplays\022\037\n\033eplays_go_undergr" - "oundpalace\020\000\022\020\n\014eplays_count\020\001*\233\001\n\025ematc" - "hing_cancel_stat\022\034\n\030ematching_cancel_suc" - "cess\020\000\022\032\n\026ematching_cancel_stage\020\001\022 \n\034em" - "atching_cancel_roomnotfind\020\002\022&\n\"ematchin" - "g_cancel_roommembernotfind\020\003*\253\001\n\025etype_m" - "atching_cancel\022 \n\034etype_matching_cancel_" - "active\020\000\022!\n\035etype_matching_cancel_timeou" - "t\020\001\022&\n\"etype_matching_waitconfirm_timeou" - "t\020\002\022%\n!etype_matching_waitcreate_timeout" - "\020\003*\240\001\n\026ematching_confirm_stat\022\035\n\031ematchi" - "ng_confirm_success\020\000\022\033\n\027ematching_confir" - "m_stage\020\001\022!\n\035ematching_confirm_roomnotfi" - "nd\020\002\022\'\n#ematching_confirm_roommembernotf" - "ind\020\003B\002H\001b\006proto3" + "y\030\002 \003(\0132\017.pbdb.db_familyB\014\n\n_m_familid\"d" + "\n\034PROBUFF_NET_CHANGE_FAMILNAME\022\026\n\tm_fami" + "lid\030\001 \001(\003H\000\210\001\001\022\023\n\006m_name\030\002 \001(\tH\001\210\001\001B\014\n\n_" + "m_familidB\t\n\007_m_name\"G\n%PROBUFF_NET_CHAN" + "GE_FAMILNAME_RESPONSE\022\023\n\006m_stat\030\001 \001(\005H\000\210" + "\001\001B\t\n\007_m_stat*F\n\017enum_logic_chat\022\021\n\rget_" + "chat_list\020\000\022\016\n\nchat_speak\020\001\022\020\n\014updata_sp" + "eck\020\002*<\n\005eunit\022\016\n\neunit_role\020\000\022\021\n\reunit_" + "monster\020\001\022\020\n\014eunit_region\020\002*s\n\teunitstat" + "\022\024\n\020eunitstat_normal\020\000\022\024\n\020eunitstat_nomo" + "ve\020\001\022\034\n\030eunitstat_nonormalattack\020\002\022\034\n\030eu" + "nitstat_noreleaseskill\020\004*;\n\006eplays\022\037\n\033ep" + "lays_go_undergroundpalace\020\000\022\020\n\014eplays_co" + "unt\020\001*\233\001\n\025ematching_cancel_stat\022\034\n\030ematc" + "hing_cancel_success\020\000\022\032\n\026ematching_cance" + "l_stage\020\001\022 \n\034ematching_cancel_roomnotfin" + "d\020\002\022&\n\"ematching_cancel_roommembernotfin" + "d\020\003*\253\001\n\025etype_matching_cancel\022 \n\034etype_m" + "atching_cancel_active\020\000\022!\n\035etype_matchin" + "g_cancel_timeout\020\001\022&\n\"etype_matching_wai" + "tconfirm_timeout\020\002\022%\n!etype_matching_wai" + "tcreate_timeout\020\003*\240\001\n\026ematching_confirm_" + "stat\022\035\n\031ematching_confirm_success\020\000\022\033\n\027e" + "matching_confirm_stage\020\001\022!\n\035ematching_co" + "nfirm_roomnotfind\020\002\022\'\n#ematching_confirm" + "_roommembernotfind\020\003B\002H\001b\006proto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_net_2eproto_deps[1] = { &::descriptor_table_db_2eproto, }; -static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_net_2eproto_sccs[77] = { +static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_net_2eproto_sccs[79] = { &scc_info_MATCHING_MEMBER_net_2eproto.base, &scc_info_PROBUFF_NET_ACOUNT_LOGIN_net_2eproto.base, &scc_info_PROBUFF_NET_ACOUNT_LOGIN_RESPONSE_net_2eproto.base, @@ -2524,6 +2584,8 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_net &scc_info_PROBUFF_NET_BAG_UPDATE_RESPONSE_additem_net_2eproto.base, &scc_info_PROBUFF_NET_BAG_UPDATE_RESPONSE_delitem_net_2eproto.base, &scc_info_PROBUFF_NET_CHANGE_ANGLE_net_2eproto.base, + &scc_info_PROBUFF_NET_CHANGE_FAMILNAME_net_2eproto.base, + &scc_info_PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE_net_2eproto.base, &scc_info_PROBUFF_NET_CHAT_net_2eproto.base, &scc_info_PROBUFF_NET_CHAT_RESPONSE_net_2eproto.base, &scc_info_PROBUFF_NET_CMD_net_2eproto.base, @@ -2594,10 +2656,10 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_net }; static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_net_2eproto_once; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_net_2eproto = { - false, false, descriptor_table_protodef_net_2eproto, "net.proto", 8817, - &descriptor_table_net_2eproto_once, descriptor_table_net_2eproto_sccs, descriptor_table_net_2eproto_deps, 77, 1, + false, false, descriptor_table_protodef_net_2eproto, "net.proto", 8992, + &descriptor_table_net_2eproto_once, descriptor_table_net_2eproto_sccs, descriptor_table_net_2eproto_deps, 79, 1, schemas, file_default_instances, TableStruct_net_2eproto::offsets, - file_level_metadata_net_2eproto, 77, file_level_enum_descriptors_net_2eproto, file_level_service_descriptors_net_2eproto, + file_level_metadata_net_2eproto, 79, file_level_enum_descriptors_net_2eproto, file_level_service_descriptors_net_2eproto, }; // Force running AddDescriptors() at dynamic initialization time. @@ -21108,6 +21170,473 @@ ::PROTOBUF_NAMESPACE_ID::Metadata PROBUFF_NET_FAMIL_LIST_RESPONSE::GetMetadata() } +// =================================================================== + +void PROBUFF_NET_CHANGE_FAMILNAME::InitAsDefaultInstance() { +} +class PROBUFF_NET_CHANGE_FAMILNAME::_Internal { + public: + using HasBits = decltype(std::declval()._has_bits_); + static void set_has_m_familid(HasBits* has_bits) { + (*has_bits)[0] |= 2u; + } + static void set_has_m_name(HasBits* has_bits) { + (*has_bits)[0] |= 1u; + } +}; + +PROBUFF_NET_CHANGE_FAMILNAME::PROBUFF_NET_CHANGE_FAMILNAME(::PROTOBUF_NAMESPACE_ID::Arena* arena) + : ::PROTOBUF_NAMESPACE_ID::Message(arena) { + SharedCtor(); + RegisterArenaDtor(arena); + // @@protoc_insertion_point(arena_constructor:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) +} +PROBUFF_NET_CHANGE_FAMILNAME::PROBUFF_NET_CHANGE_FAMILNAME(const PROBUFF_NET_CHANGE_FAMILNAME& from) + : ::PROTOBUF_NAMESPACE_ID::Message(), + _has_bits_(from._has_bits_) { + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + m_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (from._internal_has_m_name()) { + m_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_m_name(), + GetArena()); + } + m_familid_ = from.m_familid_; + // @@protoc_insertion_point(copy_constructor:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) +} + +void PROBUFF_NET_CHANGE_FAMILNAME::SharedCtor() { + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_PROBUFF_NET_CHANGE_FAMILNAME_net_2eproto.base); + m_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + m_familid_ = PROTOBUF_LONGLONG(0); +} + +PROBUFF_NET_CHANGE_FAMILNAME::~PROBUFF_NET_CHANGE_FAMILNAME() { + // @@protoc_insertion_point(destructor:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + SharedDtor(); + _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); +} + +void PROBUFF_NET_CHANGE_FAMILNAME::SharedDtor() { + GOOGLE_DCHECK(GetArena() == nullptr); + m_name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); +} + +void PROBUFF_NET_CHANGE_FAMILNAME::ArenaDtor(void* object) { + PROBUFF_NET_CHANGE_FAMILNAME* _this = reinterpret_cast< PROBUFF_NET_CHANGE_FAMILNAME* >(object); + (void)_this; +} +void PROBUFF_NET_CHANGE_FAMILNAME::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) { +} +void PROBUFF_NET_CHANGE_FAMILNAME::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const PROBUFF_NET_CHANGE_FAMILNAME& PROBUFF_NET_CHANGE_FAMILNAME::default_instance() { + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_PROBUFF_NET_CHANGE_FAMILNAME_net_2eproto.base); + return *internal_default_instance(); +} + + +void PROBUFF_NET_CHANGE_FAMILNAME::Clear() { +// @@protoc_insertion_point(message_clear_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + cached_has_bits = _has_bits_[0]; + if (cached_has_bits & 0x00000001u) { + m_name_.ClearNonDefaultToEmpty(); + } + m_familid_ = PROTOBUF_LONGLONG(0); + _has_bits_.Clear(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); +} + +const char* PROBUFF_NET_CHANGE_FAMILNAME::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + _Internal::HasBits has_bits{}; + ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena; + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); + switch (tag >> 3) { + // int64 m_familid = 1; + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + _Internal::set_has_m_familid(&has_bits); + m_familid_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; + // string m_name = 2; + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + auto str = _internal_mutable_m_name(); + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); + CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_name")); + CHK_(ptr); + } else goto handle_unusual; + continue; + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->SetLastTag(tag); + goto success; + } + ptr = UnknownFieldParse(tag, + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + ptr, ctx); + CHK_(ptr != nullptr); + continue; + } + } // switch + } // while +success: + _has_bits_.Or(has_bits); + return ptr; +failure: + ptr = nullptr; + goto success; +#undef CHK_ +} + +::PROTOBUF_NAMESPACE_ID::uint8* PROBUFF_NET_CHANGE_FAMILNAME::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // int64 m_familid = 1; + if (_internal_has_m_familid()) { + target = stream->EnsureSpace(target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_m_familid(), target); + } + + // string m_name = 2; + if (_internal_has_m_name()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_m_name().data(), static_cast(this->_internal_m_name().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + "pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_name"); + target = stream->WriteStringMaybeAliased( + 2, this->_internal_m_name(), target); + } + + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + } + // @@protoc_insertion_point(serialize_to_array_end:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + return target; +} + +size_t PROBUFF_NET_CHANGE_FAMILNAME::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + size_t total_size = 0; + + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + cached_has_bits = _has_bits_[0]; + if (cached_has_bits & 0x00000003u) { + // string m_name = 2; + if (cached_has_bits & 0x00000001u) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_m_name()); + } + + // int64 m_familid = 1; + if (cached_has_bits & 0x00000002u) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( + this->_internal_m_familid()); + } + + } + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void PROBUFF_NET_CHANGE_FAMILNAME::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + GOOGLE_DCHECK_NE(&from, this); + const PROBUFF_NET_CHANGE_FAMILNAME* source = + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + MergeFrom(*source); + } +} + +void PROBUFF_NET_CHANGE_FAMILNAME::MergeFrom(const PROBUFF_NET_CHANGE_FAMILNAME& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + cached_has_bits = from._has_bits_[0]; + if (cached_has_bits & 0x00000003u) { + if (cached_has_bits & 0x00000001u) { + _internal_set_m_name(from._internal_m_name()); + } + if (cached_has_bits & 0x00000002u) { + m_familid_ = from.m_familid_; + } + _has_bits_[0] |= cached_has_bits; + } +} + +void PROBUFF_NET_CHANGE_FAMILNAME::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void PROBUFF_NET_CHANGE_FAMILNAME::CopyFrom(const PROBUFF_NET_CHANGE_FAMILNAME& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool PROBUFF_NET_CHANGE_FAMILNAME::IsInitialized() const { + return true; +} + +void PROBUFF_NET_CHANGE_FAMILNAME::InternalSwap(PROBUFF_NET_CHANGE_FAMILNAME* other) { + using std::swap; + _internal_metadata_.Swap<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(&other->_internal_metadata_); + swap(_has_bits_[0], other->_has_bits_[0]); + m_name_.Swap(&other->m_name_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena()); + swap(m_familid_, other->m_familid_); +} + +::PROTOBUF_NAMESPACE_ID::Metadata PROBUFF_NET_CHANGE_FAMILNAME::GetMetadata() const { + return GetMetadataStatic(); +} + + +// =================================================================== + +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::InitAsDefaultInstance() { +} +class PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::_Internal { + public: + using HasBits = decltype(std::declval()._has_bits_); + static void set_has_m_stat(HasBits* has_bits) { + (*has_bits)[0] |= 1u; + } +}; + +PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE(::PROTOBUF_NAMESPACE_ID::Arena* arena) + : ::PROTOBUF_NAMESPACE_ID::Message(arena) { + SharedCtor(); + RegisterArenaDtor(arena); + // @@protoc_insertion_point(arena_constructor:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) +} +PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE(const PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& from) + : ::PROTOBUF_NAMESPACE_ID::Message(), + _has_bits_(from._has_bits_) { + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + m_stat_ = from.m_stat_; + // @@protoc_insertion_point(copy_constructor:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) +} + +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::SharedCtor() { + m_stat_ = 0; +} + +PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::~PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE() { + // @@protoc_insertion_point(destructor:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + SharedDtor(); + _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); +} + +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::SharedDtor() { + GOOGLE_DCHECK(GetArena() == nullptr); +} + +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::ArenaDtor(void* object) { + PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* _this = reinterpret_cast< PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* >(object); + (void)_this; +} +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) { +} +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::default_instance() { + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE_net_2eproto.base); + return *internal_default_instance(); +} + + +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::Clear() { +// @@protoc_insertion_point(message_clear_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + m_stat_ = 0; + _has_bits_.Clear(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); +} + +const char* PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + _Internal::HasBits has_bits{}; + ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena; + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); + switch (tag >> 3) { + // int32 m_stat = 1; + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + _Internal::set_has_m_stat(&has_bits); + m_stat_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->SetLastTag(tag); + goto success; + } + ptr = UnknownFieldParse(tag, + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + ptr, ctx); + CHK_(ptr != nullptr); + continue; + } + } // switch + } // while +success: + _has_bits_.Or(has_bits); + return ptr; +failure: + ptr = nullptr; + goto success; +#undef CHK_ +} + +::PROTOBUF_NAMESPACE_ID::uint8* PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::_InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // int32 m_stat = 1; + if (_internal_has_m_stat()) { + target = stream->EnsureSpace(target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(1, this->_internal_m_stat(), target); + } + + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + } + // @@protoc_insertion_point(serialize_to_array_end:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + return target; +} + +size_t PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + size_t total_size = 0; + + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // int32 m_stat = 1; + cached_has_bits = _has_bits_[0]; + if (cached_has_bits & 0x00000001u) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( + this->_internal_m_stat()); + } + + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + GOOGLE_DCHECK_NE(&from, this); + const PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* source = + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + MergeFrom(*source); + } +} + +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::MergeFrom(const PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from._internal_has_m_stat()) { + _internal_set_m_stat(from._internal_m_stat()); + } +} + +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::CopyFrom(const PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::IsInitialized() const { + return true; +} + +void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::InternalSwap(PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* other) { + using std::swap; + _internal_metadata_.Swap<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(&other->_internal_metadata_); + swap(_has_bits_[0], other->_has_bits_[0]); + swap(m_stat_, other->m_stat_); +} + +::PROTOBUF_NAMESPACE_ID::Metadata PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::GetMetadata() const { + return GetMetadataStatic(); +} + + // @@protoc_insertion_point(namespace_scope) } // namespace pbnet PROTOBUF_NAMESPACE_OPEN @@ -21342,6 +21871,12 @@ template<> PROTOBUF_NOINLINE ::pbnet::PROBUFF_NET_FAMIL_LIST* Arena::CreateMaybe template<> PROTOBUF_NOINLINE ::pbnet::PROBUFF_NET_FAMIL_LIST_RESPONSE* Arena::CreateMaybeMessage< ::pbnet::PROBUFF_NET_FAMIL_LIST_RESPONSE >(Arena* arena) { return Arena::CreateMessageInternal< ::pbnet::PROBUFF_NET_FAMIL_LIST_RESPONSE >(arena); } +template<> PROTOBUF_NOINLINE ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME* Arena::CreateMaybeMessage< ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME >(Arena* arena) { + return Arena::CreateMessageInternal< ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME >(arena); +} +template<> PROTOBUF_NOINLINE ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* Arena::CreateMaybeMessage< ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE >(Arena* arena) { + return Arena::CreateMessageInternal< ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE >(arena); +} PROTOBUF_NAMESPACE_CLOSE // @@protoc_insertion_point(global_scope) diff --git a/public/cpp/protocol/protobuf/net.pb.h b/public/cpp/protocol/protobuf/net.pb.h index 2c0b6684..af64f504 100644 --- a/public/cpp/protocol/protobuf/net.pb.h +++ b/public/cpp/protocol/protobuf/net.pb.h @@ -52,7 +52,7 @@ struct TableStruct_net_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::PROTOBUF_NAMESPACE_ID::internal::AuxiliaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[77] + static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[79] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; @@ -90,6 +90,12 @@ extern PROBUFF_NET_BAG_UPDATE_RESPONSE_delitemDefaultTypeInternal _PROBUFF_NET_B class PROBUFF_NET_CHANGE_ANGLE; class PROBUFF_NET_CHANGE_ANGLEDefaultTypeInternal; extern PROBUFF_NET_CHANGE_ANGLEDefaultTypeInternal _PROBUFF_NET_CHANGE_ANGLE_default_instance_; +class PROBUFF_NET_CHANGE_FAMILNAME; +class PROBUFF_NET_CHANGE_FAMILNAMEDefaultTypeInternal; +extern PROBUFF_NET_CHANGE_FAMILNAMEDefaultTypeInternal _PROBUFF_NET_CHANGE_FAMILNAME_default_instance_; +class PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE; +class PROBUFF_NET_CHANGE_FAMILNAME_RESPONSEDefaultTypeInternal; +extern PROBUFF_NET_CHANGE_FAMILNAME_RESPONSEDefaultTypeInternal _PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE_default_instance_; class PROBUFF_NET_CHAT; class PROBUFF_NET_CHATDefaultTypeInternal; extern PROBUFF_NET_CHATDefaultTypeInternal _PROBUFF_NET_CHAT_default_instance_; @@ -303,6 +309,8 @@ template<> ::pbnet::PROBUFF_NET_BAG_UPDATE_RESPONSE* Arena::CreateMaybeMessage<: template<> ::pbnet::PROBUFF_NET_BAG_UPDATE_RESPONSE_additem* Arena::CreateMaybeMessage<::pbnet::PROBUFF_NET_BAG_UPDATE_RESPONSE_additem>(Arena*); template<> ::pbnet::PROBUFF_NET_BAG_UPDATE_RESPONSE_delitem* Arena::CreateMaybeMessage<::pbnet::PROBUFF_NET_BAG_UPDATE_RESPONSE_delitem>(Arena*); template<> ::pbnet::PROBUFF_NET_CHANGE_ANGLE* Arena::CreateMaybeMessage<::pbnet::PROBUFF_NET_CHANGE_ANGLE>(Arena*); +template<> ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME* Arena::CreateMaybeMessage<::pbnet::PROBUFF_NET_CHANGE_FAMILNAME>(Arena*); +template<> ::pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* Arena::CreateMaybeMessage<::pbnet::PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE>(Arena*); template<> ::pbnet::PROBUFF_NET_CHAT* Arena::CreateMaybeMessage<::pbnet::PROBUFF_NET_CHAT>(Arena*); template<> ::pbnet::PROBUFF_NET_CHAT_RESPONSE* Arena::CreateMaybeMessage<::pbnet::PROBUFF_NET_CHAT_RESPONSE>(Arena*); template<> ::pbnet::PROBUFF_NET_CMD* Arena::CreateMaybeMessage<::pbnet::PROBUFF_NET_CMD>(Arena*); @@ -12435,6 +12443,312 @@ class PROBUFF_NET_FAMIL_LIST_RESPONSE PROTOBUF_FINAL : ::PROTOBUF_NAMESPACE_ID::int64 m_familid_; friend struct ::TableStruct_net_2eproto; }; +// ------------------------------------------------------------------- + +class PROBUFF_NET_CHANGE_FAMILNAME PROTOBUF_FINAL : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) */ { + public: + inline PROBUFF_NET_CHANGE_FAMILNAME() : PROBUFF_NET_CHANGE_FAMILNAME(nullptr) {} + virtual ~PROBUFF_NET_CHANGE_FAMILNAME(); + + PROBUFF_NET_CHANGE_FAMILNAME(const PROBUFF_NET_CHANGE_FAMILNAME& from); + PROBUFF_NET_CHANGE_FAMILNAME(PROBUFF_NET_CHANGE_FAMILNAME&& from) noexcept + : PROBUFF_NET_CHANGE_FAMILNAME() { + *this = ::std::move(from); + } + + inline PROBUFF_NET_CHANGE_FAMILNAME& operator=(const PROBUFF_NET_CHANGE_FAMILNAME& from) { + CopyFrom(from); + return *this; + } + inline PROBUFF_NET_CHANGE_FAMILNAME& operator=(PROBUFF_NET_CHANGE_FAMILNAME&& from) noexcept { + if (GetArena() == from.GetArena()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; + } + static const PROBUFF_NET_CHANGE_FAMILNAME& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const PROBUFF_NET_CHANGE_FAMILNAME* internal_default_instance() { + return reinterpret_cast( + &_PROBUFF_NET_CHANGE_FAMILNAME_default_instance_); + } + static constexpr int kIndexInFileMessages = + 77; + + friend void swap(PROBUFF_NET_CHANGE_FAMILNAME& a, PROBUFF_NET_CHANGE_FAMILNAME& b) { + a.Swap(&b); + } + inline void Swap(PROBUFF_NET_CHANGE_FAMILNAME* other) { + if (other == this) return; + if (GetArena() == other->GetArena()) { + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(PROBUFF_NET_CHANGE_FAMILNAME* other) { + if (other == this) return; + GOOGLE_DCHECK(GetArena() == other->GetArena()); + InternalSwap(other); + } + + // implements Message ---------------------------------------------- + + inline PROBUFF_NET_CHANGE_FAMILNAME* New() const final { + return CreateMaybeMessage(nullptr); + } + + PROBUFF_NET_CHANGE_FAMILNAME* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const PROBUFF_NET_CHANGE_FAMILNAME& from); + void MergeFrom(const PROBUFF_NET_CHANGE_FAMILNAME& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + inline void SharedCtor(); + inline void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(PROBUFF_NET_CHANGE_FAMILNAME* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "pbnet.PROBUFF_NET_CHANGE_FAMILNAME"; + } + protected: + explicit PROBUFF_NET_CHANGE_FAMILNAME(::PROTOBUF_NAMESPACE_ID::Arena* arena); + private: + static void ArenaDtor(void* object); + inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + public: + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_net_2eproto); + return ::descriptor_table_net_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + enum : int { + kMNameFieldNumber = 2, + kMFamilidFieldNumber = 1, + }; + // string m_name = 2; + bool has_m_name() const; + private: + bool _internal_has_m_name() const; + public: + void clear_m_name(); + const std::string& m_name() const; + void set_m_name(const std::string& value); + void set_m_name(std::string&& value); + void set_m_name(const char* value); + void set_m_name(const char* value, size_t size); + std::string* mutable_m_name(); + std::string* release_m_name(); + void set_allocated_m_name(std::string* m_name); + private: + const std::string& _internal_m_name() const; + void _internal_set_m_name(const std::string& value); + std::string* _internal_mutable_m_name(); + public: + + // int64 m_familid = 1; + bool has_m_familid() const; + private: + bool _internal_has_m_familid() const; + public: + void clear_m_familid(); + ::PROTOBUF_NAMESPACE_ID::int64 m_familid() const; + void set_m_familid(::PROTOBUF_NAMESPACE_ID::int64 value); + private: + ::PROTOBUF_NAMESPACE_ID::int64 _internal_m_familid() const; + void _internal_set_m_familid(::PROTOBUF_NAMESPACE_ID::int64 value); + public: + + // @@protoc_insertion_point(class_scope:pbnet.PROBUFF_NET_CHANGE_FAMILNAME) + private: + class _Internal; + + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr m_name_; + ::PROTOBUF_NAMESPACE_ID::int64 m_familid_; + friend struct ::TableStruct_net_2eproto; +}; +// ------------------------------------------------------------------- + +class PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE PROTOBUF_FINAL : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) */ { + public: + inline PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE() : PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE(nullptr) {} + virtual ~PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE(); + + PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE(const PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& from); + PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE(PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE&& from) noexcept + : PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE() { + *this = ::std::move(from); + } + + inline PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& operator=(const PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& from) { + CopyFrom(from); + return *this; + } + inline PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& operator=(PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE&& from) noexcept { + if (GetArena() == from.GetArena()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; + } + static const PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* internal_default_instance() { + return reinterpret_cast( + &_PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE_default_instance_); + } + static constexpr int kIndexInFileMessages = + 78; + + friend void swap(PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& a, PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& b) { + a.Swap(&b); + } + inline void Swap(PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* other) { + if (other == this) return; + if (GetArena() == other->GetArena()) { + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* other) { + if (other == this) return; + GOOGLE_DCHECK(GetArena() == other->GetArena()); + InternalSwap(other); + } + + // implements Message ---------------------------------------------- + + inline PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* New() const final { + return CreateMaybeMessage(nullptr); + } + + PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& from); + void MergeFrom(const PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + inline void SharedCtor(); + inline void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE"; + } + protected: + explicit PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE(::PROTOBUF_NAMESPACE_ID::Arena* arena); + private: + static void ArenaDtor(void* object); + inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + public: + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_net_2eproto); + return ::descriptor_table_net_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + enum : int { + kMStatFieldNumber = 1, + }; + // int32 m_stat = 1; + bool has_m_stat() const; + private: + bool _internal_has_m_stat() const; + public: + void clear_m_stat(); + ::PROTOBUF_NAMESPACE_ID::int32 m_stat() const; + void set_m_stat(::PROTOBUF_NAMESPACE_ID::int32 value); + private: + ::PROTOBUF_NAMESPACE_ID::int32 _internal_m_stat() const; + void _internal_set_m_stat(::PROTOBUF_NAMESPACE_ID::int32 value); + public: + + // @@protoc_insertion_point(class_scope:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE) + private: + class _Internal; + + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + typedef void InternalArenaConstructable_; + typedef void DestructorSkippable_; + ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::PROTOBUF_NAMESPACE_ID::int32 m_stat_; + friend struct ::TableStruct_net_2eproto; +}; // =================================================================== @@ -18099,6 +18413,144 @@ PROBUFF_NET_FAMIL_LIST_RESPONSE::m_family() const { return m_family_; } +// ------------------------------------------------------------------- + +// PROBUFF_NET_CHANGE_FAMILNAME + +// int64 m_familid = 1; +inline bool PROBUFF_NET_CHANGE_FAMILNAME::_internal_has_m_familid() const { + bool value = (_has_bits_[0] & 0x00000002u) != 0; + return value; +} +inline bool PROBUFF_NET_CHANGE_FAMILNAME::has_m_familid() const { + return _internal_has_m_familid(); +} +inline void PROBUFF_NET_CHANGE_FAMILNAME::clear_m_familid() { + m_familid_ = PROTOBUF_LONGLONG(0); + _has_bits_[0] &= ~0x00000002u; +} +inline ::PROTOBUF_NAMESPACE_ID::int64 PROBUFF_NET_CHANGE_FAMILNAME::_internal_m_familid() const { + return m_familid_; +} +inline ::PROTOBUF_NAMESPACE_ID::int64 PROBUFF_NET_CHANGE_FAMILNAME::m_familid() const { + // @@protoc_insertion_point(field_get:pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_familid) + return _internal_m_familid(); +} +inline void PROBUFF_NET_CHANGE_FAMILNAME::_internal_set_m_familid(::PROTOBUF_NAMESPACE_ID::int64 value) { + _has_bits_[0] |= 0x00000002u; + m_familid_ = value; +} +inline void PROBUFF_NET_CHANGE_FAMILNAME::set_m_familid(::PROTOBUF_NAMESPACE_ID::int64 value) { + _internal_set_m_familid(value); + // @@protoc_insertion_point(field_set:pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_familid) +} + +// string m_name = 2; +inline bool PROBUFF_NET_CHANGE_FAMILNAME::_internal_has_m_name() const { + bool value = (_has_bits_[0] & 0x00000001u) != 0; + return value; +} +inline bool PROBUFF_NET_CHANGE_FAMILNAME::has_m_name() const { + return _internal_has_m_name(); +} +inline void PROBUFF_NET_CHANGE_FAMILNAME::clear_m_name() { + m_name_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena()); + _has_bits_[0] &= ~0x00000001u; +} +inline const std::string& PROBUFF_NET_CHANGE_FAMILNAME::m_name() const { + // @@protoc_insertion_point(field_get:pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_name) + return _internal_m_name(); +} +inline void PROBUFF_NET_CHANGE_FAMILNAME::set_m_name(const std::string& value) { + _internal_set_m_name(value); + // @@protoc_insertion_point(field_set:pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_name) +} +inline std::string* PROBUFF_NET_CHANGE_FAMILNAME::mutable_m_name() { + // @@protoc_insertion_point(field_mutable:pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_name) + return _internal_mutable_m_name(); +} +inline const std::string& PROBUFF_NET_CHANGE_FAMILNAME::_internal_m_name() const { + return m_name_.Get(); +} +inline void PROBUFF_NET_CHANGE_FAMILNAME::_internal_set_m_name(const std::string& value) { + _has_bits_[0] |= 0x00000001u; + m_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena()); +} +inline void PROBUFF_NET_CHANGE_FAMILNAME::set_m_name(std::string&& value) { + _has_bits_[0] |= 0x00000001u; + m_name_.Set( + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena()); + // @@protoc_insertion_point(field_set_rvalue:pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_name) +} +inline void PROBUFF_NET_CHANGE_FAMILNAME::set_m_name(const char* value) { + GOOGLE_DCHECK(value != nullptr); + _has_bits_[0] |= 0x00000001u; + m_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + GetArena()); + // @@protoc_insertion_point(field_set_char:pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_name) +} +inline void PROBUFF_NET_CHANGE_FAMILNAME::set_m_name(const char* value, + size_t size) { + _has_bits_[0] |= 0x00000001u; + m_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + reinterpret_cast(value), size), GetArena()); + // @@protoc_insertion_point(field_set_pointer:pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_name) +} +inline std::string* PROBUFF_NET_CHANGE_FAMILNAME::_internal_mutable_m_name() { + _has_bits_[0] |= 0x00000001u; + return m_name_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena()); +} +inline std::string* PROBUFF_NET_CHANGE_FAMILNAME::release_m_name() { + // @@protoc_insertion_point(field_release:pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_name) + if (!_internal_has_m_name()) { + return nullptr; + } + _has_bits_[0] &= ~0x00000001u; + return m_name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena()); +} +inline void PROBUFF_NET_CHANGE_FAMILNAME::set_allocated_m_name(std::string* m_name) { + if (m_name != nullptr) { + _has_bits_[0] |= 0x00000001u; + } else { + _has_bits_[0] &= ~0x00000001u; + } + m_name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), m_name, + GetArena()); + // @@protoc_insertion_point(field_set_allocated:pbnet.PROBUFF_NET_CHANGE_FAMILNAME.m_name) +} + +// ------------------------------------------------------------------- + +// PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE + +// int32 m_stat = 1; +inline bool PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::_internal_has_m_stat() const { + bool value = (_has_bits_[0] & 0x00000001u) != 0; + return value; +} +inline bool PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::has_m_stat() const { + return _internal_has_m_stat(); +} +inline void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::clear_m_stat() { + m_stat_ = 0; + _has_bits_[0] &= ~0x00000001u; +} +inline ::PROTOBUF_NAMESPACE_ID::int32 PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::_internal_m_stat() const { + return m_stat_; +} +inline ::PROTOBUF_NAMESPACE_ID::int32 PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::m_stat() const { + // @@protoc_insertion_point(field_get:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE.m_stat) + return _internal_m_stat(); +} +inline void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::_internal_set_m_stat(::PROTOBUF_NAMESPACE_ID::int32 value) { + _has_bits_[0] |= 0x00000001u; + m_stat_ = value; +} +inline void PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE::set_m_stat(::PROTOBUF_NAMESPACE_ID::int32 value) { + _internal_set_m_stat(value); + // @@protoc_insertion_point(field_set:pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE.m_stat) +} + #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ @@ -18254,6 +18706,10 @@ PROBUFF_NET_FAMIL_LIST_RESPONSE::m_family() const { // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + // @@protoc_insertion_point(namespace_scope) diff --git a/public/csharp/csharp/csharp/protobuf/Net.cs b/public/csharp/csharp/csharp/protobuf/Net.cs index 689cfb01..a4c10721 100644 --- a/public/csharp/csharp/csharp/protobuf/Net.cs +++ b/public/csharp/csharp/csharp/protobuf/Net.cs @@ -201,25 +201,29 @@ public static partial class NetReflection { "UFJPQlVGRl9ORVRfRkFNSUxfTElTVBIWCgltX2ZhbWlsaWQYASABKANIAIgB", "AUIMCgpfbV9mYW1pbGlkImoKH1BST0JVRkZfTkVUX0ZBTUlMX0xJU1RfUkVT", "UE9OU0USFgoJbV9mYW1pbGlkGAEgASgDSACIAQESIQoIbV9mYW1pbHkYAiAD", - "KAsyDy5wYmRiLmRiX2ZhbWlseUIMCgpfbV9mYW1pbGlkKkYKD2VudW1fbG9n", - "aWNfY2hhdBIRCg1nZXRfY2hhdF9saXN0EAASDgoKY2hhdF9zcGVhaxABEhAK", - "DHVwZGF0YV9zcGVjaxACKjwKBWV1bml0Eg4KCmV1bml0X3JvbGUQABIRCg1l", - "dW5pdF9tb25zdGVyEAESEAoMZXVuaXRfcmVnaW9uEAIqcwoJZXVuaXRzdGF0", - "EhQKEGV1bml0c3RhdF9ub3JtYWwQABIUChBldW5pdHN0YXRfbm9tb3ZlEAES", - "HAoYZXVuaXRzdGF0X25vbm9ybWFsYXR0YWNrEAISHAoYZXVuaXRzdGF0X25v", - "cmVsZWFzZXNraWxsEAQqOwoGZXBsYXlzEh8KG2VwbGF5c19nb191bmRlcmdy", - "b3VuZHBhbGFjZRAAEhAKDGVwbGF5c19jb3VudBABKpsBChVlbWF0Y2hpbmdf", - "Y2FuY2VsX3N0YXQSHAoYZW1hdGNoaW5nX2NhbmNlbF9zdWNjZXNzEAASGgoW", - "ZW1hdGNoaW5nX2NhbmNlbF9zdGFnZRABEiAKHGVtYXRjaGluZ19jYW5jZWxf", - "cm9vbW5vdGZpbmQQAhImCiJlbWF0Y2hpbmdfY2FuY2VsX3Jvb21tZW1iZXJu", - "b3RmaW5kEAMqqwEKFWV0eXBlX21hdGNoaW5nX2NhbmNlbBIgChxldHlwZV9t", - "YXRjaGluZ19jYW5jZWxfYWN0aXZlEAASIQodZXR5cGVfbWF0Y2hpbmdfY2Fu", - "Y2VsX3RpbWVvdXQQARImCiJldHlwZV9tYXRjaGluZ193YWl0Y29uZmlybV90", - "aW1lb3V0EAISJQohZXR5cGVfbWF0Y2hpbmdfd2FpdGNyZWF0ZV90aW1lb3V0", - "EAMqoAEKFmVtYXRjaGluZ19jb25maXJtX3N0YXQSHQoZZW1hdGNoaW5nX2Nv", - "bmZpcm1fc3VjY2VzcxAAEhsKF2VtYXRjaGluZ19jb25maXJtX3N0YWdlEAES", - "IQodZW1hdGNoaW5nX2NvbmZpcm1fcm9vbW5vdGZpbmQQAhInCiNlbWF0Y2hp", - "bmdfY29uZmlybV9yb29tbWVtYmVybm90ZmluZBADQgJIAWIGcHJvdG8z")); + "KAsyDy5wYmRiLmRiX2ZhbWlseUIMCgpfbV9mYW1pbGlkImQKHFBST0JVRkZf", + "TkVUX0NIQU5HRV9GQU1JTE5BTUUSFgoJbV9mYW1pbGlkGAEgASgDSACIAQES", + "EwoGbV9uYW1lGAIgASgJSAGIAQFCDAoKX21fZmFtaWxpZEIJCgdfbV9uYW1l", + "IkcKJVBST0JVRkZfTkVUX0NIQU5HRV9GQU1JTE5BTUVfUkVTUE9OU0USEwoG", + "bV9zdGF0GAEgASgFSACIAQFCCQoHX21fc3RhdCpGCg9lbnVtX2xvZ2ljX2No", + "YXQSEQoNZ2V0X2NoYXRfbGlzdBAAEg4KCmNoYXRfc3BlYWsQARIQCgx1cGRh", + "dGFfc3BlY2sQAio8CgVldW5pdBIOCgpldW5pdF9yb2xlEAASEQoNZXVuaXRf", + "bW9uc3RlchABEhAKDGV1bml0X3JlZ2lvbhACKnMKCWV1bml0c3RhdBIUChBl", + "dW5pdHN0YXRfbm9ybWFsEAASFAoQZXVuaXRzdGF0X25vbW92ZRABEhwKGGV1", + "bml0c3RhdF9ub25vcm1hbGF0dGFjaxACEhwKGGV1bml0c3RhdF9ub3JlbGVh", + "c2Vza2lsbBAEKjsKBmVwbGF5cxIfChtlcGxheXNfZ29fdW5kZXJncm91bmRw", + "YWxhY2UQABIQCgxlcGxheXNfY291bnQQASqbAQoVZW1hdGNoaW5nX2NhbmNl", + "bF9zdGF0EhwKGGVtYXRjaGluZ19jYW5jZWxfc3VjY2VzcxAAEhoKFmVtYXRj", + "aGluZ19jYW5jZWxfc3RhZ2UQARIgChxlbWF0Y2hpbmdfY2FuY2VsX3Jvb21u", + "b3RmaW5kEAISJgoiZW1hdGNoaW5nX2NhbmNlbF9yb29tbWVtYmVybm90Zmlu", + "ZBADKqsBChVldHlwZV9tYXRjaGluZ19jYW5jZWwSIAocZXR5cGVfbWF0Y2hp", + "bmdfY2FuY2VsX2FjdGl2ZRAAEiEKHWV0eXBlX21hdGNoaW5nX2NhbmNlbF90", + "aW1lb3V0EAESJgoiZXR5cGVfbWF0Y2hpbmdfd2FpdGNvbmZpcm1fdGltZW91", + "dBACEiUKIWV0eXBlX21hdGNoaW5nX3dhaXRjcmVhdGVfdGltZW91dBADKqAB", + "ChZlbWF0Y2hpbmdfY29uZmlybV9zdGF0Eh0KGWVtYXRjaGluZ19jb25maXJt", + "X3N1Y2Nlc3MQABIbChdlbWF0Y2hpbmdfY29uZmlybV9zdGFnZRABEiEKHWVt", + "YXRjaGluZ19jb25maXJtX3Jvb21ub3RmaW5kEAISJwojZW1hdGNoaW5nX2Nv", + "bmZpcm1fcm9vbW1lbWJlcm5vdGZpbmQQA0ICSAFiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Pbdb.DbReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Pbnet.enum_logic_chat), typeof(global::Pbnet.eunit), typeof(global::Pbnet.eunitstat), typeof(global::Pbnet.eplays), typeof(global::Pbnet.ematching_cancel_stat), typeof(global::Pbnet.etype_matching_cancel), typeof(global::Pbnet.ematching_confirm_stat), }, null, new pbr::GeneratedClrTypeInfo[] { @@ -294,7 +298,9 @@ public static partial class NetReflection { new pbr::GeneratedClrTypeInfo(typeof(global::Pbnet.PROBUFF_NET_LEAVE_FAMIL), global::Pbnet.PROBUFF_NET_LEAVE_FAMIL.Parser, new[]{ "MFamilid" }, new[]{ "MFamilid" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Pbnet.PROBUFF_NET_LEAVE_FAMIL_RESPONSE), global::Pbnet.PROBUFF_NET_LEAVE_FAMIL_RESPONSE.Parser, new[]{ "MStat" }, new[]{ "MStat" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Pbnet.PROBUFF_NET_FAMIL_LIST), global::Pbnet.PROBUFF_NET_FAMIL_LIST.Parser, new[]{ "MFamilid" }, new[]{ "MFamilid" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Pbnet.PROBUFF_NET_FAMIL_LIST_RESPONSE), global::Pbnet.PROBUFF_NET_FAMIL_LIST_RESPONSE.Parser, new[]{ "MFamilid", "MFamily" }, new[]{ "MFamilid" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Pbnet.PROBUFF_NET_FAMIL_LIST_RESPONSE), global::Pbnet.PROBUFF_NET_FAMIL_LIST_RESPONSE.Parser, new[]{ "MFamilid", "MFamily" }, new[]{ "MFamilid" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Pbnet.PROBUFF_NET_CHANGE_FAMILNAME), global::Pbnet.PROBUFF_NET_CHANGE_FAMILNAME.Parser, new[]{ "MFamilid", "MName" }, new[]{ "MFamilid", "MName" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE), global::Pbnet.PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE.Parser, new[]{ "MStat" }, new[]{ "MStat" }, null, null, null) })); } #endregion @@ -17119,6 +17125,428 @@ public sealed partial class PROBUFF_NET_FAMIL_LIST_RESPONSE : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PROBUFF_NET_CHANGE_FAMILNAME()); + private pb::UnknownFieldSet _unknownFields; + private int _hasBits0; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Pbnet.NetReflection.Descriptor.MessageTypes[71]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public PROBUFF_NET_CHANGE_FAMILNAME() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public PROBUFF_NET_CHANGE_FAMILNAME(PROBUFF_NET_CHANGE_FAMILNAME other) : this() { + _hasBits0 = other._hasBits0; + mFamilid_ = other.mFamilid_; + mName_ = other.mName_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public PROBUFF_NET_CHANGE_FAMILNAME Clone() { + return new PROBUFF_NET_CHANGE_FAMILNAME(this); + } + + /// Field number for the "m_familid" field. + public const int MFamilidFieldNumber = 1; + private long mFamilid_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public long MFamilid { + get { if ((_hasBits0 & 1) != 0) { return mFamilid_; } else { return 0L; } } + set { + _hasBits0 |= 1; + mFamilid_ = value; + } + } + /// Gets whether the "m_familid" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool HasMFamilid { + get { return (_hasBits0 & 1) != 0; } + } + /// Clears the value of the "m_familid" field + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void ClearMFamilid() { + _hasBits0 &= ~1; + } + + /// Field number for the "m_name" field. + public const int MNameFieldNumber = 2; + private string mName_; + /// + /// 修改军团名称 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string MName { + get { return mName_ ?? ""; } + set { + mName_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + /// Gets whether the "m_name" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool HasMName { + get { return mName_ != null; } + } + /// Clears the value of the "m_name" field + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void ClearMName() { + mName_ = null; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as PROBUFF_NET_CHANGE_FAMILNAME); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(PROBUFF_NET_CHANGE_FAMILNAME other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (MFamilid != other.MFamilid) return false; + if (MName != other.MName) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (HasMFamilid) hash ^= MFamilid.GetHashCode(); + if (HasMName) hash ^= MName.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (HasMFamilid) { + output.WriteRawTag(8); + output.WriteInt64(MFamilid); + } + if (HasMName) { + output.WriteRawTag(18); + output.WriteString(MName); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (HasMFamilid) { + output.WriteRawTag(8); + output.WriteInt64(MFamilid); + } + if (HasMName) { + output.WriteRawTag(18); + output.WriteString(MName); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (HasMFamilid) { + size += 1 + pb::CodedOutputStream.ComputeInt64Size(MFamilid); + } + if (HasMName) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(MName); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(PROBUFF_NET_CHANGE_FAMILNAME other) { + if (other == null) { + return; + } + if (other.HasMFamilid) { + MFamilid = other.MFamilid; + } + if (other.HasMName) { + MName = other.MName; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 8: { + MFamilid = input.ReadInt64(); + break; + } + case 18: { + MName = input.ReadString(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 8: { + MFamilid = input.ReadInt64(); + break; + } + case 18: { + MName = input.ReadString(); + break; + } + } + } + } + #endif + + } + + public sealed partial class PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE()); + private pb::UnknownFieldSet _unknownFields; + private int _hasBits0; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Pbnet.NetReflection.Descriptor.MessageTypes[72]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE(PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE other) : this() { + _hasBits0 = other._hasBits0; + mStat_ = other.mStat_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE Clone() { + return new PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE(this); + } + + /// Field number for the "m_stat" field. + public const int MStatFieldNumber = 1; + private int mStat_; + /// + /// 状态 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int MStat { + get { if ((_hasBits0 & 1) != 0) { return mStat_; } else { return 0; } } + set { + _hasBits0 |= 1; + mStat_ = value; + } + } + /// Gets whether the "m_stat" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool HasMStat { + get { return (_hasBits0 & 1) != 0; } + } + /// Clears the value of the "m_stat" field + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void ClearMStat() { + _hasBits0 &= ~1; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (MStat != other.MStat) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (HasMStat) hash ^= MStat.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (HasMStat) { + output.WriteRawTag(8); + output.WriteInt32(MStat); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (HasMStat) { + output.WriteRawTag(8); + output.WriteInt32(MStat); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (HasMStat) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(MStat); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(PROBUFF_NET_CHANGE_FAMILNAME_RESPONSE other) { + if (other == null) { + return; + } + if (other.HasMStat) { + MStat = other.MStat; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 8: { + MStat = input.ReadInt32(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 8: { + MStat = input.ReadInt32(); + break; + } + } + } + } + #endif + + } + #endregion } diff --git a/server/idl/core/ub.cpp b/server/idl/core/ub.cpp index 02250a67..49e2961f 100644 --- a/server/idl/core/ub.cpp +++ b/server/idl/core/ub.cpp @@ -1,5 +1,5 @@ // ע⡾rebuild.bat ļҪֶ޸ġ -// ʱ 24-06-28 16:37:29 +// ʱ 24-07-01 18:11:39 #include "account.cpp" #include "activity.cpp" #include "activitydb.cpp" @@ -14,6 +14,7 @@ #include "actor_cross.cpp" #include "actor_csvclient.cpp" #include "actor_csvserver.cpp" +#include "actor_family.cpp" #include "actor_gateway.cpp" #include "actor_gatewayc2g.cpp" #include "actor_gatewayg2c.cpp" @@ -57,6 +58,7 @@ #include "dbredis.cpp" #include "drop.cpp" #include "event.cpp" +#include "family.cpp" #include "gateway_info.cpp" #include "gdbdmp.cpp" #include "grid.cpp" diff --git a/server/idl/core/ub.cpp.txt b/server/idl/core/ub.cpp.txt index 832cc0f1..64354535 100644 --- a/server/idl/core/ub.cpp.txt +++ b/server/idl/core/ub.cpp.txt @@ -17,6 +17,7 @@ INCLUDE_DIRECTORIES(public/cpp/logic/public/public/activity/real_activity) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/brief) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/calendar) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/chat) +INCLUDE_DIRECTORIES(public/cpp/logic/public/public/family) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/gm) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/keyvalue) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/mail) diff --git a/server/makeproto/core/ub.cpp b/server/makeproto/core/ub.cpp index 5675ecb3..a93138a4 100644 --- a/server/makeproto/core/ub.cpp +++ b/server/makeproto/core/ub.cpp @@ -1,5 +1,5 @@ // ע⡾rebuild.bat ļҪֶ޸ġ -// ʱ 24-06-28 16:37:27 +// ʱ 24-07-01 18:11:37 #include "account.cpp" #include "activity.cpp" #include "activitydb.cpp" @@ -14,6 +14,7 @@ #include "actor_cross.cpp" #include "actor_csvclient.cpp" #include "actor_csvserver.cpp" +#include "actor_family.cpp" #include "actor_gateway.cpp" #include "actor_gatewayc2g.cpp" #include "actor_gatewayg2c.cpp" @@ -57,6 +58,7 @@ #include "dbredis.cpp" #include "drop.cpp" #include "event.cpp" +#include "family.cpp" #include "gateway_info.cpp" #include "gdbdmp.cpp" #include "grid.cpp" diff --git a/server/makeproto/core/ub.cpp.txt b/server/makeproto/core/ub.cpp.txt index 832cc0f1..64354535 100644 --- a/server/makeproto/core/ub.cpp.txt +++ b/server/makeproto/core/ub.cpp.txt @@ -17,6 +17,7 @@ INCLUDE_DIRECTORIES(public/cpp/logic/public/public/activity/real_activity) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/brief) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/calendar) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/chat) +INCLUDE_DIRECTORIES(public/cpp/logic/public/public/family) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/gm) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/keyvalue) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/mail) diff --git a/server/node/core/server_main.h b/server/node/core/server_main.h index d1db96f1..aa8cdf51 100644 --- a/server/node/core/server_main.h +++ b/server/node/core/server_main.h @@ -531,8 +531,6 @@ bool start_robot(int argc, char** argv) ltest = true; continue; } - if (ngl::tools::splite(lcmd.c_str(), " ", lvec) == false) - continue; ngl::actor_manage_robot::parse_command(lvec); } }); diff --git a/server/node/core/ub.cpp b/server/node/core/ub.cpp index b7861e94..7f4dff82 100644 --- a/server/node/core/ub.cpp +++ b/server/node/core/ub.cpp @@ -1,5 +1,5 @@ // ע⡾rebuild.bat ļҪֶ޸ġ -// ʱ 24-06-28 16:37:26 +// ʱ 24-07-01 18:11:35 #include "account.cpp" #include "activity.cpp" #include "activitydb.cpp" @@ -14,6 +14,7 @@ #include "actor_cross.cpp" #include "actor_csvclient.cpp" #include "actor_csvserver.cpp" +#include "actor_family.cpp" #include "actor_gateway.cpp" #include "actor_gatewayc2g.cpp" #include "actor_gatewayg2c.cpp" @@ -57,6 +58,7 @@ #include "dbredis.cpp" #include "drop.cpp" #include "event.cpp" +#include "family.cpp" #include "gateway_info.cpp" #include "gdbdmp.cpp" #include "grid.cpp" diff --git a/server/node/core/ub.cpp.txt b/server/node/core/ub.cpp.txt index 832cc0f1..64354535 100644 --- a/server/node/core/ub.cpp.txt +++ b/server/node/core/ub.cpp.txt @@ -17,6 +17,7 @@ INCLUDE_DIRECTORIES(public/cpp/logic/public/public/activity/real_activity) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/brief) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/calendar) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/chat) +INCLUDE_DIRECTORIES(public/cpp/logic/public/public/family) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/gm) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/keyvalue) INCLUDE_DIRECTORIES(public/cpp/logic/public/public/mail)