Browse Source

feat(proto): add bullet in message2client

tags/0.1.0
DragonAura 2 years ago
parent
commit
a671a36302
5 changed files with 290 additions and 51 deletions
  1. +111
    -26
      CAPI/proto/Message2Clients.pb.cc
  2. +154
    -6
      CAPI/proto/Message2Clients.pb.h
  3. +18
    -16
      CAPI/proto/MessageType.pb.cc
  4. +3
    -1
      CAPI/proto/MessageType.pb.h
  5. +4
    -2
      dependency/proto/Message2Clients.proto

+ 111
- 26
CAPI/proto/Message2Clients.pb.cc View File

@@ -202,7 +202,7 @@ namespace protobuf
::_pbi::ConstantInitialized
) :
_impl_{
/*decltype(_impl_.student_message_)*/ {}, /*decltype(_impl_.tricker_message_)*/ {}, /*decltype(_impl_.prop_message_)*/ {}, /*decltype(_impl_.map_message_)*/ nullptr, /*decltype(_impl_.game_state_)*/ 0, /*decltype(_impl_._cached_size_)*/ {}}
/*decltype(_impl_.student_message_)*/ {}, /*decltype(_impl_.tricker_message_)*/ {}, /*decltype(_impl_.prop_message_)*/ {}, /*decltype(_impl_.bullet_message_)*/ {}, /*decltype(_impl_.bombed_bullet_message_)*/ {}, /*decltype(_impl_.map_message_)*/ nullptr, /*decltype(_impl_.game_state_)*/ 0, /*decltype(_impl_._cached_size_)*/ {}}
{
}
struct MessageToClientDefaultTypeInternal
@@ -410,6 +410,8 @@ const uint32_t TableStruct_Message2Clients_2eproto::offsets[] PROTOBUF_SECTION_V
PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _impl_.student_message_),
PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _impl_.tricker_message_),
PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _impl_.prop_message_),
PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _impl_.bullet_message_),
PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _impl_.bombed_bullet_message_),
PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _impl_.map_message_),
PROTOBUF_FIELD_OFFSET(::protobuf::MessageToClient, _impl_.game_state_),
~0u, // no _has_bits_
@@ -448,9 +450,9 @@ static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protode
{95, -1, -1, sizeof(::protobuf::MessageOfMap_Row)},
{102, -1, -1, sizeof(::protobuf::MessageOfMap)},
{109, -1, -1, sizeof(::protobuf::MessageToClient)},
{120, -1, -1, sizeof(::protobuf::MoveRes)},
{129, -1, -1, sizeof(::protobuf::BoolRes)},
{136, -1, -1, sizeof(::protobuf::MsgRes)},
{122, -1, -1, sizeof(::protobuf::MoveRes)},
{131, -1, -1, sizeof(::protobuf::BoolRes)},
{138, -1, -1, sizeof(::protobuf::MsgRes)},
};

