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-04 16:32:28 +08:00
parent b00d07ba26
commit 6ecd3349e8
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/attrhelper.cc
View File

@ -2,7 +2,7 @@
#include "attrhelper.h" #include "attrhelper.h"
float* AttrHelper::GetAttrAbsPtr(std::array<float, kHAT_End>& attr, int attr_id) float* AttrHelper::GetAttrAbsPtr(std::array<float, kNHAT_End>& attr, int attr_id)
{ {
if (!IsValidHumanAttr(attr_id)) { if (!IsValidHumanAttr(attr_id)) {
return nullptr; return nullptr;
@ -11,7 +11,7 @@ float* AttrHelper::GetAttrAbsPtr(std::array<float, kHAT_End>& attr, int attr_id)
} }
float* AttrHelper::GetAttrRatePtr(std::array<float, kHAT_End>& attr, int attr_id) float* AttrHelper::GetAttrRatePtr(std::array<float, kNHAT_End>& attr, int attr_id)
{ {
if (!IsValidHumanAttr(attr_id)) { if (!IsValidHumanAttr(attr_id)) {
return nullptr; return nullptr;
@ -20,8 +20,8 @@ float* AttrHelper::GetAttrRatePtr(std::array<float, kHAT_End>& attr, int attr_id
} }
bool AttrHelper::ParseAttr(std::shared_ptr<a8::XObject> xobj, bool AttrHelper::ParseAttr(std::shared_ptr<a8::XObject> xobj,
std::array<float, kHAT_End>& attr_abs, std::array<float, kNHAT_End>& attr_abs,
std::array<float, kHAT_End>& attr_rate) std::array<float, kNHAT_End>& attr_rate)
{ {
if (xobj->IsArray()) { if (xobj->IsArray()) {
for (int i = 0; i < xobj->Size(); ++i) { for (int i = 0; i < xobj->Size(); ++i) {

8
server/gameserver/attrhelper.h
View File

@ -6,11 +6,11 @@ class AttrHelper
{ {
public: public:
static float* GetAttrAbsPtr(std::array<float, kHAT_End>& attr, int attr_id); static float* GetAttrAbsPtr(std::array<float, kNHAT_End>& attr, int attr_id);
static float* GetAttrRatePtr(std::array<float, kHAT_End>& attr, int attr_id); static float* GetAttrRatePtr(std::array<float, kNHAT_End>& attr, int attr_id);
static bool ParseAttr(std::shared_ptr<a8::XObject> xobj, static bool ParseAttr(std::shared_ptr<a8::XObject> xobj,
std::array<float, kHAT_End>& attr_abs, std::array<float, kNHAT_End>& attr_abs,
std::array<float, kHAT_End>& attr_rate); std::array<float, kNHAT_End>& attr_rate);
}; };

2
server/gameserver/global.cc
View File

@ -15,7 +15,7 @@ bool IsValidBuffEffect(int buff_effect)
bool IsValidHumanAttr(int attr_type) bool IsValidHumanAttr(int attr_type)
{ {
return attr_type > kHAT_Begin && attr_type < kHAT_End; return attr_type > kNHAT_Begin && attr_type < kNHAT_End;
} }
bool IsValidHumanVirtualAttr(int attr_type) bool IsValidHumanVirtualAttr(int attr_type)

48
server/gameserver/netdata.cc
View File

@ -317,20 +317,20 @@ private:
void DtoInit(Creature* c) void DtoInit(Creature* c)
{ {
std::array<float, kHAT_End> base_attr_abs = {0}; std::array<float, kNHAT_End> base_attr_abs = {0};
std::array<float, kHAT_End> base_attr_rate = {0}; std::array<float, kNHAT_End> base_attr_rate = {0};
std::array<float, kHAT_End> pro_attr_abs = {0}; std::array<float, kNHAT_End> pro_attr_abs = {0};
std::array<float, kHAT_End> pro_attr_rate = {0}; std::array<float, kNHAT_End> pro_attr_rate = {0};
std::array<float, kHAT_End> skill_attr_abs = {0}; std::array<float, kNHAT_End> skill_attr_abs = {0};
std::array<float, kHAT_End> skill_attr_rate = {0}; std::array<float, kNHAT_End> skill_attr_rate = {0};
std::array<float, kHAT_End> chip_attr_abs = {0}; std::array<float, kNHAT_End> chip_attr_abs = {0};
std::array<float, kHAT_End> chip_attr_rate = {0}; std::array<float, kNHAT_End> chip_attr_rate = {0};
std::array<float, kHAT_End> core_attr_abs = {0}; std::array<float, kNHAT_End> core_attr_abs = {0};
std::array<float, kHAT_End> core_attr_rate = {0}; std::array<float, kNHAT_End> core_attr_rate = {0};
{ {
std::shared_ptr<a8::XObject> attr_base_xobj = hero_dto->At("attr_base"); std::shared_ptr<a8::XObject> attr_base_xobj = hero_dto->At("attr_base");
@ -369,9 +369,9 @@ private:
} }
} }
std::array<float, kHAT_End> finaly_attr_abs = base_attr_abs; std::array<float, kNHAT_End> finaly_attr_abs = base_attr_abs;
std::array<float, kHAT_End> finaly_attr_rate = base_attr_rate; std::array<float, kNHAT_End> finaly_attr_rate = base_attr_rate;
for (int i = 0; i < kHAT_End; ++i) { for (int i = 0; i < kNHAT_End; ++i) {
if (pro_attr_abs[i] > 0.000f) { if (pro_attr_abs[i] > 0.000f) {
finaly_attr_abs[i] = pro_attr_abs[i]; finaly_attr_abs[i] = pro_attr_abs[i];
} }
@ -493,17 +493,17 @@ private:
void DtoInit(Creature* c) void DtoInit(Creature* c)
{ {
std::array<float, kHAT_End> base_attr_abs = {0}; std::array<float, kNHAT_End> base_attr_abs = {0};
std::array<float, kHAT_End> base_attr_rate = {0}; std::array<float, kNHAT_End> base_attr_rate = {0};
std::array<float, kHAT_End> pro_attr_abs = {0}; std::array<float, kNHAT_End> pro_attr_abs = {0};
std::array<float, kHAT_End> pro_attr_rate = {0}; std::array<float, kNHAT_End> pro_attr_rate = {0};
std::array<float, kHAT_End> chip_attr_abs = {0}; std::array<float, kNHAT_End> chip_attr_abs = {0};
std::array<float, kHAT_End> chip_attr_rate = {0}; std::array<float, kNHAT_End> chip_attr_rate = {0};
std::array<float, kHAT_End> core_attr_abs = {0}; std::array<float, kNHAT_End> core_attr_abs = {0};
std::array<float, kHAT_End> core_attr_rate = {0}; std::array<float, kNHAT_End> core_attr_rate = {0};
{ {
std::shared_ptr<a8::XObject> attr_base_xobj = weapon_dto->At("attr_base"); std::shared_ptr<a8::XObject> attr_base_xobj = weapon_dto->At("attr_base");
@ -536,9 +536,9 @@ private:
} }
} }
std::array<float, kHAT_End> finaly_attr_abs = base_attr_abs; std::array<float, kNHAT_End> finaly_attr_abs = base_attr_abs;
std::array<float, kHAT_End> finaly_attr_rate = base_attr_rate; std::array<float, kNHAT_End> finaly_attr_rate = base_attr_rate;
for (int i = 0; i < kHAT_End; ++i) { for (int i = 0; i < kNHAT_End; ++i) {
if (pro_attr_abs[i] > 0.000f) { if (pro_attr_abs[i] > 0.000f) {
finaly_attr_abs[i] = pro_attr_abs[i]; finaly_attr_abs[i] = pro_attr_abs[i];
} }