From 5b7d05eaad0cb900ad6a67e18c6d8974f71ee95f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 17 Oct 2023 17:38:27 +0800 Subject: [PATCH] 1 --- .../types/internal/behaviac_agent_meta.cpp | 12 +++++++----- .../types/internal/behaviac_agent_meta.h | 6 ++++-- server/gameserver/new_hero_agent.cc | 5 +++++ server/gameserver/new_hero_agent.h | 1 + 4 files changed, 17 insertions(+), 7 deletions(-) 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 6f648ba2..400b48da 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(1256515167u); + AgentMeta::SetTotalSignature(1895962202u); 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(632106174u); + meta = BEHAVIAC_NEW AgentMeta(492465320u); 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)); @@ -805,12 +805,13 @@ namespace behaviac meta->RegisterMethod(542998674u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_OpenBulletTraceMode)); meta->RegisterMethod(3156314303u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_Rand)); meta->RegisterMethod(657529872u, BEHAVIAC_NEW CMethod_HeroAgent_RandomPoint()); + meta->RegisterMethod(664971319u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_HeroAgent_RandomSafeZonePoint)); 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(1373932231u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, behaviac::vector >(FunctionPointer_HeroAgent_RegisterEvents)); meta->RegisterMethod(3146209884u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_RunAway) /* RunAway */); - meta->RegisterMethod(160678866u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_RunGas) /* RunGas */); + meta->RegisterMethod(160678866u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_RunGas) /* RunGas */); meta->RegisterMethod(3025058903u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_HeroAgent_SearchEnemy)); meta->RegisterMethod(2380700906u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_SendEmote)); meta->RegisterMethod(1147186661u, BEHAVIAC_NEW CMethod_HeroAgent_SetAttackDir()); @@ -828,7 +829,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // AndroidAgent - meta = BEHAVIAC_NEW AgentMeta(3664374054u); + meta = BEHAVIAC_NEW AgentMeta(4184260427u); 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)); @@ -906,12 +907,13 @@ namespace behaviac meta->RegisterMethod(542998674u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_OpenBulletTraceMode)); meta->RegisterMethod(3156314303u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_Rand)); meta->RegisterMethod(657529872u, BEHAVIAC_NEW CMethod_HeroAgent_RandomPoint()); + meta->RegisterMethod(664971319u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_AndroidAgent_RandomSafeZonePoint)); 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(1373932231u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, behaviac::vector >(FunctionPointer_AndroidAgent_RegisterEvents)); meta->RegisterMethod(3146209884u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_RunAway) /* RunAway */); - meta->RegisterMethod(160678866u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_RunGas) /* RunGas */); + meta->RegisterMethod(160678866u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_RunGas) /* RunGas */); meta->RegisterMethod(3025058903u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_AndroidAgent_SearchEnemy)); meta->RegisterMethod(2380700906u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_SendEmote)); meta->RegisterMethod(1147186661u, BEHAVIAC_NEW CMethod_HeroAgent_SetAttackDir()); 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 b072e52d..b3b6d220 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 @@ -176,12 +176,13 @@ namespace behaviac inline void FunctionPointer_HeroAgent_OnUnderAttack(Agent* self, int enemy_uniid) { } /* OnUnderAttack */ inline void FunctionPointer_HeroAgent_OpenBulletTraceMode(Agent* self) { ((HeroAgent*)self)->OpenBulletTraceMode(); } inline int FunctionPointer_HeroAgent_Rand(Agent* self) { return (int)((BaseAgent*)self)->_Execute_Method_(); } + inline glm::vec3 FunctionPointer_HeroAgent_RandomSafeZonePoint(Agent* self) { return ((HeroAgent*)self)->RandomSafeZonePoint(); } 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 behaviac::EBTStatus FunctionPointer_HeroAgent_RegisterEvents(Agent* self, behaviac::vector events) { return ((HeroAgent*)self)->RegisterEvents(events); } inline void FunctionPointer_HeroAgent_RunAway(Agent* self) { } /* RunAway */ - inline void FunctionPointer_HeroAgent_RunGas(Agent* self) { } /* RunGas */ + inline void FunctionPointer_HeroAgent_RunGas(Agent* self, glm::vec3& loc_point0) { } /* RunGas */ inline behaviac::EBTStatus FunctionPointer_HeroAgent_SearchEnemy(Agent* self, float range) { return ((HeroAgent*)self)->SearchEnemy(range); } inline void FunctionPointer_HeroAgent_SendEmote(Agent* self, int emote) { ((HeroAgent*)self)->_Execute_Method_(emote); } inline void FunctionPointer_HeroAgent_SetV(Agent* self, int id, int val) { ((HeroAgent*)self)->_Execute_Method_(id, val); } @@ -235,12 +236,13 @@ namespace behaviac inline void FunctionPointer_AndroidAgent_OnUnderAttack(Agent* self, int enemy_uniid) { } /* OnUnderAttack */ inline void FunctionPointer_AndroidAgent_OpenBulletTraceMode(Agent* self) { ((AndroidAgent*)self)->OpenBulletTraceMode(); } inline int FunctionPointer_AndroidAgent_Rand(Agent* self) { return (int)((BaseAgent*)self)->_Execute_Method_(); } + inline glm::vec3 FunctionPointer_AndroidAgent_RandomSafeZonePoint(Agent* self) { return ((AndroidAgent*)self)->RandomSafeZonePoint(); } 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 behaviac::EBTStatus FunctionPointer_AndroidAgent_RegisterEvents(Agent* self, behaviac::vector events) { return ((AndroidAgent*)self)->RegisterEvents(events); } inline void FunctionPointer_AndroidAgent_RunAway(Agent* self) { } /* RunAway */ - inline void FunctionPointer_AndroidAgent_RunGas(Agent* self) { } /* RunGas */ + inline void FunctionPointer_AndroidAgent_RunGas(Agent* self, glm::vec3& loc_point0) { } /* RunGas */ inline behaviac::EBTStatus FunctionPointer_AndroidAgent_SearchEnemy(Agent* self, float range) { return ((AndroidAgent*)self)->SearchEnemy(range); } inline void FunctionPointer_AndroidAgent_SendEmote(Agent* self, int emote) { ((HeroAgent*)self)->_Execute_Method_(emote); } inline void FunctionPointer_AndroidAgent_SetV(Agent* self, int id, int val) { ((HeroAgent*)self)->_Execute_Method_(id, val); } diff --git a/server/gameserver/new_hero_agent.cc b/server/gameserver/new_hero_agent.cc index aa18d086..831707e2 100644 --- a/server/gameserver/new_hero_agent.cc +++ b/server/gameserver/new_hero_agent.cc @@ -240,6 +240,11 @@ glm::vec3 HeroAgent::RandomPoint(const glm::vec3& center, float range) return hit_point; } +glm::vec3 HeroAgent::RandomSafeZonePoint() +{ + +} + float HeroAgent::GetShotRange() { if (owner_->GetCurrWeapon()) { diff --git a/server/gameserver/new_hero_agent.h b/server/gameserver/new_hero_agent.h index 5d6aab00..e3898044 100644 --- a/server/gameserver/new_hero_agent.h +++ b/server/gameserver/new_hero_agent.h @@ -71,6 +71,7 @@ public: glm::vec3 GetRandomDir(); glm::vec3 GetTargetDir(); glm::vec3 RandomPoint(const glm::vec3& center, float range); + glm::vec3 RandomSafeZonePoint(); float GetShotRange(); void SetV(int id, int val); int GetV(int id);