From 7101ef89e882d2542a8b9e1cc11a1c786c195398 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 9 May 2023 16:50:12 +0800 Subject: [PATCH] 1 --- server/gameserver/mtb/AirRaid.h | 6 ++++++ server/gameserver/mtb/mtb.all.cc | 2 ++ server/tools/protobuild/mt.proto | 2 ++ 3 files changed, 10 insertions(+) diff --git a/server/gameserver/mtb/AirRaid.h b/server/gameserver/mtb/AirRaid.h index e9956e5c..f3d3809d 100644 --- a/server/gameserver/mtb/AirRaid.h +++ b/server/gameserver/mtb/AirRaid.h @@ -16,6 +16,8 @@ namespace mtb const std::string bomb_id() const { return bomb_id_; }; const std::string raid_wave() const { return raid_wave_; }; float rad() const { return rad_; }; + const std::string bombling_time() const { return bombling_time_; }; + float damage() const { return damage_; }; bool has_id() const { return __flags__.test(0);}; bool has_time() const { return __flags__.test(1);}; @@ -23,6 +25,8 @@ namespace mtb bool has_bomb_id() const { return __flags__.test(3);}; bool has_raid_wave() const { return __flags__.test(4);}; bool has_rad() const { return __flags__.test(5);}; + bool has_bombling_time() const { return __flags__.test(6);}; + bool has_damage() const { return __flags__.test(7);}; protected: @@ -32,6 +36,8 @@ namespace mtb std::string bomb_id_; std::string raid_wave_; float rad_ = 0.0f; + std::string bombling_time_; + float damage_ = 0.0f; public: std::bitset<6> __flags__; diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc index 7811255b..b6424c03 100644 --- a/server/gameserver/mtb/mtb.all.cc +++ b/server/gameserver/mtb/mtb.all.cc @@ -528,6 +528,8 @@ namespace mtb meta_class->SetSimpleField(3, "bomb_id", a8::reflect::ET_STRING, my_offsetof2(AirRaid, bomb_id_)); meta_class->SetSimpleField(4, "raid_wave", a8::reflect::ET_STRING, my_offsetof2(AirRaid, raid_wave_)); meta_class->SetSimpleField(5, "rad", a8::reflect::ET_FLOAT, my_offsetof2(AirRaid, rad_)); + meta_class->SetSimpleField(6, "bombling_time", a8::reflect::ET_STRING, my_offsetof2(AirRaid, bombling_time_)); + meta_class->SetSimpleField(7, "damage", a8::reflect::ET_FLOAT, my_offsetof2(AirRaid, damage_)); } return meta_class; } diff --git a/server/tools/protobuild/mt.proto b/server/tools/protobuild/mt.proto index 9eadd4d9..044cbfe3 100755 --- a/server/tools/protobuild/mt.proto +++ b/server/tools/protobuild/mt.proto @@ -417,6 +417,8 @@ message AirRaid optional string bomb_id = 4; optional string raid_wave = 5; optional float rad = 6; + optional string bombling_time = 7; + optional float damage = 8; } message AirLine