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-09-13 16:52:57 +08:00
parent 201588a6ca
commit b19ef40b6f
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/gameserver/metadata.cc
View File

@ -4,6 +4,7 @@
#include "metadata.h" #include "metadata.h"
#include "metamgr.h" #include "metamgr.h"
#include "skillhelper.h"
#include "framework/cpp/utils.h" #include "framework/cpp/utils.h"
@ -1004,6 +1005,9 @@ namespace MetaData
} }
#endif #endif
} }
{
SkillHelper::GetMagicIdAndBaseSkillId(i->skill_id(), magic_id, base_skill_id);
}
} }
void Skill::Init2() void Skill::Init2()
@ -1036,11 +1040,19 @@ namespace MetaData
} }
} }
} }
{
base_skill_meta = MetaMgr::Instance()->GetSkill(base_skill_id);
if (base_skill_id) {
if (!base_skill_meta) {
abort();
}
}
}
} }
int Skill::GetMagicId() int Skill::GetMagicId()
{ {
return MAGIC_NONE; return magic_id;
} }
bool Skill::IsTurnOverSkill() bool Skill::IsTurnOverSkill()

5
server/gameserver/metadata.h
View File

@ -277,13 +277,16 @@ namespace MetaData
void Init(); void Init();
void Init2(); void Init2();
int magic_type = 0; Skill* base_skill_meta = nullptr;
float value_up = 0.0f; float value_up = 0.0f;
std::set<int> buff_list; std::set<int> buff_list;
std::map<int, std::set<MetaData::Buff*>> trigger_type_buffs; std::map<int, std::set<MetaData::Buff*>> trigger_type_buffs;
std::vector<MetaData::SkillPhase> phases; std::vector<MetaData::SkillPhase> phases;
bool IsTurnOverSkill(); bool IsTurnOverSkill();
int GetMagicId(); int GetMagicId();
private:
int magic_id = 0;
int base_skill_id = 0;
}; };
struct SkillNumber struct SkillNumber