diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc index f678e128..602bc9e1 100644 --- a/server/gameserver/metadata.cc +++ b/server/gameserver/metadata.cc @@ -1155,10 +1155,6 @@ namespace MetaData } } - void RankReward::Init() - { - } - void AI::Init() { param1 = a8::XValue(pb->param1()).GetDouble(); @@ -1387,9 +1383,4 @@ namespace MetaData } } - void RankRoom::Init() - { - - } - } diff --git a/server/gameserver/metadata.h b/server/gameserver/metadata.h index 143f7c4f..8dc0b6e8 100644 --- a/server/gameserver/metadata.h +++ b/server/gameserver/metadata.h @@ -288,28 +288,6 @@ namespace MetaData void Init(); }; - struct RankReward - { - const metatable::RankReward* pb = nullptr; - - void Init(); - }; - - struct KillReward - { - const metatable::KillReward* pb = nullptr; - }; - - struct RankPoint - { - const metatable::RankPoint* pb = nullptr; - }; - - struct KillPoint - { - const metatable::KillPoint* pb = nullptr; - }; - struct AI { const metatable::AI* pb = nullptr; diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index 10b7fbe7..19dc8a9d 100644 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -169,14 +169,6 @@ public: std::list skill_number_list; std::list buff_meta_list; std::list buff_list; - std::list rankreward_meta_list; - std::list rankreward_list; - std::list killreward_meta_list; - std::list killreward_list; - std::list rankpoint_meta_list; - std::list rankpoint_list; - std::list killpoint_meta_list; - std::list killpoint_list; std::list robot_meta_list; std::vector robot_list; std::list ai_meta_list; @@ -198,10 +190,6 @@ public: std::map skill_hash; std::map skill_number_hash; std::map buff_hash; - std::map rankreward_hash; - std::map killreward_hash; - std::map rankpoint_hash; - std::map killpoint_hash; std::map robot_hash; std::map> airline_hash; std::map>> text_element_hash; @@ -242,10 +230,6 @@ public: LoadMetaFile(res_path, "airline@airline", airline_meta_list); LoadMetaFile(res_path, "skill@skill", skill_meta_list); LoadMetaFile(res_path, "skillNumber@skillNumber", skill_number_meta_list); - LoadMetaFile(res_path, "rankReward@rankReward", rankreward_meta_list); - LoadMetaFile(res_path, "killReward@killReward", killreward_meta_list); - LoadMetaFile(res_path, "killPoint@killPoint", killpoint_meta_list); - LoadMetaFile(res_path, "rankPoint@rankPoint", rankpoint_meta_list); LoadMetaFile(res_path, "robot@robot", robot_meta_list); LoadMetaFile(res_path, "ai@ai", ai_meta_list); LoadMetaFile(res_path, "npcStandard@npcStandard", npc_standard_meta_list); @@ -579,31 +563,6 @@ private: skill_number_hash[item.pb->skill_id()] = &item; } - for (auto& meta : rankreward_meta_list) { - MetaData::RankReward& item = a8::FastAppend(rankreward_list); - item.pb = &meta; - item.Init(); - rankreward_hash[item.pb->rank()] = &item; - } - - for (auto& meta : killreward_meta_list) { - MetaData::KillReward& item = a8::FastAppend(killreward_list); - item.pb = &meta; - killreward_hash[item.pb->kill_num()] = &item; - } - - for (auto& meta : killpoint_meta_list) { - MetaData::KillPoint& item = a8::FastAppend(killpoint_list); - item.pb = &meta; - killpoint_hash[item.pb->kill_num()] = &item; - } - - for (auto& meta : rankpoint_meta_list) { - MetaData::RankPoint& item = a8::FastAppend(rankpoint_list); - item.pb = &meta; - rankpoint_hash[item.pb->rank()] = &item; - } - for (auto& meta : robot_meta_list) { MetaData::Robot& item = a8::FastAppend(robot_list); item.pb = &meta; @@ -731,54 +690,6 @@ MetaData::Buff* MetaMgr::GetBuff(int buff_id) return itr != loader_->buff_hash.end() ? itr->second : nullptr; } -MetaData::RankReward* MetaMgr::GetRankReward(int rank) -{ - auto itr = loader_->rankreward_hash.find(rank); - return itr != loader_->rankreward_hash.end() ? itr->second : nullptr; -} - -float MetaMgr::GetRankRewardParam(int rank) -{ - auto itr = loader_->rankreward_hash.find(rank); - return itr != loader_->rankreward_hash.end() ? itr->second->pb->parameter() : 0.0f; -} - -float MetaMgr::GetKillRewardParam(int kill_num) -{ - auto itr = loader_->killreward_hash.find(kill_num); - return itr != loader_->killreward_hash.end() ? itr->second->pb->parameter() : 0.0f; -} - -int MetaMgr::GetRankPointParam1(int rank) -{ - auto itr = loader_->rankpoint_hash.find(rank); - return itr != loader_->rankpoint_hash.end() ? itr->second->pb->parameter() : 0; -} - -int MetaMgr::GetRankPointParam2(int rank) -{ - auto itr = loader_->rankpoint_hash.find(rank); - return itr != loader_->rankpoint_hash.end() ? itr->second->pb->parameter2() : 0; -} - -int MetaMgr::GetRankPointParam3(int rank) -{ - auto itr = loader_->rankpoint_hash.find(rank); - return itr != loader_->rankpoint_hash.end() ? itr->second->pb->parameter3() : 0; -} - -int MetaMgr::GetKillPointParam1(int kill_num) -{ - auto itr = loader_->killpoint_hash.find(kill_num); - return itr != loader_->killpoint_hash.end() ? itr->second->pb->parameter() : 0; -} - -int MetaMgr::GetKillPointParam2(int kill_num) -{ - auto itr = loader_->killpoint_hash.find(kill_num); - return itr != loader_->killpoint_hash.end() ? itr->second->pb->parameter2() : 0; -} - MetaData::Robot* MetaMgr::RandRobot(std::set& refreshed_robot_set) { int try_count = 0; diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h index 455aa836..14e26c06 100644 --- a/server/gameserver/metamgr.h +++ b/server/gameserver/metamgr.h @@ -38,14 +38,6 @@ class MetaMgr : public a8::Singleton MetaData::Skill* GetSkill(int skill_id); MetaData::SkillNumber* GetSkillNumber(int skill_id); MetaData::Buff* GetBuff(int buff_id); - MetaData::RankReward* GetRankReward(int rank); - float GetRankRewardParam(int rank); - float GetKillRewardParam(int kill_num); - int GetRankPointParam1(int rank); - int GetRankPointParam2(int rank); - int GetRankPointParam3(int rank); - int GetKillPointParam1(int kill_num); - int GetKillPointParam2(int kill_num); MetaData::Robot* RandRobot(std::set& refreshed_robot_set); std::vector>* GetTextElements(const std::string& textid); std::string GetResDir(); diff --git a/server/gameserver/mt/Forward.h b/server/gameserver/mt/Forward.h index b04d4b5a..0d4a7974 100644 --- a/server/gameserver/mt/Forward.h +++ b/server/gameserver/mt/Forward.h @@ -17,4 +17,8 @@ namespace mt class Text; class GunTalentGrow; class RankRoom; + class RankPoint; + class RankReward; + class KillReward; + class KillPoint; } diff --git a/server/gameserver/mt/KillPoint.cc b/server/gameserver/mt/KillPoint.cc new file mode 100644 index 00000000..b1546f00 --- /dev/null +++ b/server/gameserver/mt/KillPoint.cc @@ -0,0 +1,26 @@ +#include "precompile.h" + +#include "mt/KillPoint.h" + +IMPL_TABLE(mt::KillPoint) + +namespace mt +{ + + int KillPoint::GetKillPointParam1(int kill_num) + { +#if 0 + auto itr = loader_->killpoint_hash.find(kill_num); + return itr != loader_->killpoint_hash.end() ? itr->second->pb->parameter() : 0; +#endif + } + + int KillPoint::GetKillPointParam2(int kill_num) + { +#if 0 + auto itr = loader_->killpoint_hash.find(kill_num); + return itr != loader_->killpoint_hash.end() ? itr->second->pb->parameter2() : 0; +#endif + } + +} diff --git a/server/gameserver/mt/KillPoint.h b/server/gameserver/mt/KillPoint.h new file mode 100644 index 00000000..3f516dd1 --- /dev/null +++ b/server/gameserver/mt/KillPoint.h @@ -0,0 +1,19 @@ +#pragma once + +#include "mt/macro.h" +#include "mtb/KillPoint.h" + +namespace mt +{ + + DECLARE_ID_TABLE(KillPoint, mtb::KillPoint, + "killPoint@killPoint.csv", + "kill_num") + public: + + static int GetKillPointParam1(int kill_num); + static int GetKillPointParam2(int kill_num); + + }; + +} diff --git a/server/gameserver/mt/KillReward.cc b/server/gameserver/mt/KillReward.cc new file mode 100644 index 00000000..bc130286 --- /dev/null +++ b/server/gameserver/mt/KillReward.cc @@ -0,0 +1,18 @@ +#include "precompile.h" + +#include "mt/KillReward.h" + +IMPL_TABLE(mt::KillReward) + +namespace mt +{ + + float KillReward::GetKillRewardParam(int kill_num) + { +#if 0 + auto itr = loader_->killreward_hash.find(kill_num); + return itr != loader_->killreward_hash.end() ? itr->second->pb->parameter() : 0.0f; +#endif + } + +} diff --git a/server/gameserver/mt/KillReward.h b/server/gameserver/mt/KillReward.h new file mode 100644 index 00000000..d93a7582 --- /dev/null +++ b/server/gameserver/mt/KillReward.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mt/macro.h" +#include "mtb/KillReward.h" + +namespace mt +{ + + DECLARE_ID_TABLE(KillReward, mtb::KillReward, + "killReward@killReward.csv", + "kill_num") + public: + + static float GetKillRewardParam(int kill_num); + + }; + +} diff --git a/server/gameserver/mt/MetaMgr.cc b/server/gameserver/mt/MetaMgr.cc index a60cb207..0bab0c91 100644 --- a/server/gameserver/mt/MetaMgr.cc +++ b/server/gameserver/mt/MetaMgr.cc @@ -15,6 +15,10 @@ #include "mt/PveGeminiMode.h" #include "mt/Text.h" #include "mt/RankRoom.h" +#include "mt/RankPoint.h" +#include "mt/RankReward.h" +#include "mt/KillReward.h" +#include "mt/KillPoint.h" #include "app.h" @@ -55,6 +59,10 @@ namespace mt RegMetaTable(res_path_); RegMetaTable(res_path_); RegMetaTable(res_path_); + RegMetaTable(res_path_); + RegMetaTable(res_path_); + RegMetaTable(res_path_); + RegMetaTable(res_path_); { for (auto& itr : meta_tables) { itr->static_pre_init_cb(); diff --git a/server/gameserver/mt/RankPoint.cc b/server/gameserver/mt/RankPoint.cc new file mode 100644 index 00000000..13462518 --- /dev/null +++ b/server/gameserver/mt/RankPoint.cc @@ -0,0 +1,34 @@ +#include "precompile.h" + +#include "mt/RankPoint.h" + +IMPL_TABLE(mt::RankPoint) + +namespace mt +{ + + int RankPoint::GetRankPointParam1(int rank) + { + #if 0 + auto itr = loader_->rankpoint_hash.find(rank); + return itr != loader_->rankpoint_hash.end() ? itr->second->pb->parameter2() : 0; + #endif + } + + int RankPoint::GetRankPointParam2(int rank) + { +#if 0 + auto itr = loader_->rankpoint_hash.find(rank); + return itr != loader_->rankpoint_hash.end() ? itr->second->pb->parameter2() : 0; +#endif + } + + int RankPoint::GetRankPointParam3(int rank) + { +#if 0 + auto itr = loader_->rankpoint_hash.find(rank); + return itr != loader_->rankpoint_hash.end() ? itr->second->pb->parameter3() : 0; +#endif + } + +} diff --git a/server/gameserver/mt/RankPoint.h b/server/gameserver/mt/RankPoint.h new file mode 100644 index 00000000..b1665fa8 --- /dev/null +++ b/server/gameserver/mt/RankPoint.h @@ -0,0 +1,20 @@ +#pragma once + +#include "mt/macro.h" +#include "mtb/RankPoint.h" + +namespace mt +{ + + DECLARE_ID_TABLE(RankPoint, mtb::RankPoint, + "rankPoint@rankPoint.csv", + "rank") + public: + + static int GetRankPointParam1(int rank); + static int GetRankPointParam2(int rank); + static int GetRankPointParam3(int rank); + + }; + +} diff --git a/server/gameserver/mt/RankReward.cc b/server/gameserver/mt/RankReward.cc new file mode 100644 index 00000000..d6c74ad9 --- /dev/null +++ b/server/gameserver/mt/RankReward.cc @@ -0,0 +1,18 @@ +#include "precompile.h" + +#include "mt/RankReward.h" + +IMPL_TABLE(mt::RankReward) + +namespace mt +{ + + float RankReward::GetRankRewardParam(int rank) + { +#if 0 + auto itr = loader_->rankreward_hash.find(rank); + return itr != loader_->rankreward_hash.end() ? itr->second->pb->parameter() : 0.0f; +#endif + } + +} diff --git a/server/gameserver/mt/RankReward.h b/server/gameserver/mt/RankReward.h new file mode 100644 index 00000000..354f2ceb --- /dev/null +++ b/server/gameserver/mt/RankReward.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mt/macro.h" +#include "mtb/RankReward.h" + +namespace mt +{ + + DECLARE_ID_TABLE(RankReward, mtb::RankReward, + "rankReward@rankReward.csv", + "rank") + public: + + static float GetRankRewardParam(int rank); + + }; + +} diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index ae7641a5..faf2f2f8 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -329,34 +329,6 @@ message Dress optional int32 max_lv = 5; } -message RankReward -{ - optional int32 rank = 1; - optional float parameter = 2; - optional int32 drop = 3; -} - -message RankPoint -{ - optional int32 rank = 1; - optional int32 parameter = 2; - optional int32 parameter2 = 3; - optional int32 parameter3 = 4; -} - -message KillReward -{ - optional int32 kill_num = 1; - optional float parameter = 2; -} - -message KillPoint -{ - optional int32 kill_num = 1; - optional int32 parameter = 2; - optional int32 parameter2 = 3; -} - message AI { optional int32 id = 13;