From 18cfd1aefb2a95d27842e8a647862c7c3f81b656 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 6 Feb 2023 15:31:18 +0800 Subject: [PATCH] 1 --- server/gameserver/mt/AirDrop.h | 2 +- server/gameserver/mt/AirRaid.h | 2 +- server/gameserver/mt/Dress.cc | 10 ------- server/gameserver/mt/Dress.h | 16 ----------- server/gameserver/mt/EquipUpgrade.cc | 10 ------- server/gameserver/mt/EquipUpgrade.h | 16 ----------- server/gameserver/mt/FormulaPvp.h | 2 +- server/gameserver/mt/GunQuality.h | 2 +- server/gameserver/mt/GunTalentGrow.h | 2 +- server/gameserver/mt/HeroQuality.h | 2 +- server/gameserver/mt/MapTplThingJson.cc | 10 ------- server/gameserver/mt/MapTplThingJson.h | 16 ----------- server/gameserver/mt/MetaMgr.cc | 6 ---- server/gameserver/mt/SafeAreaPos.h | 2 +- server/gameserver/mtb/Dress.h | 37 ------------------------ server/gameserver/mtb/EquipUpgrade.h | 31 -------------------- server/gameserver/mtb/MapTplThingJson.h | 22 -------------- server/gameserver/mtb/mtb.all.cc | 38 ------------------------- server/tools/protobuild/mt.proto | 24 ---------------- 19 files changed, 7 insertions(+), 243 deletions(-) delete mode 100644 server/gameserver/mt/Dress.cc delete mode 100644 server/gameserver/mt/Dress.h delete mode 100644 server/gameserver/mt/EquipUpgrade.cc delete mode 100644 server/gameserver/mt/EquipUpgrade.h delete mode 100644 server/gameserver/mt/MapTplThingJson.cc delete mode 100644 server/gameserver/mt/MapTplThingJson.h delete mode 100644 server/gameserver/mtb/Dress.h delete mode 100644 server/gameserver/mtb/EquipUpgrade.h delete mode 100644 server/gameserver/mtb/MapTplThingJson.h diff --git a/server/gameserver/mt/AirDrop.h b/server/gameserver/mt/AirDrop.h index dbddfd7d..550e1391 100644 --- a/server/gameserver/mt/AirDrop.h +++ b/server/gameserver/mt/AirDrop.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(AirDrop, mtb::AirDrop, - "airDrop@airDrop.json", + "airdrop@airdrop.json", "id") public: diff --git a/server/gameserver/mt/AirRaid.h b/server/gameserver/mt/AirRaid.h index aa980ec3..5242ab4b 100644 --- a/server/gameserver/mt/AirRaid.h +++ b/server/gameserver/mt/AirRaid.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(AirRaid, mtb::AirRaid, - "airRaid@airRaid.json", + "airraid@airraid.json", "id") public: diff --git a/server/gameserver/mt/Dress.cc b/server/gameserver/mt/Dress.cc deleted file mode 100644 index c5aae4dd..00000000 --- a/server/gameserver/mt/Dress.cc +++ /dev/null @@ -1,10 +0,0 @@ -#include "precompile.h" - -#include "mt/Dress.h" - -IMPL_TABLE(mt::Dress) - -namespace mt -{ - -} diff --git a/server/gameserver/mt/Dress.h b/server/gameserver/mt/Dress.h deleted file mode 100644 index 01a85e7d..00000000 --- a/server/gameserver/mt/Dress.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "mt/macro.h" -#include "mtb/Dress.h" - -namespace mt -{ - - DECLARE_ID_TABLE(Dress, mtb::Dress, - "dress@dress.json", - "id") - public: - - }; - -} diff --git a/server/gameserver/mt/EquipUpgrade.cc b/server/gameserver/mt/EquipUpgrade.cc deleted file mode 100644 index fc82aa53..00000000 --- a/server/gameserver/mt/EquipUpgrade.cc +++ /dev/null @@ -1,10 +0,0 @@ -#include "precompile.h" - -#include "mt/EquipUpgrade.h" - -IMPL_TABLE(mt::EquipUpgrade) - -namespace mt -{ - -} diff --git a/server/gameserver/mt/EquipUpgrade.h b/server/gameserver/mt/EquipUpgrade.h deleted file mode 100644 index 087e4ea6..00000000 --- a/server/gameserver/mt/EquipUpgrade.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "mt/macro.h" -#include "mtb/EquipUpgrade.h" - -namespace mt -{ - - DECLARE_ID_TABLE(EquipUpgrade, mtb::EquipUpgrade, - "equipUpgrade@equipUpgrade.json", - "id") - public: - - }; - -} diff --git a/server/gameserver/mt/FormulaPvp.h b/server/gameserver/mt/FormulaPvp.h index 53f3f957..5585f054 100644 --- a/server/gameserver/mt/FormulaPvp.h +++ b/server/gameserver/mt/FormulaPvp.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_AUTO_ID_TABLE(FormulaPvp, mtb::FormulaPvp, - "formulaPvp@formulaPvp.json" + "pvp@formula.json" ) public: diff --git a/server/gameserver/mt/GunQuality.h b/server/gameserver/mt/GunQuality.h index df1b0835..a96306d1 100644 --- a/server/gameserver/mt/GunQuality.h +++ b/server/gameserver/mt/GunQuality.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(GunQuality, mtb::GunQuality, - "gunQuality@gunQuality", + "gunQuality@gunQuality.json", "quality") public: diff --git a/server/gameserver/mt/GunTalentGrow.h b/server/gameserver/mt/GunTalentGrow.h index a4f13a9a..4c8be910 100644 --- a/server/gameserver/mt/GunTalentGrow.h +++ b/server/gameserver/mt/GunTalentGrow.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(GunTalentGrow, mtb::GunTalentGrow, - "gunTalentGrow@gunTalentGrow", + "gunTalentGrow@gunTalentGrow.json", "id") public: diff --git a/server/gameserver/mt/HeroQuality.h b/server/gameserver/mt/HeroQuality.h index 897457e4..c9d1cf62 100644 --- a/server/gameserver/mt/HeroQuality.h +++ b/server/gameserver/mt/HeroQuality.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(HeroQuality, mtb::HeroQuality, - "heroQuality@heroQuality", + "heroQuality@heroQuality.json", "quality") public: diff --git a/server/gameserver/mt/MapTplThingJson.cc b/server/gameserver/mt/MapTplThingJson.cc deleted file mode 100644 index 683a7858..00000000 --- a/server/gameserver/mt/MapTplThingJson.cc +++ /dev/null @@ -1,10 +0,0 @@ -#include "precompile.h" - -#include "mt/MapTplThingJson.h" - -IMPL_TABLE(mt::MapTplThingJson) - -namespace mt -{ - -} diff --git a/server/gameserver/mt/MapTplThingJson.h b/server/gameserver/mt/MapTplThingJson.h deleted file mode 100644 index 0f305ec1..00000000 --- a/server/gameserver/mt/MapTplThingJson.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "mt/macro.h" -#include "mtb/MapTplThingJson.h" - -namespace mt -{ - - DECLARE_AUTO_ID_TABLE(MapTplThingJson, mtb::MapTplThingJson, - "" - ) - public: - - }; - -} diff --git a/server/gameserver/mt/MetaMgr.cc b/server/gameserver/mt/MetaMgr.cc index d147e4b5..71785ca8 100644 --- a/server/gameserver/mt/MetaMgr.cc +++ b/server/gameserver/mt/MetaMgr.cc @@ -9,7 +9,6 @@ #include "mt/GunQuality.h" #include "mt/GunTalentGrow.h" #include "mt/HeroQuality.h" -#include "mt/MapTplThingJson.h" #include "mt/PveGemini.h" #include "mt/PveGeminiContent.h" #include "mt/PveGeminiMode.h" @@ -24,14 +23,12 @@ #include "mt/AirLine.h" #include "mt/AirRaid.h" #include "mt/AirDrop.h" -#include "mt/Dress.h" #include "mt/Drop.h" #include "mt/NpcStandard.h" #include "mt/Buff.h" #include "mt/MapThing.h" #include "mt/SafeArea.h" #include "mt/Equip.h" -#include "mt/EquipUpgrade.h" #include "mt/Item.h" #include "mt/SafeAreaPos.h" #include "mt/Skill.h" @@ -76,7 +73,6 @@ namespace mt RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); - RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); @@ -91,14 +87,12 @@ namespace mt RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); - RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); - RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); diff --git a/server/gameserver/mt/SafeAreaPos.h b/server/gameserver/mt/SafeAreaPos.h index 0b964072..eb09828c 100644 --- a/server/gameserver/mt/SafeAreaPos.h +++ b/server/gameserver/mt/SafeAreaPos.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_AUTO_ID_TABLE(SafeAreaPos, mtb::SafeAreaPos, - "safeAreaPos@safeAreaPos.json" + "safearea_pos@safearea_pos.json" ) public: diff --git a/server/gameserver/mtb/Dress.h b/server/gameserver/mtb/Dress.h deleted file mode 100644 index 282e2bd0..00000000 --- a/server/gameserver/mtb/Dress.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include - -namespace mtb -{ - - class Dress - { - public: - - a8::reflect::Class* GetClass() const; - int id() const { return id_; }; - int level() const { return level_; }; - int skill_id() const { return skill_id_; }; - const std::string attr_type() const { return attr_type_; }; - int max_lv() const { return max_lv_; }; - - bool has_id() const { return __flags__.test(0);}; - bool has_level() const { return __flags__.test(1);}; - bool has_skill_id() const { return __flags__.test(2);}; - bool has_attr_type() const { return __flags__.test(3);}; - bool has_max_lv() const { return __flags__.test(4);}; - - protected: - - int id_ = 0; - int level_ = 0; - int skill_id_ = 0; - std::string attr_type_; - int max_lv_ = 0; - -public: - std::bitset<5> __flags__; - }; - -}; diff --git a/server/gameserver/mtb/EquipUpgrade.h b/server/gameserver/mtb/EquipUpgrade.h deleted file mode 100644 index 6833b070..00000000 --- a/server/gameserver/mtb/EquipUpgrade.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include - -namespace mtb -{ - - class EquipUpgrade - { - public: - - a8::reflect::Class* GetClass() const; - int id() const { return id_; }; - const std::string attr_type() const { return attr_type_; }; - const std::string spera_attr() const { return spera_attr_; }; - - bool has_id() const { return __flags__.test(0);}; - bool has_attr_type() const { return __flags__.test(1);}; - bool has_spera_attr() const { return __flags__.test(2);}; - - protected: - - int id_ = 0; - std::string attr_type_; - std::string spera_attr_; - -public: - std::bitset<3> __flags__; - }; - -}; diff --git a/server/gameserver/mtb/MapTplThingJson.h b/server/gameserver/mtb/MapTplThingJson.h deleted file mode 100644 index f56f1626..00000000 --- a/server/gameserver/mtb/MapTplThingJson.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include - -namespace mtb -{ - - class MapTplThingJson - { - public: - - a8::reflect::Class* GetClass() const; - - - protected: - - -public: - std::bitset<0> __flags__; - }; - -}; diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc index b9fabac0..5400b5ec 100644 --- a/server/gameserver/mtb/mtb.all.cc +++ b/server/gameserver/mtb/mtb.all.cc @@ -10,7 +10,6 @@ #include "mtb/SafeAreaPos.h" #include "mtb/Item.h" #include "mtb/Equip.h" -#include "mtb/EquipUpgrade.h" #include "mtb/Hero.h" #include "mtb/Robot.h" #include "mtb/Skill.h" @@ -21,7 +20,6 @@ #include "mtb/AirDrop.h" #include "mtb/AirRaid.h" #include "mtb/AirLine.h" -#include "mtb/Dress.h" #include "mtb/RankReward.h" #include "mtb/RankPoint.h" #include "mtb/KillReward.h" @@ -36,7 +34,6 @@ #include "mtb/PveGeminiContent.h" #include "mtb/PveGeminiMode.h" #include "mtb/RankRoom.h" -#include "mtb/MapTplThingJson.h" namespace mtb { @@ -291,18 +288,6 @@ namespace mtb return meta_class; } - a8::reflect::Class* EquipUpgrade::GetClass() const - { - a8::reflect::Class* meta_class = nullptr; - if (!meta_class) { - meta_class = new a8::reflect::Class("EquipUpgrade", 3, 0); - meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(EquipUpgrade, id_)); - meta_class->SetSimpleField(1, "attr_type", a8::reflect::ET_STRING, my_offsetof2(EquipUpgrade, attr_type_)); - meta_class->SetSimpleField(2, "spera_attr", a8::reflect::ET_STRING, my_offsetof2(EquipUpgrade, spera_attr_)); - } - return meta_class; - } - a8::reflect::Class* Hero::GetClass() const { a8::reflect::Class* meta_class = nullptr; @@ -547,20 +532,6 @@ namespace mtb return meta_class; } - a8::reflect::Class* Dress::GetClass() const - { - a8::reflect::Class* meta_class = nullptr; - if (!meta_class) { - meta_class = new a8::reflect::Class("Dress", 5, 0); - meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(Dress, id_)); - meta_class->SetSimpleField(1, "level", a8::reflect::ET_INT32, my_offsetof2(Dress, level_)); - meta_class->SetSimpleField(2, "skill_id", a8::reflect::ET_INT32, my_offsetof2(Dress, skill_id_)); - meta_class->SetSimpleField(3, "attr_type", a8::reflect::ET_STRING, my_offsetof2(Dress, attr_type_)); - meta_class->SetSimpleField(4, "max_lv", a8::reflect::ET_INT32, my_offsetof2(Dress, max_lv_)); - } - return meta_class; - } - a8::reflect::Class* RankReward::GetClass() const { a8::reflect::Class* meta_class = nullptr; @@ -765,13 +736,4 @@ namespace mtb return meta_class; } - a8::reflect::Class* MapTplThingJson::GetClass() const - { - a8::reflect::Class* meta_class = nullptr; - if (!meta_class) { - meta_class = new a8::reflect::Class("MapTplThingJson", 0, 0); - } - return meta_class; - } - } diff --git a/server/tools/protobuild/mt.proto b/server/tools/protobuild/mt.proto index ffbc1a4d..23a711ff 100755 --- a/server/tools/protobuild/mt.proto +++ b/server/tools/protobuild/mt.proto @@ -211,13 +211,6 @@ message Equip optional int32 double_gun = 78; } -message EquipUpgrade -{ - optional int32 id = 1; - optional string attr_type = 4; - optional string spera_attr = 5; -} - message Hero { optional int32 id = 1; //唯一id @@ -422,15 +415,6 @@ message AirLine optional int32 map_id = 6; } -message Dress -{ - optional int32 id = 1; - optional int32 level = 2; - optional int32 skill_id = 3; - optional string attr_type = 4; - optional int32 max_lv = 5; -} - message RankReward { optional int32 rank = 1; @@ -565,11 +549,3 @@ message RankRoom optional int32 final_time = 9; optional int32 final_player_num = 10; } - - -//end - -message MapTplThingJson -{ - -} \ No newline at end of file