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 2022-12-23 09:25:18 +08:00
parent d27a7cdc9b
commit bbb801e06e
15 changed files with 183 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/metadata.cc
View File

@ -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()
{
}
}

22
server/gameserver/metadata.h
View File

@ -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;

89
server/gameserver/metamgr.cc
View File

@ -169,14 +169,6 @@ public:
std::list<MetaData::SkillNumber> skill_number_list;
std::list<metatable::Buff> buff_meta_list;
std::list<MetaData::Buff> buff_list;
std::list<metatable::RankReward> rankreward_meta_list;
std::list<MetaData::RankReward> rankreward_list;
std::list<metatable::KillReward> killreward_meta_list;
std::list<MetaData::KillReward> killreward_list;
std::list<metatable::RankPoint> rankpoint_meta_list;
std::list<MetaData::RankPoint> rankpoint_list;
std::list<metatable::KillPoint> killpoint_meta_list;
std::list<MetaData::KillPoint> killpoint_list;
std::list<metatable::Robot> robot_meta_list;
std::vector<MetaData::Robot> robot_list;
std::list<metatable::AI> ai_meta_list;
@ -198,10 +190,6 @@ public:
std::map<int, MetaData::Skill*> skill_hash;
std::map<int, MetaData::SkillNumber*> skill_number_hash;
std::map<int, MetaData::Buff*> buff_hash;
std::map<int, MetaData::RankReward*> rankreward_hash;
std::map<int, MetaData::KillReward*> killreward_hash;
std::map<int, MetaData::RankPoint*> rankpoint_hash;
std::map<int, MetaData::KillPoint*> killpoint_hash;
std::map<int, MetaData::Robot*> robot_hash;
std::map<int, std::vector<MetaData::AirLine*>> airline_hash;
std::map<std::string, std::vector<std::tuple<int, std::string>>> 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<int>& refreshed_robot_set)
{
int try_count = 0;

8
server/gameserver/metamgr.h
View File

@ -38,14 +38,6 @@ class MetaMgr : public a8::Singleton<MetaMgr>
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<int>& refreshed_robot_set);
std::vector<std::tuple<int, std::string>>* GetTextElements(const std::string& textid);
std::string GetResDir();

4
server/gameserver/mt/Forward.h
View File

@ -17,4 +17,8 @@ namespace mt
class Text;
class GunTalentGrow;
class RankRoom;
class RankPoint;
class RankReward;
class KillReward;
class KillPoint;
}

26
server/gameserver/mt/KillPoint.cc Normal file
View File

@ -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
}
}

19
server/gameserver/mt/KillPoint.h Normal file
View File

@ -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);
};
}

18
server/gameserver/mt/KillReward.cc Normal file
View File

@ -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
}
}

18
server/gameserver/mt/KillReward.h Normal file
View File

@ -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);
};
}

8
server/gameserver/mt/MetaMgr.cc
View File

@ -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<PveGeminiMode>(res_path_);
RegMetaTable<Text>(res_path_);
RegMetaTable<RankRoom>(res_path_);
RegMetaTable<RankPoint>(res_path_);
RegMetaTable<RankReward>(res_path_);
RegMetaTable<KillPoint>(res_path_);
RegMetaTable<KillReward>(res_path_);
{
for (auto& itr : meta_tables) {
itr->static_pre_init_cb();

34
server/gameserver/mt/RankPoint.cc Normal file
View File

@ -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
}
}

20
server/gameserver/mt/RankPoint.h Normal file
View File

@ -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);
};
}

18
server/gameserver/mt/RankReward.cc Normal file
View File

@ -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
}
}

18
server/gameserver/mt/RankReward.h Normal file
View File

@ -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);
};
}

28
server/tools/protobuild/metatable.proto
View File

@ -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;