static const ::_pb::Message* const file_default_instances[] = {
@@ -509,18 +511,21 @@ const char descriptor_table_protodef_Message2Clients_2eproto[] PROTOBUF_SECTION_
"ection\030\004 \001(\001\022\022\n\nmapping_id\030\005 \001(\003\"`\n\014Mess"
"ageOfMap\022\'\n\003row\030\002 \003(\0132\032.protobuf.Message"
"OfMap.Row\032\'\n\003Row\022 \n\003col\030\001 \003(\0162\023.protobuf"
".PlaceType\"\200\002\n\017MessageToClient\0223\n\017studen"
".PlaceType\"\363\002\n\017MessageToClient\0223\n\017studen"
"t_message\030\001 \003(\0132\032.protobuf.MessageOfStud"
"ent\0223\n\017tricker_message\030\002 \003(\0132\032.protobuf."
"MessageOfTricker\022-\n\014prop_message\030\003 \003(\0132\027"
".protobuf.MessageOfProp\022+\n\013map_message\030\004"
" \001(\0132\026.protobuf.MessageOfMap\022\'\n\ngame_sta"
"te\030\005 \001(\0162\023.protobuf.GameState\"J\n\007MoveRes"
"\022\024\n\014actual_speed\030\001 \001(\003\022\024\n\014actual_angle\030\002"
" \001(\001\022\023\n\013act_success\030\003 \001(\010\"\036\n\007BoolRes\022\023\n\013"
"act_success\030\001 \001(\010\"P\n\006MsgRes\022\024\n\014have_mess"
"age\030\001 \001(\010\022\026\n\016from_player_id\030\002 \001(\003\022\030\n\020mes"
"sage_received\030\003 \001(\tb\006proto3";
".protobuf.MessageOfProp\0221\n\016bullet_messag"
"e\030\004 \003(\0132\031.protobuf.MessageOfBullet\022>\n\025bo"
"mbed_bullet_message\030\005 \003(\0132\037.protobuf.Mes"
"sageOfBombedBullet\022+\n\013map_message\030\006 \001(\0132"
"\026.protobuf.MessageOfMap\022\'\n\ngame_state\030\007 "
"\001(\0162\023.protobuf.GameState\"J\n\007MoveRes\022\024\n\014a"
"ctual_speed\030\001 \001(\003\022\024\n\014actual_angle\030\002 \001(\001\022"
"\023\n\013act_success\030\003 \001(\010\"\036\n\007BoolRes\022\023\n\013act_s"
"uccess\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";
static const ::_pbi::DescriptorTable* const descriptor_table_Message2Clients_2eproto_deps[1] = {
&::descriptor_table_MessageType_2eproto,
};
@@ -528,7 +533,7 @@ static ::_pbi::once_flag descriptor_table_Message2Clients_2eproto_once;
const ::_pbi::DescriptorTable descriptor_table_Message2Clients_2eproto = {
false,
false,
2067,
2182,
descriptor_table_protodef_Message2Clients_2eproto,
"Message2Clients.proto",
&descriptor_table_Message2Clients_2eproto_once,
@@ -3972,7 +3977,7 @@ namespace protobuf
MessageToClient* const _this = this;
(void)_this;
new (&_impl_) Impl_{
decltype(_impl_.student_message_){from._impl_.student_message_}, decltype(_impl_.tricker_message_){from._impl_.tricker_message_}, decltype(_impl_.prop_message_){from._impl_.prop_message_}, decltype(_impl_.map_message_){nullptr}, decltype(_impl_.game_state_){}, /*decltype(_impl_._cached_size_)*/ {}};
decltype(_impl_.student_message_){from._impl_.student_message_}, decltype(_impl_.tricker_message_){from._impl_.tricker_message_}, decltype(_impl_.prop_message_){from._impl_.prop_message_}, decltype(_impl_.bullet_message_){from._impl_.bullet_message_}, decltype(_impl_.bombed_bullet_message_){from._impl_.bombed_bullet_message_}, decltype(_impl_.map_message_){nullptr}, decltype(_impl_.game_state_){}, /*decltype(_impl_._cached_size_)*/ {}};

_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
if (from._internal_has_map_message())
@@ -3990,7 +3995,7 @@ namespace protobuf
(void)arena;
(void)is_message_owned;
new (&_impl_) Impl_{
decltype(_impl_.student_message_){arena}, decltype(_impl_.tricker_message_){arena}, decltype(_impl_.prop_message_){arena}, decltype(_impl_.map_message_){nullptr}, decltype(_impl_.game_state_){0}, /*decltype(_impl_._cached_size_)*/ {}};
decltype(_impl_.student_message_){arena}, decltype(_impl_.tricker_message_){arena}, decltype(_impl_.prop_message_){arena}, decltype(_impl_.bullet_message_){arena}, decltype(_impl_.bombed_bullet_message_){arena}, decltype(_impl_.map_message_){nullptr}, decltype(_impl_.game_state_){0}, /*decltype(_impl_._cached_size_)*/ {}};
}

