From c6da6a8bb2c9ba79b2ebb3b0def3e98fd4c6b068 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 18 Oct 2023 16:45:00 +0800 Subject: [PATCH] 1 --- .../internal/behaviac_agent_member_visitor.h | 12 +++++++ .../types/internal/behaviac_agent_meta.cpp | 36 ++++++++++++++----- .../types/internal/behaviac_agent_meta.h | 22 ++++++++++-- server/gameserver/new_base_agent.cc | 5 +++ server/gameserver/new_base_agent.h | 1 + server/gameserver/new_hero_agent.cc | 20 +++++++++++ server/gameserver/new_hero_agent.h | 4 +++ 7 files changed, 89 insertions(+), 11 deletions(-) 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 73c6bcee..fe907757 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 @@ -44,6 +44,12 @@ template<> inline void HeroAgent::_Execute_Method_(i this->HeroAgent::DecV(p0, p1); } +struct METHOD_TYPE_HeroAgent_ResetUseSkillTimes { }; +template<> inline void HeroAgent::_Execute_Method_() +{ + this->HeroAgent::ResetUseSkillTimes(); +} + struct METHOD_TYPE_HeroAgent_SendEmote { }; template<> inline void HeroAgent::_Execute_Method_(int p0) { @@ -74,6 +80,12 @@ template<> inline void HeroAgent::_Execute_Method_HeroAgent::ShotNormal(p0); } +struct METHOD_TYPE_HeroAgent_TargetInShotRange { }; +template<> inline bool HeroAgent::_Execute_Method_() +{ + return this->HeroAgent::TargetInShotRange(); +} + struct METHOD_TYPE_HeroAgent_UseSkill { }; template<> inline void HeroAgent::_Execute_Method_(int p0) { 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 746decd7..9446db93 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(1717576671u); + AgentMeta::SetTotalSignature(86377453u); AgentMeta* meta = NULL; BEHAVIAC_UNUSED_VAR(meta); @@ -656,13 +656,14 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // BaseAgent - meta = BEHAVIAC_NEW AgentMeta(4013154615u); + meta = BEHAVIAC_NEW AgentMeta(2140468356u); AgentMeta::GetAgentMetas()[2774251291u] = meta; meta->RegisterMethod(2541118574u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_BaseAgent_GetTickCount)); meta->RegisterMethod(400482748u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_BaseAgent_IsGameOver)); meta->RegisterMethod(1045109914u, BEHAVIAC_NEW CAgentStaticMethodVoid_1(FunctionPointer_BaseAgent_LogMessage)); meta->RegisterMethod(3156314303u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_BaseAgent_Rand)); meta->RegisterMethod(1110901686u, BEHAVIAC_NEW CAgentMethod_2< int, int, int >(FunctionPointer_BaseAgent_RandRange)); + meta->RegisterMethod(966948371u, BEHAVIAC_NEW CAgentMethod_2< float, float, float >(FunctionPointer_BaseAgent_RandRangeAsFloat)); meta->RegisterMethod(2521019022u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd()); meta->RegisterMethod(2306090221u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorClear()); meta->RegisterMethod(3483755530u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorContains()); @@ -670,7 +671,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // RoomAgent - meta = BEHAVIAC_NEW AgentMeta(1114768300u); + meta = BEHAVIAC_NEW AgentMeta(2696163459u); AgentMeta::GetAgentMetas()[1389135714u] = meta; meta->RegisterMethod(3968206693u, BEHAVIAC_NEW CAgentMethod_1< HeroAgent*, int >(FunctionPointer_RoomAgent_FindHero)); meta->RegisterMethod(847579834u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_RoomAgent_GetAliveHumanNum)); @@ -685,6 +686,7 @@ namespace behaviac meta->RegisterMethod(1045109914u, BEHAVIAC_NEW CAgentStaticMethodVoid_1(FunctionPointer_RoomAgent_LogMessage)); meta->RegisterMethod(3156314303u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_RoomAgent_Rand)); meta->RegisterMethod(1110901686u, BEHAVIAC_NEW CAgentMethod_2< int, int, int >(FunctionPointer_RoomAgent_RandRange)); + meta->RegisterMethod(966948371u, BEHAVIAC_NEW CAgentMethod_2< float, float, float >(FunctionPointer_RoomAgent_RandRangeAsFloat)); meta->RegisterMethod(2521019022u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd()); meta->RegisterMethod(2306090221u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorClear()); meta->RegisterMethod(3483755530u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorContains()); @@ -705,7 +707,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // TargetAgent - meta = BEHAVIAC_NEW AgentMeta(2928806131u); + meta = BEHAVIAC_NEW AgentMeta(3996536000u); AgentMeta::GetAgentMetas()[498664641u] = meta; meta->RegisterMethod(347903289u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_TargetAgent_Abandon)); meta->RegisterMethod(2524021140u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_TargetAgent_GetHeroId)); @@ -721,6 +723,7 @@ namespace behaviac meta->RegisterMethod(1045109914u, BEHAVIAC_NEW CAgentStaticMethodVoid_1(FunctionPointer_TargetAgent_LogMessage)); meta->RegisterMethod(3156314303u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_TargetAgent_Rand)); meta->RegisterMethod(1110901686u, BEHAVIAC_NEW CAgentMethod_2< int, int, int >(FunctionPointer_TargetAgent_RandRange)); + meta->RegisterMethod(966948371u, BEHAVIAC_NEW CAgentMethod_2< float, float, float >(FunctionPointer_TargetAgent_RandRangeAsFloat)); meta->RegisterMethod(2521019022u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd()); meta->RegisterMethod(2306090221u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorClear()); meta->RegisterMethod(3483755530u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorContains()); @@ -728,7 +731,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // HeroAgent - meta = BEHAVIAC_NEW AgentMeta(276906930u); + meta = BEHAVIAC_NEW AgentMeta(2900806213u); 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)); @@ -759,7 +762,7 @@ namespace behaviac meta->RegisterMethod(113953652u, BEHAVIAC_NEW CMethod_HeroAgent_CalcDistance()); meta->RegisterMethod(896336728u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_CanShot)); meta->RegisterMethod(1672911688u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_CanUseSkill)); - meta->RegisterMethod(513965041u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_ChaseToKill) /* ChaseToKill */); + meta->RegisterMethod(513965041u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_HeroAgent_ChaseToKill) /* ChaseToKill */); meta->RegisterMethod(2692459416u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_ChiMode) /* ChiMode */); meta->RegisterMethod(264945831u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_CloseBulletTraceMode)); meta->RegisterMethod(1954431609u, BEHAVIAC_NEW CMethod_HeroAgent_CoFindPath()); @@ -785,12 +788,15 @@ namespace behaviac meta->RegisterMethod(3865393862u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_HeroAgent_GetSafeAreaCenter)); meta->RegisterMethod(1369696888u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_HeroAgent_GetSafeAreaRadius)); meta->RegisterMethod(138556770u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_HeroAgent_GetShotRange)); + meta->RegisterMethod(3821163497u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetShotTimes)); meta->RegisterMethod(2253976520u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_HeroAgent_GetTargetDir)); meta->RegisterMethod(2541118574u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetTickCount)); meta->RegisterMethod(1866966855u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetUniId)); + meta->RegisterMethod(4271568288u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetUseSkillTimes)); meta->RegisterMethod(1736603085u, BEHAVIAC_NEW CAgentMethod_1< int, int >(FunctionPointer_HeroAgent_GetV)); meta->RegisterMethod(3603629747u, BEHAVIAC_NEW CAgentMethod_1< bool, BuffEffectType_e >(FunctionPointer_HeroAgent_HasBuffEffect)); meta->RegisterMethod(383449432u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_HeroAgent_IncV)); + meta->RegisterMethod(750137748u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_InTargetShotRange)); meta->RegisterMethod(3750923794u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_IsChiJiMode)); meta->RegisterMethod(1054489725u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_IsDead)); meta->RegisterMethod(400482748u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_IsGameOver)); @@ -809,7 +815,10 @@ namespace behaviac meta->RegisterMethod(3929481793u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_HeroAgent_RandomShot) /* RandomShot */); meta->RegisterMethod(2913172428u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_HeroAgent_RandomWalk) /* RandomWalk */); meta->RegisterMethod(1110901686u, BEHAVIAC_NEW CAgentMethod_2< int, int, int >(FunctionPointer_HeroAgent_RandRange)); + meta->RegisterMethod(966948371u, BEHAVIAC_NEW CAgentMethod_2< float, float, float >(FunctionPointer_HeroAgent_RandRangeAsFloat)); meta->RegisterMethod(1373932231u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, behaviac::vector >(FunctionPointer_HeroAgent_RegisterEvents)); + meta->RegisterMethod(1019888894u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_ResetShotTimes)); + meta->RegisterMethod(1615222898u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_ResetUseSkillTimes)); meta->RegisterMethod(3146209884u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_RunAway) /* RunAway */); meta->RegisterMethod(160678866u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_HeroAgent_RunGas) /* RunGas */); meta->RegisterMethod(3025058903u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_HeroAgent_SearchEnemy)); @@ -820,6 +829,7 @@ namespace behaviac meta->RegisterMethod(3683918805u, BEHAVIAC_NEW CMethod_HeroAgent_ShotNormal()); meta->RegisterMethod(72479814u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_ShotTrace)); meta->RegisterMethod(1576005918u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_StayPutAttack) /* StayPutAttack */); + meta->RegisterMethod(179831127u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_TargetInShotRange)); meta->RegisterMethod(3214329694u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_TeammateHelpAttack) /* TeammateHelpAttack */); meta->RegisterMethod(2129264648u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_UseSkill)); meta->RegisterMethod(2521019022u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd()); @@ -829,7 +839,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // AndroidAgent - meta = BEHAVIAC_NEW AgentMeta(3184243081u); + meta = BEHAVIAC_NEW AgentMeta(1528429479u); 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)); @@ -860,7 +870,7 @@ namespace behaviac meta->RegisterMethod(113953652u, BEHAVIAC_NEW CMethod_HeroAgent_CalcDistance()); meta->RegisterMethod(896336728u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_CanShot)); meta->RegisterMethod(1672911688u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_CanUseSkill)); - meta->RegisterMethod(513965041u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_ChaseToKill) /* ChaseToKill */); + meta->RegisterMethod(513965041u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_AndroidAgent_ChaseToKill) /* ChaseToKill */); meta->RegisterMethod(2692459416u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_ChiMode) /* ChiMode */); meta->RegisterMethod(264945831u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_CloseBulletTraceMode)); meta->RegisterMethod(1954431609u, BEHAVIAC_NEW CMethod_HeroAgent_CoFindPath()); @@ -887,12 +897,15 @@ namespace behaviac meta->RegisterMethod(3865393862u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_AndroidAgent_GetSafeAreaCenter)); meta->RegisterMethod(1369696888u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_AndroidAgent_GetSafeAreaRadius)); meta->RegisterMethod(138556770u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_AndroidAgent_GetShotRange)); + meta->RegisterMethod(3821163497u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetShotTimes)); meta->RegisterMethod(2253976520u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_AndroidAgent_GetTargetDir)); meta->RegisterMethod(2541118574u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetTickCount)); meta->RegisterMethod(1866966855u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetUniId)); + meta->RegisterMethod(4271568288u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetUseSkillTimes)); meta->RegisterMethod(1736603085u, BEHAVIAC_NEW CAgentMethod_1< int, int >(FunctionPointer_AndroidAgent_GetV)); meta->RegisterMethod(3603629747u, BEHAVIAC_NEW CAgentMethod_1< bool, BuffEffectType_e >(FunctionPointer_AndroidAgent_HasBuffEffect)); meta->RegisterMethod(383449432u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_AndroidAgent_IncV)); + meta->RegisterMethod(750137748u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_InTargetShotRange)); meta->RegisterMethod(3750923794u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_IsChiJiMode)); meta->RegisterMethod(1054489725u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_IsDead)); meta->RegisterMethod(400482748u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_IsGameOver)); @@ -911,7 +924,10 @@ namespace behaviac meta->RegisterMethod(3929481793u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_AndroidAgent_RandomShot) /* RandomShot */); meta->RegisterMethod(2913172428u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_AndroidAgent_RandomWalk) /* RandomWalk */); meta->RegisterMethod(1110901686u, BEHAVIAC_NEW CAgentMethod_2< int, int, int >(FunctionPointer_AndroidAgent_RandRange)); + meta->RegisterMethod(966948371u, BEHAVIAC_NEW CAgentMethod_2< float, float, float >(FunctionPointer_AndroidAgent_RandRangeAsFloat)); meta->RegisterMethod(1373932231u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, behaviac::vector >(FunctionPointer_AndroidAgent_RegisterEvents)); + meta->RegisterMethod(1019888894u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_ResetShotTimes)); + meta->RegisterMethod(1615222898u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_ResetUseSkillTimes)); meta->RegisterMethod(3146209884u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_RunAway) /* RunAway */); meta->RegisterMethod(160678866u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_AndroidAgent_RunGas) /* RunGas */); meta->RegisterMethod(3025058903u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_AndroidAgent_SearchEnemy)); @@ -922,6 +938,7 @@ namespace behaviac meta->RegisterMethod(3683918805u, BEHAVIAC_NEW CMethod_HeroAgent_ShotNormal()); meta->RegisterMethod(72479814u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_ShotTrace)); meta->RegisterMethod(1576005918u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_StayPutAttack) /* StayPutAttack */); + meta->RegisterMethod(179831127u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_TargetInShotRange)); meta->RegisterMethod(3214329694u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_TeammateHelpAttack) /* TeammateHelpAttack */); meta->RegisterMethod(2129264648u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_UseSkill)); meta->RegisterMethod(2521019022u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd()); @@ -931,7 +948,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // MasterAgent - meta = BEHAVIAC_NEW AgentMeta(680306870u); + meta = BEHAVIAC_NEW AgentMeta(2814129734u); AgentMeta::GetAgentMetas()[2505569052u] = meta; meta->RegisterMethod(2524021140u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_MasterAgent_GetHeroId)); meta->RegisterMethod(1572331229u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_MasterAgent_GetHP)); @@ -945,6 +962,7 @@ namespace behaviac meta->RegisterMethod(1045109914u, BEHAVIAC_NEW CAgentStaticMethodVoid_1(FunctionPointer_MasterAgent_LogMessage)); meta->RegisterMethod(3156314303u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_MasterAgent_Rand)); meta->RegisterMethod(1110901686u, BEHAVIAC_NEW CAgentMethod_2< int, int, int >(FunctionPointer_MasterAgent_RandRange)); + meta->RegisterMethod(966948371u, BEHAVIAC_NEW CAgentMethod_2< float, float, float >(FunctionPointer_MasterAgent_RandRangeAsFloat)); meta->RegisterMethod(2521019022u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd()); meta->RegisterMethod(2306090221u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorClear()); meta->RegisterMethod(3483755530u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorContains()); 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 18af55d9..798ec907 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 @@ -21,6 +21,7 @@ namespace behaviac inline void FunctionPointer_BaseAgent_LogMessage(char* param0) { BaseAgent::LogMessage(param0); } inline int FunctionPointer_BaseAgent_Rand(Agent* self) { return (int)((BaseAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_BaseAgent_RandRange(Agent* self, int min_val, int max_val) { return (int)((BaseAgent*)self)->_Execute_Method_(min_val, max_val); } + inline float FunctionPointer_BaseAgent_RandRangeAsFloat(Agent* self, float min_val, float max_val) { return ((BaseAgent*)self)->RandRangeAsFloat(min_val, max_val); } inline HeroAgent* FunctionPointer_RoomAgent_FindHero(Agent* self, int hero_uniid) { return ((RoomAgent*)self)->FindHero(hero_uniid); } inline int FunctionPointer_RoomAgent_GetAliveHumanNum(Agent* self) { return ((RoomAgent*)self)->GetAliveHumanNum(); } inline int FunctionPointer_RoomAgent_GetAlivePlayerNum(Agent* self) { return ((RoomAgent*)self)->GetAlivePlayerNum(); } @@ -34,6 +35,7 @@ namespace behaviac inline void FunctionPointer_RoomAgent_LogMessage(char* param0) { RoomAgent::LogMessage(param0); } inline int FunctionPointer_RoomAgent_Rand(Agent* self) { return (int)((BaseAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_RoomAgent_RandRange(Agent* self, int min_val, int max_val) { return (int)((BaseAgent*)self)->_Execute_Method_(min_val, max_val); } + inline float FunctionPointer_RoomAgent_RandRangeAsFloat(Agent* self, float min_val, float max_val) { return ((RoomAgent*)self)->RandRangeAsFloat(min_val, max_val); } inline int FunctionPointer_TeamAgent_GetAlivePlayerNum(Agent* self) { return ((TeamAgent*)self)->GetAlivePlayerNum(); } inline int FunctionPointer_TeamAgent_GetMemberNum(Agent* self) { return ((TeamAgent*)self)->GetMemberNum(); } inline int FunctionPointer_TeamAgent_GetPlayerNum(Agent* self) { return ((TeamAgent*)self)->GetPlayerNum(); } @@ -52,6 +54,7 @@ namespace behaviac inline void FunctionPointer_TargetAgent_LogMessage(char* param0) { TargetAgent::LogMessage(param0); } inline int FunctionPointer_TargetAgent_Rand(Agent* self) { return (int)((BaseAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_TargetAgent_RandRange(Agent* self, int min_val, int max_val) { return (int)((BaseAgent*)self)->_Execute_Method_(min_val, max_val); } + inline float FunctionPointer_TargetAgent_RandRangeAsFloat(Agent* self, float min_val, float max_val) { return ((TargetAgent*)self)->RandRangeAsFloat(min_val, max_val); } inline void Set_HeroAgent_current_target_agent(Agent* self, TargetAgent* value) { ((HeroAgent*)self)->current_target_agent = value; }; inline const void* Get_HeroAgent_current_target_agent(Agent* self) { return &((HeroAgent*)self)->current_target_agent; }; @@ -133,7 +136,7 @@ namespace behaviac inline bool FunctionPointer_HeroAgent_CanShot(Agent* self) { return ((HeroAgent*)self)->CanShot(); } inline bool FunctionPointer_HeroAgent_CanUseSkill(Agent* self) { return ((HeroAgent*)self)->CanUseSkill(); } - inline void FunctionPointer_HeroAgent_ChaseToKill(Agent* self) { } /* ChaseToKill */ + inline void FunctionPointer_HeroAgent_ChaseToKill(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* ChaseToKill */ inline void FunctionPointer_HeroAgent_ChiMode(Agent* self) { } /* ChiMode */ inline void FunctionPointer_HeroAgent_CloseBulletTraceMode(Agent* self) { ((HeroAgent*)self)->CloseBulletTraceMode(); } inline behaviac::EBTStatus FunctionPointer_HeroAgent_CoIdle(Agent* self, int min_val, int max_val) { return ((HeroAgent*)self)->CoIdle(min_val, max_val); } @@ -157,12 +160,15 @@ namespace behaviac inline glm::vec3 FunctionPointer_HeroAgent_GetSafeAreaCenter(Agent* self) { return ((HeroAgent*)self)->GetSafeAreaCenter(); } inline float FunctionPointer_HeroAgent_GetSafeAreaRadius(Agent* self) { return ((HeroAgent*)self)->GetSafeAreaRadius(); } inline float FunctionPointer_HeroAgent_GetShotRange(Agent* self) { return ((HeroAgent*)self)->GetShotRange(); } + inline int FunctionPointer_HeroAgent_GetShotTimes(Agent* self) { return ((HeroAgent*)self)->GetShotTimes(); } inline glm::vec3 FunctionPointer_HeroAgent_GetTargetDir(Agent* self) { return ((HeroAgent*)self)->GetTargetDir(); } inline int FunctionPointer_HeroAgent_GetTickCount(Agent* self) { return ((HeroAgent*)self)->GetTickCount(); } inline int FunctionPointer_HeroAgent_GetUniId(Agent* self) { return ((HeroAgent*)self)->GetUniId(); } + inline int FunctionPointer_HeroAgent_GetUseSkillTimes(Agent* self) { return ((HeroAgent*)self)->GetUseSkillTimes(); } inline int FunctionPointer_HeroAgent_GetV(Agent* self, int id) { return ((HeroAgent*)self)->GetV(id); } inline bool FunctionPointer_HeroAgent_HasBuffEffect(Agent* self, BuffEffectType_e buff_effect) { return ((HeroAgent*)self)->HasBuffEffect(buff_effect); } inline void FunctionPointer_HeroAgent_IncV(Agent* self, int id, int val) { ((HeroAgent*)self)->IncV(id, val); } + inline bool FunctionPointer_HeroAgent_InTargetShotRange(Agent* self) { return ((HeroAgent*)self)->InTargetShotRange(); } inline bool FunctionPointer_HeroAgent_IsChiJiMode(Agent* self) { return ((HeroAgent*)self)->IsChiJiMode(); } inline bool FunctionPointer_HeroAgent_IsDead(Agent* self) { return ((HeroAgent*)self)->IsDead(); } inline bool FunctionPointer_HeroAgent_IsGameOver(Agent* self) { return ((HeroAgent*)self)->IsGameOver(); } @@ -180,7 +186,10 @@ namespace behaviac inline void FunctionPointer_HeroAgent_RandomShot(Agent* self, int loc_val0, int loc_val1, glm::vec3& loc_point0) { } /* RandomShot */ inline void FunctionPointer_HeroAgent_RandomWalk(Agent* self, int loc_val0, int loc_val1, glm::vec3& loc_point0) { } /* RandomWalk */ inline int FunctionPointer_HeroAgent_RandRange(Agent* self, int min_val, int max_val) { return (int)((BaseAgent*)self)->_Execute_Method_(min_val, max_val); } + inline float FunctionPointer_HeroAgent_RandRangeAsFloat(Agent* self, float min_val, float max_val) { return ((HeroAgent*)self)->RandRangeAsFloat(min_val, max_val); } inline behaviac::EBTStatus FunctionPointer_HeroAgent_RegisterEvents(Agent* self, behaviac::vector events) { return ((HeroAgent*)self)->RegisterEvents(events); } + inline void FunctionPointer_HeroAgent_ResetShotTimes(Agent* self) { ((HeroAgent*)self)->ResetShotTimes(); } + inline void FunctionPointer_HeroAgent_ResetUseSkillTimes(Agent* self) { ((HeroAgent*)self)->_Execute_Method_(); } inline void FunctionPointer_HeroAgent_RunAway(Agent* self) { } /* RunAway */ inline void FunctionPointer_HeroAgent_RunGas(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* RunGas */ inline behaviac::EBTStatus FunctionPointer_HeroAgent_SearchEnemy(Agent* self, float range) { return ((HeroAgent*)self)->SearchEnemy(range); } @@ -188,11 +197,12 @@ namespace behaviac inline void FunctionPointer_HeroAgent_SetV(Agent* self, int id, int val) { ((HeroAgent*)self)->_Execute_Method_(id, val); } inline void FunctionPointer_HeroAgent_ShotTrace(Agent* self) { ((HeroAgent*)self)->ShotTrace(); } inline void FunctionPointer_HeroAgent_StayPutAttack(Agent* self) { } /* StayPutAttack */ + inline bool FunctionPointer_HeroAgent_TargetInShotRange(Agent* self) { return (bool)((HeroAgent*)self)->_Execute_Method_(); } inline void FunctionPointer_HeroAgent_TeammateHelpAttack(Agent* self) { } /* TeammateHelpAttack */ inline void FunctionPointer_HeroAgent_UseSkill(Agent* self, int skill_id) { ((HeroAgent*)self)->_Execute_Method_(skill_id); } inline bool FunctionPointer_AndroidAgent_CanShot(Agent* self) { return ((AndroidAgent*)self)->CanShot(); } inline bool FunctionPointer_AndroidAgent_CanUseSkill(Agent* self) { return ((AndroidAgent*)self)->CanUseSkill(); } - inline void FunctionPointer_AndroidAgent_ChaseToKill(Agent* self) { } /* ChaseToKill */ + inline void FunctionPointer_AndroidAgent_ChaseToKill(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* ChaseToKill */ inline void FunctionPointer_AndroidAgent_ChiMode(Agent* self) { } /* ChiMode */ inline void FunctionPointer_AndroidAgent_CloseBulletTraceMode(Agent* self) { ((AndroidAgent*)self)->CloseBulletTraceMode(); } inline behaviac::EBTStatus FunctionPointer_AndroidAgent_CoIdle(Agent* self, int min_val, int max_val) { return ((AndroidAgent*)self)->CoIdle(min_val, max_val); } @@ -217,12 +227,15 @@ namespace behaviac inline glm::vec3 FunctionPointer_AndroidAgent_GetSafeAreaCenter(Agent* self) { return ((AndroidAgent*)self)->GetSafeAreaCenter(); } inline float FunctionPointer_AndroidAgent_GetSafeAreaRadius(Agent* self) { return ((AndroidAgent*)self)->GetSafeAreaRadius(); } inline float FunctionPointer_AndroidAgent_GetShotRange(Agent* self) { return ((AndroidAgent*)self)->GetShotRange(); } + inline int FunctionPointer_AndroidAgent_GetShotTimes(Agent* self) { return ((AndroidAgent*)self)->GetShotTimes(); } inline glm::vec3 FunctionPointer_AndroidAgent_GetTargetDir(Agent* self) { return ((AndroidAgent*)self)->GetTargetDir(); } inline int FunctionPointer_AndroidAgent_GetTickCount(Agent* self) { return ((AndroidAgent*)self)->GetTickCount(); } inline int FunctionPointer_AndroidAgent_GetUniId(Agent* self) { return ((AndroidAgent*)self)->GetUniId(); } + inline int FunctionPointer_AndroidAgent_GetUseSkillTimes(Agent* self) { return ((AndroidAgent*)self)->GetUseSkillTimes(); } inline int FunctionPointer_AndroidAgent_GetV(Agent* self, int id) { return ((AndroidAgent*)self)->GetV(id); } inline bool FunctionPointer_AndroidAgent_HasBuffEffect(Agent* self, BuffEffectType_e buff_effect) { return ((AndroidAgent*)self)->HasBuffEffect(buff_effect); } inline void FunctionPointer_AndroidAgent_IncV(Agent* self, int id, int val) { ((AndroidAgent*)self)->IncV(id, val); } + inline bool FunctionPointer_AndroidAgent_InTargetShotRange(Agent* self) { return ((AndroidAgent*)self)->InTargetShotRange(); } inline bool FunctionPointer_AndroidAgent_IsChiJiMode(Agent* self) { return ((AndroidAgent*)self)->IsChiJiMode(); } inline bool FunctionPointer_AndroidAgent_IsDead(Agent* self) { return ((AndroidAgent*)self)->IsDead(); } inline bool FunctionPointer_AndroidAgent_IsGameOver(Agent* self) { return ((AndroidAgent*)self)->IsGameOver(); } @@ -240,7 +253,10 @@ namespace behaviac inline void FunctionPointer_AndroidAgent_RandomShot(Agent* self, int loc_val0, int loc_val1, glm::vec3& loc_point0) { } /* RandomShot */ inline void FunctionPointer_AndroidAgent_RandomWalk(Agent* self, int loc_val0, int loc_val1, glm::vec3& loc_point0) { } /* RandomWalk */ inline int FunctionPointer_AndroidAgent_RandRange(Agent* self, int min_val, int max_val) { return (int)((BaseAgent*)self)->_Execute_Method_(min_val, max_val); } + inline float FunctionPointer_AndroidAgent_RandRangeAsFloat(Agent* self, float min_val, float max_val) { return ((AndroidAgent*)self)->RandRangeAsFloat(min_val, max_val); } inline behaviac::EBTStatus FunctionPointer_AndroidAgent_RegisterEvents(Agent* self, behaviac::vector events) { return ((AndroidAgent*)self)->RegisterEvents(events); } + inline void FunctionPointer_AndroidAgent_ResetShotTimes(Agent* self) { ((AndroidAgent*)self)->ResetShotTimes(); } + inline void FunctionPointer_AndroidAgent_ResetUseSkillTimes(Agent* self) { ((HeroAgent*)self)->_Execute_Method_(); } inline void FunctionPointer_AndroidAgent_RunAway(Agent* self) { } /* RunAway */ inline void FunctionPointer_AndroidAgent_RunGas(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* RunGas */ inline behaviac::EBTStatus FunctionPointer_AndroidAgent_SearchEnemy(Agent* self, float range) { return ((AndroidAgent*)self)->SearchEnemy(range); } @@ -248,6 +264,7 @@ namespace behaviac inline void FunctionPointer_AndroidAgent_SetV(Agent* self, int id, int val) { ((HeroAgent*)self)->_Execute_Method_(id, val); } inline void FunctionPointer_AndroidAgent_ShotTrace(Agent* self) { ((AndroidAgent*)self)->ShotTrace(); } inline void FunctionPointer_AndroidAgent_StayPutAttack(Agent* self) { } /* StayPutAttack */ + inline bool FunctionPointer_AndroidAgent_TargetInShotRange(Agent* self) { return (bool)((HeroAgent*)self)->_Execute_Method_(); } inline void FunctionPointer_AndroidAgent_TeammateHelpAttack(Agent* self) { } /* TeammateHelpAttack */ inline void FunctionPointer_AndroidAgent_UseSkill(Agent* self, int skill_id) { ((HeroAgent*)self)->_Execute_Method_(skill_id); } inline int FunctionPointer_MasterAgent_GetHeroId(Agent* self) { return ((MasterAgent*)self)->GetHeroId(); } @@ -262,6 +279,7 @@ namespace behaviac inline void FunctionPointer_MasterAgent_LogMessage(char* param0) { MasterAgent::LogMessage(param0); } inline int FunctionPointer_MasterAgent_Rand(Agent* self) { return (int)((BaseAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_MasterAgent_RandRange(Agent* self, int min_val, int max_val) { return (int)((BaseAgent*)self)->_Execute_Method_(min_val, max_val); } + inline float FunctionPointer_MasterAgent_RandRangeAsFloat(Agent* self, float min_val, float max_val) { return ((MasterAgent*)self)->RandRangeAsFloat(min_val, max_val); } inline void Set_glm_vec3_x(Agent* self, float value) { ((glm::vec3*)self)->x = value; }; inline const void* Get_glm_vec3_x(Agent* self) { return &((glm::vec3*)self)->x; }; diff --git a/server/gameserver/new_base_agent.cc b/server/gameserver/new_base_agent.cc index 4ebbfb13..462e9e0c 100644 --- a/server/gameserver/new_base_agent.cc +++ b/server/gameserver/new_base_agent.cc @@ -42,3 +42,8 @@ bool BaseAgent::IsMobaMode() { return false; } + +float BaseAgent::RandRangeAsFloat(float min_val, float max_val) +{ + return RandRange(min_val, max_val); +} diff --git a/server/gameserver/new_base_agent.h b/server/gameserver/new_base_agent.h index 2c29d06f..33c07d7a 100644 --- a/server/gameserver/new_base_agent.h +++ b/server/gameserver/new_base_agent.h @@ -18,6 +18,7 @@ public: bool IsGameOver(); int GetTickCount(); int RandRange(int min_val, int max_val); + float RandRangeAsFloat(float min_val, float max_val); int Rand(); bool IsChiJiMode(); bool IsMobaMode(); diff --git a/server/gameserver/new_hero_agent.cc b/server/gameserver/new_hero_agent.cc index 981fa71f..4f1303e6 100644 --- a/server/gameserver/new_hero_agent.cc +++ b/server/gameserver/new_hero_agent.cc @@ -728,3 +728,23 @@ bool HeroAgent::InTargetShotRange() } return shot_range < owner_->GetPos().DistanceGlmVec3(current_target_agent->GetPos()); } + +void HeroAgent::ResetShotTimes() +{ + +} + +void HeroAgent::ResetUseSkillTimes() +{ + +} + +int HeroAgent::GetShotTimes() +{ + return 0; +} + +int HeroAgent::GetUseSkillTimes() +{ + return 0; +} diff --git a/server/gameserver/new_hero_agent.h b/server/gameserver/new_hero_agent.h index f7588d70..2be7e112 100644 --- a/server/gameserver/new_hero_agent.h +++ b/server/gameserver/new_hero_agent.h @@ -84,6 +84,10 @@ public: void UnSetFlag(int tag); bool TargetInShotRange(); bool InTargetShotRange(); + void ResetShotTimes(); + void ResetUseSkillTimes(); + int GetShotTimes(); + int GetUseSkillTimes(); behaviac::EBTStatus RegisterEvents(behaviac::vector events); behaviac::EBTStatus SearchEnemy(float range);