From 5514453ffaeeaeaa4a26e7e9e9db7dde7e389a2a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 3 Jan 2024 16:30:57 +0800 Subject: [PATCH] 1 --- server/gameserver/mt/BattleBasicAttribute.cc | 2 +- server/gameserver/mt/BattleLevelAttribute.cc | 2 +- server/gameserver/mt/BattleRandAttribute.cc | 2 +- server/gameserver/mt/BattleWeaponAttribute.cc | 2 +- server/gameserver/mt/Condition.cc | 2 +- server/gameserver/mtb/Condition.h | 15 ++++++--------- server/gameserver/mtb/mtb.all.cc | 13 ++++++------- server/tools/protobuild/mt.proto | 2 +- 8 files changed, 18 insertions(+), 22 deletions(-) diff --git a/server/gameserver/mt/BattleBasicAttribute.cc b/server/gameserver/mt/BattleBasicAttribute.cc index a603ec16..a59e69d4 100644 --- a/server/gameserver/mt/BattleBasicAttribute.cc +++ b/server/gameserver/mt/BattleBasicAttribute.cc @@ -1,5 +1,5 @@ #include "precompile.h" -#include "mtb/BattleBasicAttribute.h" +#include "mt/BattleBasicAttribute.h" IMPL_TABLE(mt::BattleBasicAttribute) diff --git a/server/gameserver/mt/BattleLevelAttribute.cc b/server/gameserver/mt/BattleLevelAttribute.cc index 3310dc93..1a53bf29 100644 --- a/server/gameserver/mt/BattleLevelAttribute.cc +++ b/server/gameserver/mt/BattleLevelAttribute.cc @@ -1,5 +1,5 @@ #include "precompile.h" -#include "mtb/BattleLevelAttribute.h" +#include "mt/BattleLevelAttribute.h" IMPL_TABLE(mt::BattleLevelAttribute) diff --git a/server/gameserver/mt/BattleRandAttribute.cc b/server/gameserver/mt/BattleRandAttribute.cc index 1a3012b0..0443d061 100644 --- a/server/gameserver/mt/BattleRandAttribute.cc +++ b/server/gameserver/mt/BattleRandAttribute.cc @@ -1,5 +1,5 @@ #include "precompile.h" -#include "mtb/BattleRandAttribute.h" +#include "mt/BattleRandAttribute.h" IMPL_TABLE(mt::BattleRandAttribute) diff --git a/server/gameserver/mt/BattleWeaponAttribute.cc b/server/gameserver/mt/BattleWeaponAttribute.cc index c51a29b5..f6f0308b 100644 --- a/server/gameserver/mt/BattleWeaponAttribute.cc +++ b/server/gameserver/mt/BattleWeaponAttribute.cc @@ -1,5 +1,5 @@ #include "precompile.h" -#include "mtb/BattleWeaponAttribute.h" +#include "mt/BattleWeaponAttribute.h" IMPL_TABLE(mt::BattleWeaponAttribute) diff --git a/server/gameserver/mt/Condition.cc b/server/gameserver/mt/Condition.cc index 80679a55..f375601a 100644 --- a/server/gameserver/mt/Condition.cc +++ b/server/gameserver/mt/Condition.cc @@ -1,5 +1,5 @@ #include "precompile.h" -#include "mtb/Condition.h" +#include "mt/Condition.h" IMPL_TABLE(mt::Condition) diff --git a/server/gameserver/mtb/Condition.h b/server/gameserver/mtb/Condition.h index f2b916de..87aeae97 100644 --- a/server/gameserver/mtb/Condition.h +++ b/server/gameserver/mtb/Condition.h @@ -11,7 +11,6 @@ namespace mtb std::shared_ptr GetClass() const; int id() const { return id_; }; - const std::string template() const { return template_; }; const std::string param1() const { return param1_; }; const std::string param2() const { return param2_; }; const std::string param3() const { return param3_; }; @@ -19,17 +18,15 @@ namespace mtb const std::string param5() const { return param5_; }; bool has_id() const { return __flags__.test(0);}; - bool has_template() const { return __flags__.test(1);}; - bool has_param1() const { return __flags__.test(2);}; - bool has_param2() const { return __flags__.test(3);}; - bool has_param3() const { return __flags__.test(4);}; - bool has_param4() const { return __flags__.test(5);}; - bool has_param5() const { return __flags__.test(6);}; + bool has_param1() const { return __flags__.test(1);}; + bool has_param2() const { return __flags__.test(2);}; + bool has_param3() const { return __flags__.test(3);}; + bool has_param4() const { return __flags__.test(4);}; + bool has_param5() const { return __flags__.test(5);}; protected: int id_ = 0; - std::string template_; std::string param1_; std::string param2_; std::string param3_; @@ -37,7 +34,7 @@ namespace mtb std::string param5_; public: - std::bitset<7> __flags__; + std::bitset<6> __flags__; }; }; diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc index 83640db8..79f8a4d7 100644 --- a/server/gameserver/mtb/mtb.all.cc +++ b/server/gameserver/mtb/mtb.all.cc @@ -995,14 +995,13 @@ namespace mtb { std::shared_ptr meta_class = nullptr; if (!meta_class) { - meta_class = std::make_shared("Condition", 7, 0); + meta_class = std::make_shared("Condition", 6, 0); meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(Condition, id_)); - meta_class->SetSimpleField(1, "template", a8::reflect::ET_STRING, my_offsetof2(Condition, template_)); - meta_class->SetSimpleField(2, "param1", a8::reflect::ET_STRING, my_offsetof2(Condition, param1_)); - meta_class->SetSimpleField(3, "param2", a8::reflect::ET_STRING, my_offsetof2(Condition, param2_)); - meta_class->SetSimpleField(4, "param3", a8::reflect::ET_STRING, my_offsetof2(Condition, param3_)); - meta_class->SetSimpleField(5, "param4", a8::reflect::ET_STRING, my_offsetof2(Condition, param4_)); - meta_class->SetSimpleField(6, "param5", a8::reflect::ET_STRING, my_offsetof2(Condition, param5_)); + meta_class->SetSimpleField(1, "param1", a8::reflect::ET_STRING, my_offsetof2(Condition, param1_)); + meta_class->SetSimpleField(2, "param2", a8::reflect::ET_STRING, my_offsetof2(Condition, param2_)); + meta_class->SetSimpleField(3, "param3", a8::reflect::ET_STRING, my_offsetof2(Condition, param3_)); + meta_class->SetSimpleField(4, "param4", a8::reflect::ET_STRING, my_offsetof2(Condition, param4_)); + meta_class->SetSimpleField(5, "param5", a8::reflect::ET_STRING, my_offsetof2(Condition, param5_)); } return meta_class; } diff --git a/server/tools/protobuild/mt.proto b/server/tools/protobuild/mt.proto index 4a3a3751..2887ac00 100755 --- a/server/tools/protobuild/mt.proto +++ b/server/tools/protobuild/mt.proto @@ -737,7 +737,7 @@ message BattleUnit message Condition { optional int32 id = 1; - optional string template = 2; + //optional string template = 2; optional string param1 = 3; optional string param2 = 4; optional string param3 = 5;