MessageToClient::~MessageToClient()
@@ -4010,6 +4015,8 @@ namespace protobuf
_impl_.student_message_.~RepeatedPtrField();
_impl_.tricker_message_.~RepeatedPtrField();
_impl_.prop_message_.~RepeatedPtrField();
_impl_.bullet_message_.~RepeatedPtrField();
_impl_.bombed_bullet_message_.~RepeatedPtrField();
if (this != internal_default_instance())
delete _impl_.map_message_;
}
@@ -4029,6 +4036,8 @@ namespace protobuf
_impl_.student_message_.Clear();
_impl_.tricker_message_.Clear();
_impl_.prop_message_.Clear();
_impl_.bullet_message_.Clear();
_impl_.bombed_bullet_message_.Clear();
if (GetArenaForAllocation() == nullptr && _impl_.map_message_ != nullptr)
{
delete _impl_.map_message_;
@@ -4100,9 +4109,43 @@ namespace protobuf
else
goto handle_unusual;
continue;
// .protobuf.MessageOfMap map_message = 4;
// repeated .protobuf.MessageOfBullet bullet_message = 4;
case 4:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34))
{
ptr -= 1;
do
{
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_bullet_message(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr))
break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr));
}
else
goto handle_unusual;
continue;
// repeated .protobuf.MessageOfBombedBullet bombed_bullet_message = 5;
case 5:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42))
{
ptr -= 1;
do
{
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_bombed_bullet_message(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr))
break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<42>(ptr));
}
else
goto handle_unusual;
continue;
// .protobuf.MessageOfMap map_message = 6;
case 6:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50))
{
ptr = ctx->ParseMessage(_internal_mutable_map_message(), ptr);
CHK_(ptr);
@@ -4110,9 +4153,9 @@ namespace protobuf
else
goto handle_unusual;
continue;
// .protobuf.GameState game_state = 5;
case 5:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 40))
// .protobuf.GameState game_state = 7;
case 7:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 56))
{
uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
CHK_(ptr);
@@ -4188,19 +4231,41 @@ namespace protobuf
InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
}

// .protobuf.MessageOfMap map_message = 4;
// repeated .protobuf.MessageOfBullet bullet_message = 4;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_bullet_message_size());
i < n;
i++)
{
const auto& repfield = this->_internal_bullet_message(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
}

// repeated .protobuf.MessageOfBombedBullet bombed_bullet_message = 5;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_bombed_bullet_message_size());
i < n;
i++)
{
const auto& repfield = this->_internal_bombed_bullet_message(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(5, repfield, repfield.GetCachedSize(), target, stream);
}

// .protobuf.MessageOfMap map_message = 6;
if (this->_internal_has_map_message())
{
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(4, _Internal::map_message(this), _Internal::map_message(this).GetCachedSize(), target, stream);
InternalWriteMessage(6, _Internal::map_message(this), _Internal::map_message(this).GetCachedSize(), target, stream);
}

// .protobuf.GameState game_state = 5;
// .protobuf.GameState game_state = 7;
if (this->_internal_game_state() != 0)
{
target = stream->EnsureSpace(target);
target = ::_pbi::WireFormatLite::WriteEnumToArray(
5, this->_internal_game_state(), target
7, this->_internal_game_state(), target
);
}

@@ -4247,7 +4312,23 @@ namespace protobuf
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
}

// .protobuf.MessageOfMap map_message = 4;
// repeated .protobuf.MessageOfBullet bullet_message = 4;
total_size += 1UL * this->_internal_bullet_message_size();
for (const auto& msg : this->_impl_.bullet_message_)
{
total_size +=
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
}

// repeated .protobuf.MessageOfBombedBullet bombed_bullet_message = 5;
total_size += 1UL * this->_internal_bombed_bullet_message_size();
for (const auto& msg : this->_impl_.bombed_bullet_message_)
{
total_size +=
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
}

// .protobuf.MessageOfMap map_message = 6;
if (this->_internal_has_map_message())
{
total_size += 1 +
@@ -4256,7 +4337,7 @@ namespace protobuf
);
}

