diff --git a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_member_visitor.h index e6f2666e..647407f8 100644 --- a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_member_visitor.h +++ b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -128,10 +128,10 @@ template<> inline void HeroAgent::_Execute_Method_HeroAgent::GetDown(); } -struct METHOD_TYPE_HeroAgent_GetTeammateDistance { }; -template<> inline float HeroAgent::_Execute_Method_() +struct METHOD_TYPE_HeroAgent_GetTeammateManhattanDistance { }; +template<> inline float HeroAgent::_Execute_Method_() { - return this->HeroAgent::GetTeammateDistance(); + return this->HeroAgent::GetTeammateManhattanDistance(); } struct METHOD_TYPE_HeroAgent_GetTodayBattleTimes { }; 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 b56e1394..4408a14d 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(4059409142u); + AgentMeta::SetTotalSignature(2900147864u); AgentMeta* meta = NULL; BEHAVIAC_UNUSED_VAR(meta); @@ -750,7 +750,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // HeroAgent - meta = BEHAVIAC_NEW AgentMeta(2429750993u); + meta = BEHAVIAC_NEW AgentMeta(3488849203u); 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(3525744799u, BEHAVIAC_NEW CMemberProperty< TeammateAgent* >("current_teammate_agent", Set_HeroAgent_current_teammate_agent, Get_HeroAgent_current_teammate_agent)); @@ -838,7 +838,7 @@ namespace behaviac meta->RegisterMethod(1330753553u, BEHAVIAC_NEW CAgentMethod< behaviac::string >(FunctionPointer_HeroAgent_GetSkillBtFile)); meta->RegisterMethod(2253976520u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_HeroAgent_GetTargetDir)); meta->RegisterMethod(2804704472u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_HeroAgent_GetTargetManhattanDistance)); - meta->RegisterMethod(575648225u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_HeroAgent_GetTeammateDistance)); + meta->RegisterMethod(1110524645u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_HeroAgent_GetTeammateManhattanDistance)); meta->RegisterMethod(2541118574u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetTickCount)); meta->RegisterMethod(2633051214u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetTodayBattleTimes)); meta->RegisterMethod(1866966855u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetUniId)); @@ -920,7 +920,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // AndroidAgent - meta = BEHAVIAC_NEW AgentMeta(1375386276u); + meta = BEHAVIAC_NEW AgentMeta(1894141024u); 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(3525744799u, BEHAVIAC_NEW CMemberProperty< TeammateAgent* >("current_teammate_agent", Set_HeroAgent_current_teammate_agent, Get_HeroAgent_current_teammate_agent)); @@ -1009,7 +1009,7 @@ namespace behaviac meta->RegisterMethod(1330753553u, BEHAVIAC_NEW CAgentMethod< behaviac::string >(FunctionPointer_AndroidAgent_GetSkillBtFile)); meta->RegisterMethod(2253976520u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_AndroidAgent_GetTargetDir)); meta->RegisterMethod(2804704472u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_AndroidAgent_GetTargetManhattanDistance)); - meta->RegisterMethod(575648225u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_AndroidAgent_GetTeammateDistance)); + meta->RegisterMethod(1110524645u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_AndroidAgent_GetTeammateManhattanDistance)); meta->RegisterMethod(2541118574u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetTickCount)); meta->RegisterMethod(2633051214u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetTodayBattleTimes)); meta->RegisterMethod(1866966855u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetUniId)); 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 5dd86a41..c9bef5f8 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 @@ -212,7 +212,7 @@ namespace behaviac inline behaviac::string FunctionPointer_HeroAgent_GetSkillBtFile(Agent* self) { return ((HeroAgent*)self)->GetSkillBtFile(); } inline glm::vec3 FunctionPointer_HeroAgent_GetTargetDir(Agent* self) { return ((HeroAgent*)self)->GetTargetDir(); } inline float FunctionPointer_HeroAgent_GetTargetManhattanDistance(Agent* self) { return ((HeroAgent*)self)->GetTargetManhattanDistance(); } - inline float FunctionPointer_HeroAgent_GetTeammateDistance(Agent* self) { return (float)((HeroAgent*)self)->_Execute_Method_(); } + inline float FunctionPointer_HeroAgent_GetTeammateManhattanDistance(Agent* self) { return (float)((HeroAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_HeroAgent_GetTickCount(Agent* self) { return ((HeroAgent*)self)->GetTickCount(); } inline int FunctionPointer_HeroAgent_GetTodayBattleTimes(Agent* self) { return (int)((HeroAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_HeroAgent_GetUniId(Agent* self) { return ((HeroAgent*)self)->GetUniId(); } @@ -340,7 +340,7 @@ namespace behaviac inline behaviac::string FunctionPointer_AndroidAgent_GetSkillBtFile(Agent* self) { return ((AndroidAgent*)self)->GetSkillBtFile(); } inline glm::vec3 FunctionPointer_AndroidAgent_GetTargetDir(Agent* self) { return ((AndroidAgent*)self)->GetTargetDir(); } inline float FunctionPointer_AndroidAgent_GetTargetManhattanDistance(Agent* self) { return ((AndroidAgent*)self)->GetTargetManhattanDistance(); } - inline float FunctionPointer_AndroidAgent_GetTeammateDistance(Agent* self) { return (float)((HeroAgent*)self)->_Execute_Method_(); } + inline float FunctionPointer_AndroidAgent_GetTeammateManhattanDistance(Agent* self) { return (float)((HeroAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_AndroidAgent_GetTickCount(Agent* self) { return ((AndroidAgent*)self)->GetTickCount(); } inline int FunctionPointer_AndroidAgent_GetTodayBattleTimes(Agent* self) { return (int)((HeroAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_AndroidAgent_GetUniId(Agent* self) { return ((AndroidAgent*)self)->GetUniId(); } diff --git a/server/bin/exported/meta/counterfire.meta.xml b/server/bin/exported/meta/counterfire.meta.xml index 57fe7c0d..856a0aab 100644 --- a/server/bin/exported/meta/counterfire.meta.xml +++ b/server/bin/exported/meta/counterfire.meta.xml @@ -1,7 +1,7 @@ - - + + @@ -32,7 +32,7 @@ - + diff --git a/server/gameserver/hero_agent.cc b/server/gameserver/hero_agent.cc index dfbe95f2..0039ecf7 100644 --- a/server/gameserver/hero_agent.cc +++ b/server/gameserver/hero_agent.cc @@ -1629,7 +1629,7 @@ behaviac::EBTStatus HeroAgent::TrySearchTeammate(int range) return behaviac::BT_FAILURE; } -float HeroAgent::GetTeammateDistance() +float HeroAgent::GetTeammateManhattanDistance() { if (!current_teammate_agent->IsValid()) { return 0; diff --git a/server/gameserver/hero_agent.h b/server/gameserver/hero_agent.h index 9c37c891..986f5fa5 100644 --- a/server/gameserver/hero_agent.h +++ b/server/gameserver/hero_agent.h @@ -94,7 +94,7 @@ public: bool PickupObjIsValid(); void AbandonPickup(int min_time, int max_time); bool CanThrowItem(int slot); - float GetTeammateDistance(); + float GetTeammateManhattanDistance(); bool TeammateIsValid(); void GetDown(); void SwitchSeat(int seat);