server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-01-03 16:30:57 +08:00
parent 5b17e9bb9b
commit 5514453ffa
8 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/mt/BattleBasicAttribute.cc
View File

@ -1,5 +1,5 @@
#include "precompile.h" #include "precompile.h"
#include "mtb/BattleBasicAttribute.h" #include "mt/BattleBasicAttribute.h"
IMPL_TABLE(mt::BattleBasicAttribute) IMPL_TABLE(mt::BattleBasicAttribute)

2
server/gameserver/mt/BattleLevelAttribute.cc
View File

@ -1,5 +1,5 @@
#include "precompile.h" #include "precompile.h"
#include "mtb/BattleLevelAttribute.h" #include "mt/BattleLevelAttribute.h"
IMPL_TABLE(mt::BattleLevelAttribute) IMPL_TABLE(mt::BattleLevelAttribute)

2
server/gameserver/mt/BattleRandAttribute.cc
View File

@ -1,5 +1,5 @@
#include "precompile.h" #include "precompile.h"
#include "mtb/BattleRandAttribute.h" #include "mt/BattleRandAttribute.h"
IMPL_TABLE(mt::BattleRandAttribute) IMPL_TABLE(mt::BattleRandAttribute)

2
server/gameserver/mt/BattleWeaponAttribute.cc
View File

@ -1,5 +1,5 @@
#include "precompile.h" #include "precompile.h"
#include "mtb/BattleWeaponAttribute.h" #include "mt/BattleWeaponAttribute.h"
IMPL_TABLE(mt::BattleWeaponAttribute) IMPL_TABLE(mt::BattleWeaponAttribute)

2
server/gameserver/mt/Condition.cc
View File

@ -1,5 +1,5 @@
#include "precompile.h" #include "precompile.h"
#include "mtb/Condition.h" #include "mt/Condition.h"
IMPL_TABLE(mt::Condition) IMPL_TABLE(mt::Condition)

15
server/gameserver/mtb/Condition.h
View File

@ -11,7 +11,6 @@ namespace mtb
std::shared_ptr<a8::reflect::Class> GetClass() const; std::shared_ptr<a8::reflect::Class> GetClass() const;
int id() const { return id_; }; int id() const { return id_; };
const std::string template() const { return template_; };
const std::string param1() const { return param1_; }; const std::string param1() const { return param1_; };
const std::string param2() const { return param2_; }; const std::string param2() const { return param2_; };
const std::string param3() const { return param3_; }; const std::string param3() const { return param3_; };
@ -19,17 +18,15 @@ namespace mtb
const std::string param5() const { return param5_; }; const std::string param5() const { return param5_; };
bool has_id() const { return __flags__.test(0);}; bool has_id() const { return __flags__.test(0);};
bool has_template() const { return __flags__.test(1);}; bool has_param1() const { return __flags__.test(1);};
bool has_param1() const { return __flags__.test(2);}; bool has_param2() const { return __flags__.test(2);};
bool has_param2() const { return __flags__.test(3);}; bool has_param3() const { return __flags__.test(3);};
bool has_param3() const { return __flags__.test(4);}; bool has_param4() const { return __flags__.test(4);};
bool has_param4() const { return __flags__.test(5);}; bool has_param5() const { return __flags__.test(5);};
bool has_param5() const { return __flags__.test(6);};
protected: protected:
int id_ = 0; int id_ = 0;
std::string template_;
std::string param1_; std::string param1_;
std::string param2_; std::string param2_;
std::string param3_; std::string param3_;
@ -37,7 +34,7 @@ namespace mtb
std::string param5_; std::string param5_;
public: public:
std::bitset<7> __flags__; std::bitset<6> __flags__;
}; };
}; };

13
server/gameserver/mtb/mtb.all.cc
View File

@ -995,14 +995,13 @@ namespace mtb
{ {
std::shared_ptr<a8::reflect::Class> meta_class = nullptr; std::shared_ptr<a8::reflect::Class> meta_class = nullptr;
if (!meta_class) { if (!meta_class) {
meta_class = std::make_shared<a8::reflect::Class>("Condition", 7, 0); meta_class = std::make_shared<a8::reflect::Class>("Condition", 6, 0);
meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(Condition, id_)); 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(1, "param1", a8::reflect::ET_STRING, my_offsetof2(Condition, param1_));
meta_class->SetSimpleField(2, "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, "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, "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, "param4", a8::reflect::ET_STRING, my_offsetof2(Condition, param4_)); meta_class->SetSimpleField(5, "param5", a8::reflect::ET_STRING, my_offsetof2(Condition, param5_));
meta_class->SetSimpleField(6, "param5", a8::reflect::ET_STRING, my_offsetof2(Condition, param5_));
} }
return meta_class; return meta_class;
} }

2
server/tools/protobuild/mt.proto
View File

@ -737,7 +737,7 @@ message BattleUnit
message Condition message Condition
{ {
optional int32 id = 1; optional int32 id = 1;
optional string template = 2; //optional string template = 2;
optional string param1 = 3; optional string param1 = 3;
optional string param2 = 4; optional string param2 = 4;
optional string param3 = 5; optional string param3 = 5;