// .protobuf.GameState game_state = 5;
// .protobuf.GameState game_state = 7;
if (this->_internal_game_state() != 0)
{
total_size += 1 +
@@ -4286,6 +4367,8 @@ namespace protobuf
_this->_impl_.student_message_.MergeFrom(from._impl_.student_message_);
_this->_impl_.tricker_message_.MergeFrom(from._impl_.tricker_message_);
_this->_impl_.prop_message_.MergeFrom(from._impl_.prop_message_);
_this->_impl_.bullet_message_.MergeFrom(from._impl_.bullet_message_);
_this->_impl_.bombed_bullet_message_.MergeFrom(from._impl_.bombed_bullet_message_);
if (from._internal_has_map_message())
{
_this->_internal_mutable_map_message()->::protobuf::MessageOfMap::MergeFrom(
@@ -4320,6 +4403,8 @@ namespace protobuf
_impl_.student_message_.InternalSwap(&other->_impl_.student_message_);
_impl_.tricker_message_.InternalSwap(&other->_impl_.tricker_message_);
_impl_.prop_message_.InternalSwap(&other->_impl_.prop_message_);
_impl_.bullet_message_.InternalSwap(&other->_impl_.bullet_message_);
_impl_.bombed_bullet_message_.InternalSwap(&other->_impl_.bombed_bullet_message_);
::PROTOBUF_NAMESPACE_ID::internal::memswap<
PROTOBUF_FIELD_OFFSET(MessageToClient, _impl_.game_state_) + sizeof(MessageToClient::_impl_.game_state_) - PROTOBUF_FIELD_OFFSET(MessageToClient, _impl_.map_message_)>(
reinterpret_cast<char*>(&_impl_.map_message_),


+ 154
- 6
CAPI/proto/Message2Clients.pb.h View File

@@ -2500,8 +2500,10 @@ namespace protobuf
kStudentMessageFieldNumber = 1,
kTrickerMessageFieldNumber = 2,
kPropMessageFieldNumber = 3,
kMapMessageFieldNumber = 4,
kGameStateFieldNumber = 5,
kBulletMessageFieldNumber = 4,
kBombedBulletMessageFieldNumber = 5,
kMapMessageFieldNumber = 6,
kGameStateFieldNumber = 7,
};
// repeated .protobuf.MessageOfStudent student_message = 1;
int student_message_size() const;
@@ -2569,7 +2571,51 @@ namespace protobuf
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfProp>&
prop_message() const;

// .protobuf.MessageOfMap map_message = 4;
// repeated .protobuf.MessageOfBullet bullet_message = 4;
int bullet_message_size() const;

private:
int _internal_bullet_message_size() const;

public:
void clear_bullet_message();
::protobuf::MessageOfBullet* mutable_bullet_message(int index);
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfBullet>*
mutable_bullet_message();

private:
const ::protobuf::MessageOfBullet& _internal_bullet_message(int index) const;
::protobuf::MessageOfBullet* _internal_add_bullet_message();

public:
const ::protobuf::MessageOfBullet& bullet_message(int index) const;
::protobuf::MessageOfBullet* add_bullet_message();
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfBullet>&
bullet_message() const;

// repeated .protobuf.MessageOfBombedBullet bombed_bullet_message = 5;
int bombed_bullet_message_size() const;

private:
int _internal_bombed_bullet_message_size() const;

public:
void clear_bombed_bullet_message();
::protobuf::MessageOfBombedBullet* mutable_bombed_bullet_message(int index);
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfBombedBullet>*
mutable_bombed_bullet_message();

private:
const ::protobuf::MessageOfBombedBullet& _internal_bombed_bullet_message(int index) const;
::protobuf::MessageOfBombedBullet* _internal_add_bombed_bullet_message();

public:
const ::protobuf::MessageOfBombedBullet& bombed_bullet_message(int index) const;
::protobuf::MessageOfBombedBullet* add_bombed_bullet_message();
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfBombedBullet>&
bombed_bullet_message() const;

// .protobuf.MessageOfMap map_message = 6;
bool has_map_message() const;

private:
@@ -2592,7 +2638,7 @@ namespace protobuf
);
::protobuf::MessageOfMap* unsafe_arena_release_map_message();

// .protobuf.GameState game_state = 5;
// .protobuf.GameState game_state = 7;
void clear_game_state();
::protobuf::GameState game_state() const;
void set_game_state(::protobuf::GameState value);
@@ -2616,6 +2662,8 @@ namespace protobuf
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfStudent> student_message_;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfTricker> tricker_message_;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfProp> prop_message_;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfBullet> bullet_message_;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfBombedBullet> bombed_bullet_message_;
::protobuf::MessageOfMap* map_message_;
int game_state_;
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
@@ -5027,7 +5075,107 @@ namespace protobuf
return _impl_.prop_message_;
}

// .protobuf.MessageOfMap map_message = 4;
// repeated .protobuf.MessageOfBullet bullet_message = 4;
inline int MessageToClient::_internal_bullet_message_size() const
{
return _impl_.bullet_message_.size();
}
inline int MessageToClient::bullet_message_size() const
{
return _internal_bullet_message_size();
}
inline void MessageToClient::clear_bullet_message()
{
_impl_.bullet_message_.Clear();
}
inline ::protobuf::MessageOfBullet* MessageToClient::mutable_bullet_message(int index)
{
// @@protoc_insertion_point(field_mutable:protobuf.MessageToClient.bullet_message)
return _impl_.bullet_message_.Mutable(index);
}
inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfBullet>*
MessageToClient::mutable_bullet_message()
{
// @@protoc_insertion_point(field_mutable_list:protobuf.MessageToClient.bullet_message)
return &_impl_.bullet_message_;
}
inline const ::protobuf::MessageOfBullet& MessageToClient::_internal_bullet_message(int index) const
{
return _impl_.bullet_message_.Get(index);
}
inline const ::protobuf::MessageOfBullet& MessageToClient::bullet_message(int index) const
{
// @@protoc_insertion_point(field_get:protobuf.MessageToClient.bullet_message)
return _internal_bullet_message(index);
}
inline ::protobuf::MessageOfBullet* MessageToClient::_internal_add_bullet_message()
{
return _impl_.bullet_message_.Add();
}
inline ::protobuf::MessageOfBullet* MessageToClient::add_bullet_message()
{
::protobuf::MessageOfBullet* _add = _internal_add_bullet_message();
// @@protoc_insertion_point(field_add:protobuf.MessageToClient.bullet_message)
return _add;
}
inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfBullet>&
MessageToClient::bullet_message() const
{
// @@protoc_insertion_point(field_list:protobuf.MessageToClient.bullet_message)
return _impl_.bullet_message_;
}

// repeated .protobuf.MessageOfBombedBullet bombed_bullet_message = 5;
inline int MessageToClient::_internal_bombed_bullet_message_size() const
{
return _impl_.bombed_bullet_message_.size();
}
inline int MessageToClient::bombed_bullet_message_size() const
{
return _internal_bombed_bullet_message_size();
}
inline void MessageToClient::clear_bombed_bullet_message()
{
_impl_.bombed_bullet_message_.Clear();
}
inline ::protobuf::MessageOfBombedBullet* MessageToClient::mutable_bombed_bullet_message(int index)
{
// @@protoc_insertion_point(field_mutable:protobuf.MessageToClient.bombed_bullet_message)
return _impl_.bombed_bullet_message_.Mutable(index);
}
inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfBombedBullet>*
MessageToClient::mutable_bombed_bullet_message()
{
// @@protoc_insertion_point(field_mutable_list:protobuf.MessageToClient.bombed_bullet_message)
return &_impl_.bombed_bullet_message_;
}
inline const ::protobuf::MessageOfBombedBullet& MessageToClient::_internal_bombed_bullet_message(int index) const
{
return _impl_.bombed_bullet_message_.Get(index);
}
inline const ::protobuf::MessageOfBombedBullet& MessageToClient::bombed_bullet_message(int index) const
{
// @@protoc_insertion_point(field_get:protobuf.MessageToClient.bombed_bullet_message)
return _internal_bombed_bullet_message(index);
}
inline ::protobuf::MessageOfBombedBullet* MessageToClient::_internal_add_bombed_bullet_message()
{
return _impl_.bombed_bullet_message_.Add();
}
inline ::protobuf::MessageOfBombedBullet* MessageToClient::add_bombed_bullet_message()
{
::protobuf::MessageOfBombedBullet* _add = _internal_add_bombed_bullet_message();
// @@protoc_insertion_point(field_add:protobuf.MessageToClient.bombed_bullet_message)
return _add;
}
inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::protobuf::MessageOfBombedBullet>&
MessageToClient::bombed_bullet_message() const
{
// @@protoc_insertion_point(field_list:protobuf.MessageToClient.bombed_bullet_message)
return _impl_.bombed_bullet_message_;
}

// .protobuf.MessageOfMap map_message = 6;
inline bool MessageToClient::_internal_has_map_message() const
{
return this != internal_default_instance() && _impl_.map_message_ != nullptr;
@@ -5138,7 +5286,7 @@ namespace protobuf
// @@protoc_insertion_point(field_set_allocated:protobuf.MessageToClient.map_message)
}

// .protobuf.GameState game_state = 5;
// .protobuf.GameState game_state = 7;
inline void MessageToClient::clear_game_state()
{
_impl_.game_state_ = 0;


+ 18
- 16
CAPI/proto/MessageType.pb.cc View File

@@ -42,28 +42,28 @@ const char descriptor_table_protodef_MessageType_2eproto[] PROTOBUF_SECTION_VARI
"1\020\001\022\n\n\006PTYPE2\020\002\022\n\n\006PTYPE3\020\003\022\n\n\006PTYPE4\020\004*"
"f\n\017StudentBuffType\022\023\n\017NULL_SBUFF_TYPE\020\000\022"
"\016\n\nSBUFFTYPE1\020\001\022\016\n\nSBUFFTYPE2\020\002\022\016\n\nSBUFF"
"TYPE3\020\003\022\016\n\nSBUFFTYPE4\020\004*\205\001\n\014StudentState"
"TYPE3\020\003\022\016\n\nSBUFFTYPE4\020\004*\241\001\n\014StudentState"
"\022\017\n\013NULL_STATUS\020\000\022\010\n\004IDLE\020\001\022\014\n\010LEARNING\020"
"\002\022\014\n\010ADDICTED\020\003\022\010\n\004QUIT\020\004\022\r\n\tGRADUATED\020\005"
"\022\013\n\007TREATED\020\006\022\013\n\007RESCUED\020\007\022\013\n\007STUNNED\020\010*"
"f\n\017TrickerBuffType\022\023\n\017NULL_TBUFF_TYPE\020\000\022"
"\016\n\nTBUFFTYPE1\020\001\022\016\n\nTBUFFTYPE2\020\002\022\016\n\nTBUFF"
"TYPE3\020\003\022\016\n\nTBUFFTYPE4\020\004*J\n\nPlayerType\022\024\n"
"\020NULL_PLAYER_TYPE\020\000\022\022\n\016STUDENT_PLAYER\020\001\022"
"\022\n\016TRICKER_PLAYER\020\002*l\n\013StudentType\022\025\n\021NU"
"LL_STUDENT_TYPE\020\000\022\020\n\014STUDENTTYPE1\020\001\022\020\n\014S"
"TUDENTTYPE2\020\002\022\020\n\014STUDENTTYPE3\020\003\022\020\n\014STUDE"
"NTTYPE4\020\004*l\n\013TrickerType\022\025\n\021NULL_TRICKER"
"_TYPE\020\000\022\020\n\014TRICKERTYPE1\020\001\022\020\n\014TRICKERTYPE"
"2\020\002\022\020\n\014TRICKERTYPE3\020\003\022\020\n\014TRICKERTYPE4\020\004*"
"P\n\tGameState\022\023\n\017NULL_GAME_STATE\020\000\022\016\n\nGAM"
"E_START\020\001\022\020\n\014GAME_RUNNING\020\002\022\014\n\010GAME_END\020"
"\003b\006proto3";
"\022\013\n\007TREATED\020\006\022\013\n\007RESCUED\020\007\022\013\n\007STUNNED\020\010\022"
"\014\n\010TREATING\020\t\022\014\n\010RESCUING\020\n*f\n\017TrickerBu"
"ffType\022\023\n\017NULL_TBUFF_TYPE\020\000\022\016\n\nTBUFFTYPE"
"1\020\001\022\016\n\nTBUFFTYPE2\020\002\022\016\n\nTBUFFTYPE3\020\003\022\016\n\nT"
"BUFFTYPE4\020\004*J\n\nPlayerType\022\024\n\020NULL_PLAYER"
"_TYPE\020\000\022\022\n\016STUDENT_PLAYER\020\001\022\022\n\016TRICKER_P"
"LAYER\020\002*l\n\013StudentType\022\025\n\021NULL_STUDENT_T"
"YPE\020\000\022\020\n\014STUDENTTYPE1\020\001\022\020\n\014STUDENTTYPE2\020"
"\002\022\020\n\014STUDENTTYPE3\020\003\022\020\n\014STUDENTTYPE4\020\004*l\n"
"\013TrickerType\022\025\n\021NULL_TRICKER_TYPE\020\000\022\020\n\014T"
"RICKERTYPE1\020\001\022\020\n\014TRICKERTYPE2\020\002\022\020\n\014TRICK"
"ERTYPE3\020\003\022\020\n\014TRICKERTYPE4\020\004*P\n\tGameState"
"\022\023\n\017NULL_GAME_STATE\020\000\022\016\n\nGAME_START\020\001\022\020\n"
"\014GAME_RUNNING\020\002\022\014\n\010GAME_END\020\003b\006proto3";
static ::_pbi::once_flag descriptor_table_MessageType_2eproto_once;
const ::_pbi::DescriptorTable descriptor_table_MessageType_2eproto = {
false,
false,
1129,
1157,
descriptor_table_protodef_MessageType_2eproto,
"MessageType.proto",
&descriptor_table_MessageType_2eproto_once,
@@ -205,6 +205,8 @@ namespace protobuf
case 6:
case 7:
case 8:
case 9:
case 10:
return true;
default:
return false;


+ 3
- 1
CAPI/proto/MessageType.pb.h View File

@@ -222,12 +222,14 @@ namespace protobuf
TREATED = 6,
RESCUED = 7,
STUNNED = 8,
TREATING = 9,
RESCUING = 10,
StudentState_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::min(),
StudentState_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::max()
};
bool StudentState_IsValid(int value);
constexpr StudentState StudentState_MIN = NULL_STATUS;
constexpr StudentState StudentState_MAX = STUNNED;
constexpr StudentState StudentState_MAX = RESCUING;
constexpr int StudentState_ARRAYSIZE = StudentState_MAX + 1;

const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* StudentState_descriptor();


+ 4
- 2
dependency/proto/Message2Clients.proto View File

@@ -101,8 +101,10 @@ message MessageToClient
repeated MessageOfStudent student_message = 1;
repeated MessageOfTricker tricker_message = 2; // 是否真正repeated待定
repeated MessageOfProp prop_message = 3;
MessageOfMap map_message = 4;
GameState game_state = 5;
repeated MessageOfBullet bullet_message = 4;
repeated MessageOfBombedBullet bombed_bullet_message = 5;
MessageOfMap map_message = 6;
GameState game_state = 7;
}

message MoveRes // 如果打算设计撞墙保留平行速度分量,且需要返回值则可用这个(大概没啥用)


Loading…
Cancel
Save