diff --git a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.cpp b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.cpp index 4e86d974..9870cf5e 100644 --- a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.cpp +++ b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.cpp @@ -633,7 +633,7 @@ namespace behaviac virtual bool load() { - AgentMeta::SetTotalSignature(3301008628u); + AgentMeta::SetTotalSignature(3432554215u); AgentMeta* meta = NULL; BEHAVIAC_UNUSED_VAR(meta); @@ -728,7 +728,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // HeroAgent - meta = BEHAVIAC_NEW AgentMeta(1001196959u); + meta = BEHAVIAC_NEW AgentMeta(2012350316u); AgentMeta::GetAgentMetas()[2270112014u] = meta; meta->RegisterMemberProperty(2706111800u, BEHAVIAC_NEW CMemberProperty< TargetAgent* >("current_target_agent", Set_HeroAgent_current_target_agent, Get_HeroAgent_current_target_agent)); meta->RegisterMemberProperty(1530109714u, BEHAVIAC_NEW CMemberProperty< MasterAgent* >("master_agent", Set_HeroAgent_master_agent, Get_HeroAgent_master_agent)); @@ -795,7 +795,6 @@ namespace behaviac meta->RegisterMethod(2838752827u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_IsMobaMode)); meta->RegisterMethod(3287572438u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_IsMoving)); meta->RegisterMethod(550488892u, BEHAVIAC_NEW CAgentMethod_1< bool, float >(FunctionPointer_HeroAgent_IsNearGas)); - meta->RegisterMethod(2785609189u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_IsValid)); meta->RegisterMethod(1045109914u, BEHAVIAC_NEW CAgentStaticMethodVoid_1(FunctionPointer_HeroAgent_LogMessage)); meta->RegisterMethod(2967784099u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_MasterHelpAttack) /* MasterHelpAttack */); meta->RegisterMethod(130282478u, BEHAVIAC_NEW CAgentMethod_1< bool, float >(FunctionPointer_HeroAgent_MasterInRange)); @@ -825,7 +824,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // AndroidAgent - meta = BEHAVIAC_NEW AgentMeta(2506140839u); + meta = BEHAVIAC_NEW AgentMeta(3812976802u); AgentMeta::GetAgentMetas()[2475098143u] = meta; meta->RegisterMemberProperty(2706111800u, BEHAVIAC_NEW CMemberProperty< TargetAgent* >("current_target_agent", Set_HeroAgent_current_target_agent, Get_HeroAgent_current_target_agent)); meta->RegisterMemberProperty(1530109714u, BEHAVIAC_NEW CMemberProperty< MasterAgent* >("master_agent", Set_HeroAgent_master_agent, Get_HeroAgent_master_agent)); @@ -893,7 +892,6 @@ namespace behaviac meta->RegisterMethod(2838752827u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_IsMobaMode)); meta->RegisterMethod(3287572438u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_IsMoving)); meta->RegisterMethod(550488892u, BEHAVIAC_NEW CAgentMethod_1< bool, float >(FunctionPointer_AndroidAgent_IsNearGas)); - meta->RegisterMethod(2785609189u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_IsValid)); meta->RegisterMethod(1045109914u, BEHAVIAC_NEW CAgentStaticMethodVoid_1(FunctionPointer_AndroidAgent_LogMessage)); meta->RegisterMethod(2967784099u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_MasterHelpAttack) /* MasterHelpAttack */); meta->RegisterMethod(130282478u, BEHAVIAC_NEW CAgentMethod_1< bool, float >(FunctionPointer_AndroidAgent_MasterInRange)); diff --git a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.h b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.h index 6e7ddd63..d0c8ed69 100644 --- a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.h +++ b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.h @@ -167,7 +167,6 @@ namespace behaviac inline bool FunctionPointer_HeroAgent_IsMobaMode(Agent* self) { return ((HeroAgent*)self)->IsMobaMode(); } inline bool FunctionPointer_HeroAgent_IsMoving(Agent* self) { return ((HeroAgent*)self)->IsMoving(); } inline bool FunctionPointer_HeroAgent_IsNearGas(Agent* self, float range) { return ((HeroAgent*)self)->IsNearGas(range); } - inline bool FunctionPointer_HeroAgent_IsValid(Agent* self) { return ((HeroAgent*)self)->IsValid(); } inline void FunctionPointer_HeroAgent_LogMessage(char* param0) { HeroAgent::LogMessage(param0); } inline void FunctionPointer_HeroAgent_MasterHelpAttack(Agent* self) { } /* MasterHelpAttack */ inline bool FunctionPointer_HeroAgent_MasterInRange(Agent* self, float range) { return ((HeroAgent*)self)->MasterInRange(range); } @@ -223,7 +222,6 @@ namespace behaviac inline bool FunctionPointer_AndroidAgent_IsMobaMode(Agent* self) { return ((AndroidAgent*)self)->IsMobaMode(); } inline bool FunctionPointer_AndroidAgent_IsMoving(Agent* self) { return ((AndroidAgent*)self)->IsMoving(); } inline bool FunctionPointer_AndroidAgent_IsNearGas(Agent* self, float range) { return ((AndroidAgent*)self)->IsNearGas(range); } - inline bool FunctionPointer_AndroidAgent_IsValid(Agent* self) { return ((AndroidAgent*)self)->IsValid(); } inline void FunctionPointer_AndroidAgent_LogMessage(char* param0) { AndroidAgent::LogMessage(param0); } inline void FunctionPointer_AndroidAgent_MasterHelpAttack(Agent* self) { } /* MasterHelpAttack */ inline bool FunctionPointer_AndroidAgent_MasterInRange(Agent* self, float range) { return ((AndroidAgent*)self)->MasterInRange(range); } diff --git a/server/bin/exported/behaviac_generated/types/internal/behaviac_headers.h b/server/bin/exported/behaviac_generated/types/internal/behaviac_headers.h index 79f59f02..6049364c 100644 --- a/server/bin/exported/behaviac_generated/types/internal/behaviac_headers.h +++ b/server/bin/exported/behaviac_generated/types/internal/behaviac_headers.h @@ -13,6 +13,7 @@ #include "room_agent.h" #include "target_agent.h" #include "team_agent.h" +#include "master_agent.h" #include "behaviac_customized_types.h" diff --git a/server/gameserver/master_agent.cc b/server/gameserver/master_agent.cc index 0013505d..f2b6532a 100644 --- a/server/gameserver/master_agent.cc +++ b/server/gameserver/master_agent.cc @@ -39,7 +39,7 @@ const glm::vec3 MasterAgent::GetPos() return owner_->master.Get()->GetPos().ToGlmVec3(); } -float MasterAgent::GetHp() +float MasterAgent::GetHP() { if (!owner_->master.Get()) { abort(); @@ -47,7 +47,7 @@ float MasterAgent::GetHp() return owner_->master.Get()->GetHP(); } -float MasterAgent::GetMaxHp() +float MasterAgent::GetMaxHP() { if (!owner_->master.Get()) { abort(); diff --git a/server/gameserver/master_agent.h b/server/gameserver/master_agent.h index 4a9a5ce7..f7fc786f 100644 --- a/server/gameserver/master_agent.h +++ b/server/gameserver/master_agent.h @@ -17,8 +17,8 @@ public: bool IsValid(); bool IsDead(); const glm::vec3 GetPos(); - float GetHp(); - float GetMaxHp(); + float GetHP(); + float GetMaxHP(); int GetHeroId(); int GetLevel();