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 c591925e..b8913d74 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 @@ -10,6 +10,12 @@ // Agent property and method handlers +struct METHOD_TYPE_BaseAgent_AbortCoroutine { }; +template<> inline void BaseAgent::_Execute_Method_(CoId_e p0) +{ + this->BaseAgent::AbortCoroutine(p0); +} + struct METHOD_TYPE_BaseAgent_CoTest { }; template<> inline behaviac::EBTStatus BaseAgent::_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 4131dadc..d977f709 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(1095594251u); + AgentMeta::SetTotalSignature(4183950302u); AgentMeta* meta = NULL; BEHAVIAC_UNUSED_VAR(meta); @@ -656,10 +656,12 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // BaseAgent - meta = BEHAVIAC_NEW AgentMeta(2894270053u); + meta = BEHAVIAC_NEW AgentMeta(3136667403u); AgentMeta::GetAgentMetas()[2774251291u] = meta; + meta->RegisterMethod(1352812660u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_BaseAgent_AbortCoroutine)); meta->RegisterMethod(3678294814u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_BaseAgent_CoTest)); meta->RegisterMethod(4105647783u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_BaseAgent_CoTest1)); + meta->RegisterMethod(1811924796u, BEHAVIAC_NEW CAgentMethod_1< int, int >(FunctionPointer_BaseAgent_DeltaTime)); 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)); @@ -674,10 +676,12 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // RoomAgent - meta = BEHAVIAC_NEW AgentMeta(1522634945u); + meta = BEHAVIAC_NEW AgentMeta(58746172u); AgentMeta::GetAgentMetas()[1389135714u] = meta; + meta->RegisterMethod(1352812660u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_RoomAgent_AbortCoroutine)); meta->RegisterMethod(3678294814u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_RoomAgent_CoTest)); meta->RegisterMethod(4105647783u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_RoomAgent_CoTest1)); + meta->RegisterMethod(1811924796u, BEHAVIAC_NEW CAgentMethod_1< int, int >(FunctionPointer_RoomAgent_DeltaTime)); meta->RegisterMethod(3968206693u, BEHAVIAC_NEW CAgentMethod_1< HeroAgent*, int >(FunctionPointer_RoomAgent_FindHero)); meta->RegisterMethod(847579834u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_RoomAgent_GetAliveHumanNum)); meta->RegisterMethod(3609862701u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_RoomAgent_GetAlivePlayerNum)); @@ -714,12 +718,14 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // TargetAgent - meta = BEHAVIAC_NEW AgentMeta(4266546950u); + meta = BEHAVIAC_NEW AgentMeta(1972716360u); AgentMeta::GetAgentMetas()[498664641u] = meta; meta->RegisterMethod(347903289u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_TargetAgent_Abandon)); + meta->RegisterMethod(1352812660u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_TargetAgent_AbortCoroutine)); meta->RegisterMethod(97826769u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_TargetAgent_ClearAbandon)); meta->RegisterMethod(3678294814u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_TargetAgent_CoTest)); meta->RegisterMethod(4105647783u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_TargetAgent_CoTest1)); + meta->RegisterMethod(1811924796u, BEHAVIAC_NEW CAgentMethod_1< int, int >(FunctionPointer_TargetAgent_DeltaTime)); meta->RegisterMethod(2524021140u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_TargetAgent_GetHeroId)); meta->RegisterMethod(3358849663u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_TargetAgent_GetHp)); meta->RegisterMethod(3597666367u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_TargetAgent_GetHPRate)); @@ -743,7 +749,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // HeroAgent - meta = BEHAVIAC_NEW AgentMeta(1099894105u); + meta = BEHAVIAC_NEW AgentMeta(4036110465u); 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)); @@ -772,6 +778,7 @@ namespace behaviac meta->RegisterMemberProperty(2693987492u, BEHAVIAC_NEW CMemberProperty< float >("tmp_val3", Set_HeroAgent_tmp_val3, Get_HeroAgent_tmp_val3)); meta->RegisterMemberProperty(4023609955u, BEHAVIAC_NEW CMemberProperty< float >("tmp_val4", Set_HeroAgent_tmp_val4, Get_HeroAgent_tmp_val4)); meta->RegisterMethod(1724035246u, BEHAVIAC_NEW CAgentMethodVoid_2>(FunctionPointer_HeroAgent_Abort)); + meta->RegisterMethod(1352812660u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_AbortCoroutine)); meta->RegisterMethod(3724946699u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_BattleMove) /* BattleMove */); meta->RegisterMethod(113953652u, BEHAVIAC_NEW CMethod_HeroAgent_CalcDistance()); meta->RegisterMethod(896336728u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_CanShot)); @@ -795,6 +802,7 @@ namespace behaviac meta->RegisterMethod(1915544693u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_HeroAgent_CoUseSkill)); meta->RegisterMethod(3130174326u, BEHAVIAC_NEW CAgentMethod_4< behaviac::EBTStatus, behaviac::string, int, int, int >(FunctionPointer_HeroAgent_DebugOut)); meta->RegisterMethod(961264360u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_HeroAgent_DecV)); + meta->RegisterMethod(1811924796u, BEHAVIAC_NEW CAgentMethod_1< int, int >(FunctionPointer_HeroAgent_DeltaTime)); meta->RegisterMethod(3850832265u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_HeroAgent_FollowMaster) /* FollowMaster */); meta->RegisterMethod(3395125024u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetAgentType)); meta->RegisterMethod(1962280222u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetAliveEnemyNum)); @@ -887,7 +895,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // AndroidAgent - meta = BEHAVIAC_NEW AgentMeta(858811612u); + meta = BEHAVIAC_NEW AgentMeta(1935904622u); 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)); @@ -916,6 +924,7 @@ namespace behaviac meta->RegisterMemberProperty(2693987492u, BEHAVIAC_NEW CMemberProperty< float >("tmp_val3", Set_HeroAgent_tmp_val3, Get_HeroAgent_tmp_val3)); meta->RegisterMemberProperty(4023609955u, BEHAVIAC_NEW CMemberProperty< float >("tmp_val4", Set_HeroAgent_tmp_val4, Get_HeroAgent_tmp_val4)); meta->RegisterMethod(1724035246u, BEHAVIAC_NEW CAgentMethodVoid_2>(FunctionPointer_AndroidAgent_Abort)); + meta->RegisterMethod(1352812660u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_AbortCoroutine)); meta->RegisterMethod(3724946699u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_BattleMove) /* BattleMove */); meta->RegisterMethod(113953652u, BEHAVIAC_NEW CMethod_HeroAgent_CalcDistance()); meta->RegisterMethod(896336728u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_CanShot)); @@ -939,6 +948,7 @@ namespace behaviac meta->RegisterMethod(1915544693u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_AndroidAgent_CoUseSkill)); meta->RegisterMethod(3130174326u, BEHAVIAC_NEW CAgentMethod_4< behaviac::EBTStatus, behaviac::string, int, int, int >(FunctionPointer_AndroidAgent_DebugOut)); meta->RegisterMethod(961264360u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_AndroidAgent_DecV)); + meta->RegisterMethod(1811924796u, BEHAVIAC_NEW CAgentMethod_1< int, int >(FunctionPointer_AndroidAgent_DeltaTime)); meta->RegisterMethod(3850832265u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_AndroidAgent_FollowMaster) /* FollowMaster */); meta->RegisterMethod(397371422u, BEHAVIAC_NEW CAgentMethod< behaviac::string >(FunctionPointer_AndroidAgent_GetAccountId)); meta->RegisterMethod(3395125024u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetAgentType)); @@ -1032,10 +1042,12 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // MasterAgent - meta = BEHAVIAC_NEW AgentMeta(726162439u); + meta = BEHAVIAC_NEW AgentMeta(548168515u); AgentMeta::GetAgentMetas()[2505569052u] = meta; + meta->RegisterMethod(1352812660u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_MasterAgent_AbortCoroutine)); meta->RegisterMethod(3678294814u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_MasterAgent_CoTest)); meta->RegisterMethod(4105647783u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_MasterAgent_CoTest1)); + meta->RegisterMethod(1811924796u, BEHAVIAC_NEW CAgentMethod_1< int, int >(FunctionPointer_MasterAgent_DeltaTime)); meta->RegisterMethod(2524021140u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_MasterAgent_GetHeroId)); meta->RegisterMethod(1572331229u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_MasterAgent_GetHP)); meta->RegisterMethod(3451565888u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_MasterAgent_GetLevel)); @@ -1069,6 +1081,7 @@ namespace behaviac AgentMeta::Register("BuffEffectType_e"); AgentMeta::Register("BtEvent_e"); AgentMeta::Register("GasMode_e"); + AgentMeta::Register("CoId_e"); AgentMeta::Register("glm::vec3"); return true; @@ -1088,6 +1101,7 @@ namespace behaviac AgentMeta::UnRegister("BuffEffectType_e"); AgentMeta::UnRegister("BtEvent_e"); AgentMeta::UnRegister("GasMode_e"); + AgentMeta::UnRegister("CoId_e"); AgentMeta::UnRegister("glm::vec3"); return true; 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 5dcc8362..58e57e55 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 @@ -16,8 +16,10 @@ namespace behaviac // --------------------------------------------------------------------- inline void FunctionPointer_behaviac_Agent_LogMessage(char* param0) { behaviac::Agent::LogMessage(param0); } + inline void FunctionPointer_BaseAgent_AbortCoroutine(Agent* self, CoId_e co_id) { ((BaseAgent*)self)->_Execute_Method_(co_id); } inline behaviac::EBTStatus FunctionPointer_BaseAgent_CoTest(Agent* self, int time) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(time); } inline behaviac::EBTStatus FunctionPointer_BaseAgent_CoTest1(Agent* self, int time) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(time); } + inline int FunctionPointer_BaseAgent_DeltaTime(Agent* self, int time) { return ((BaseAgent*)self)->DeltaTime(time); } inline int FunctionPointer_BaseAgent_GetTickCount(Agent* self) { return ((BaseAgent*)self)->GetTickCount(); } inline bool FunctionPointer_BaseAgent_IsGameOver(Agent* self) { return ((BaseAgent*)self)->IsGameOver(); } inline void FunctionPointer_BaseAgent_LogMessage(char* param0) { BaseAgent::LogMessage(param0); } @@ -25,8 +27,10 @@ namespace behaviac 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 int FunctionPointer_BaseAgent_Test(Agent* self, int p1) { return (int)((BaseAgent*)self)->_Execute_Method_(p1); } + inline void FunctionPointer_RoomAgent_AbortCoroutine(Agent* self, CoId_e co_id) { ((BaseAgent*)self)->_Execute_Method_(co_id); } inline behaviac::EBTStatus FunctionPointer_RoomAgent_CoTest(Agent* self, int time) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(time); } inline behaviac::EBTStatus FunctionPointer_RoomAgent_CoTest1(Agent* self, int time) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(time); } + inline int FunctionPointer_RoomAgent_DeltaTime(Agent* self, int time) { return ((RoomAgent*)self)->DeltaTime(time); } 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(); } @@ -48,9 +52,11 @@ namespace behaviac inline int FunctionPointer_TeamAgent_GetPlayerNum(Agent* self) { return ((TeamAgent*)self)->GetPlayerNum(); } inline void FunctionPointer_TeamAgent_LogMessage(char* param0) { TeamAgent::LogMessage(param0); } inline void FunctionPointer_TargetAgent_Abandon(Agent* self, int min_time, int max_time) { ((TargetAgent*)self)->Abandon(min_time, max_time); } + inline void FunctionPointer_TargetAgent_AbortCoroutine(Agent* self, CoId_e co_id) { ((BaseAgent*)self)->_Execute_Method_(co_id); } inline void FunctionPointer_TargetAgent_ClearAbandon(Agent* self) { ((TargetAgent*)self)->ClearAbandon(); } inline behaviac::EBTStatus FunctionPointer_TargetAgent_CoTest(Agent* self, int time) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(time); } inline behaviac::EBTStatus FunctionPointer_TargetAgent_CoTest1(Agent* self, int time) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(time); } + inline int FunctionPointer_TargetAgent_DeltaTime(Agent* self, int time) { return ((TargetAgent*)self)->DeltaTime(time); } inline int FunctionPointer_TargetAgent_GetHeroId(Agent* self) { return ((TargetAgent*)self)->GetHeroId(); } inline float FunctionPointer_TargetAgent_GetHp(Agent* self) { return ((TargetAgent*)self)->GetHp(); } inline float FunctionPointer_TargetAgent_GetHPRate(Agent* self) { return ((TargetAgent*)self)->GetHPRate(); } @@ -147,6 +153,7 @@ namespace behaviac inline const void* Get_HeroAgent_tmp_val4(Agent* self) { return &((HeroAgent*)self)->tmp_val4; }; inline void FunctionPointer_HeroAgent_Abort(Agent* self, behaviac::string msg, behaviac::vector args) { ((HeroAgent*)self)->_Execute_Method_ >(msg, args); } + inline void FunctionPointer_HeroAgent_AbortCoroutine(Agent* self, CoId_e co_id) { ((BaseAgent*)self)->_Execute_Method_(co_id); } inline void FunctionPointer_HeroAgent_BattleMove(Agent* self, glm::vec3& loc_point0) { } /* BattleMove */ inline bool FunctionPointer_HeroAgent_CanShot(Agent* self) { return ((HeroAgent*)self)->CanShot(); } inline bool FunctionPointer_HeroAgent_CanUseSkill(Agent* self, int skill_id) { return ((HeroAgent*)self)->CanUseSkill(skill_id); } @@ -167,6 +174,7 @@ namespace behaviac inline behaviac::EBTStatus FunctionPointer_HeroAgent_CoUseSkill(Agent* self, int skill_id) { return (behaviac::EBTStatus)((HeroAgent*)self)->_Execute_Method_(skill_id); } inline behaviac::EBTStatus FunctionPointer_HeroAgent_DebugOut(Agent* self, behaviac::string msg, int arg0, int arg1, int arg2) { return ((HeroAgent*)self)->DebugOut(msg, arg0, arg1, arg2); } inline void FunctionPointer_HeroAgent_DecV(Agent* self, int id, int val) { ((HeroAgent*)self)->_Execute_Method_(id, val); } + inline int FunctionPointer_HeroAgent_DeltaTime(Agent* self, int time) { return ((HeroAgent*)self)->DeltaTime(time); } inline void FunctionPointer_HeroAgent_FollowMaster(Agent* self, glm::vec3& loc_point0, float loc_val0) { } /* FollowMaster */ inline int FunctionPointer_HeroAgent_GetAgentType(Agent* self) { return ((HeroAgent*)self)->GetAgentType(); } inline int FunctionPointer_HeroAgent_GetAliveEnemyNum(Agent* self) { return ((HeroAgent*)self)->GetAliveEnemyNum(); } @@ -249,6 +257,7 @@ namespace behaviac inline void FunctionPointer_HeroAgent_UseSkill30900(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* UseSkill30900 */ inline void FunctionPointer_HeroAgent_UseSkill31000(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* UseSkill31000 */ inline void FunctionPointer_AndroidAgent_Abort(Agent* self, behaviac::string msg, behaviac::vector args) { ((HeroAgent*)self)->_Execute_Method_ >(msg, args); } + inline void FunctionPointer_AndroidAgent_AbortCoroutine(Agent* self, CoId_e co_id) { ((BaseAgent*)self)->_Execute_Method_(co_id); } inline void FunctionPointer_AndroidAgent_BattleMove(Agent* self, glm::vec3& loc_point0) { } /* BattleMove */ inline bool FunctionPointer_AndroidAgent_CanShot(Agent* self) { return ((AndroidAgent*)self)->CanShot(); } inline bool FunctionPointer_AndroidAgent_CanUseSkill(Agent* self, int skill_id) { return ((AndroidAgent*)self)->CanUseSkill(skill_id); } @@ -269,6 +278,7 @@ namespace behaviac inline behaviac::EBTStatus FunctionPointer_AndroidAgent_CoUseSkill(Agent* self, int skill_id) { return (behaviac::EBTStatus)((HeroAgent*)self)->_Execute_Method_(skill_id); } inline behaviac::EBTStatus FunctionPointer_AndroidAgent_DebugOut(Agent* self, behaviac::string msg, int arg0, int arg1, int arg2) { return ((AndroidAgent*)self)->DebugOut(msg, arg0, arg1, arg2); } inline void FunctionPointer_AndroidAgent_DecV(Agent* self, int id, int val) { ((HeroAgent*)self)->_Execute_Method_(id, val); } + inline int FunctionPointer_AndroidAgent_DeltaTime(Agent* self, int time) { return ((AndroidAgent*)self)->DeltaTime(time); } inline void FunctionPointer_AndroidAgent_FollowMaster(Agent* self, glm::vec3& loc_point0, float loc_val0) { } /* FollowMaster */ inline behaviac::string FunctionPointer_AndroidAgent_GetAccountId(Agent* self) { return ((AndroidAgent*)self)->GetAccountId(); } inline int FunctionPointer_AndroidAgent_GetAgentType(Agent* self) { return ((AndroidAgent*)self)->GetAgentType(); } @@ -351,8 +361,10 @@ namespace behaviac inline void FunctionPointer_AndroidAgent_UseSkill30800(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* UseSkill30800 */ inline void FunctionPointer_AndroidAgent_UseSkill30900(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* UseSkill30900 */ inline void FunctionPointer_AndroidAgent_UseSkill31000(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* UseSkill31000 */ + inline void FunctionPointer_MasterAgent_AbortCoroutine(Agent* self, CoId_e co_id) { ((BaseAgent*)self)->_Execute_Method_(co_id); } inline behaviac::EBTStatus FunctionPointer_MasterAgent_CoTest(Agent* self, int time) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(time); } inline behaviac::EBTStatus FunctionPointer_MasterAgent_CoTest1(Agent* self, int time) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(time); } + inline int FunctionPointer_MasterAgent_DeltaTime(Agent* self, int time) { return ((MasterAgent*)self)->DeltaTime(time); } inline int FunctionPointer_MasterAgent_GetHeroId(Agent* self) { return ((MasterAgent*)self)->GetHeroId(); } inline float FunctionPointer_MasterAgent_GetHP(Agent* self) { return ((MasterAgent*)self)->GetHP(); } inline int FunctionPointer_MasterAgent_GetLevel(Agent* self) { return ((MasterAgent*)self)->GetLevel(); } diff --git a/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.cpp b/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.cpp index 40fa8540..0c275cd6 100644 --- a/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.cpp +++ b/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.cpp @@ -57,3 +57,12 @@ BEHAVIAC_BEGIN_ENUM_EX(GasMode_e, GasMode_e) } BEHAVIAC_END_ENUM_EX() +BEHAVIAC_BEGIN_ENUM_EX(CoId_e, CoId_e) +{ + BEHAVIAC_ENUMCLASS_DISPLAY_INFO_EX(L"CoId_e", L""); + + BEHAVIAC_ENUM_ITEM_EX(kCoFindPath, "kCoFindPath"); + BEHAVIAC_ENUM_ITEM_EX(kCoFindPathEx, "kCoFindPathEx"); +} +BEHAVIAC_END_ENUM_EX() + diff --git a/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.h b/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.h index 51760c56..ec5eb47a 100644 --- a/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.h +++ b/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.h @@ -27,6 +27,16 @@ DECLARE_BEHAVIAC_ENUM_EX(GasMode_e, GasMode_e); BEHAVIAC_DECLARE_TYPE_VECTOR_HANDLER(GasMode_e); +enum CoId_e +{ + kCoFindPath = 0, + kCoFindPathEx = 1, +}; + +DECLARE_BEHAVIAC_ENUM_EX(CoId_e, CoId_e); +BEHAVIAC_DECLARE_TYPE_VECTOR_HANDLER(CoId_e); + + // ------------------- // Customized structs // ------------------- diff --git a/server/bin/exported/meta/counterfire.meta.xml b/server/bin/exported/meta/counterfire.meta.xml index 5ce208bf..bc678e52 100644 --- a/server/bin/exported/meta/counterfire.meta.xml +++ b/server/bin/exported/meta/counterfire.meta.xml @@ -1,7 +1,7 @@ - - + + @@ -31,7 +31,7 @@ - + diff --git a/server/bin/exported/task/MobaMode.xml b/server/bin/exported/task/MobaMode.xml index 7cc4d4b3..85bb6743 100644 --- a/server/bin/exported/task/MobaMode.xml +++ b/server/bin/exported/task/MobaMode.xml @@ -27,53 +27,79 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/gameserver/base_agent.cc b/server/gameserver/base_agent.cc index e92a75fc..3bc2976c 100644 --- a/server/gameserver/base_agent.cc +++ b/server/gameserver/base_agent.cc @@ -166,3 +166,13 @@ behaviac::EBTStatus BaseAgent::CoTest(int time) }; return StartCoroutine(co); } + +int BaseAgent::DeltaTime(int time) +{ + return GetTickCount() - time; +} + +void BaseAgent::AbortCoroutine(int co_id) +{ + +} diff --git a/server/gameserver/base_agent.h b/server/gameserver/base_agent.h index 2640c3ef..beedb4e8 100644 --- a/server/gameserver/base_agent.h +++ b/server/gameserver/base_agent.h @@ -51,6 +51,8 @@ public: bool IsChiJiMode(); bool IsMobaMode(); int Test(int p1); + int DeltaTime(int time); + void AbortCoroutine(int co_id); virtual Room* GetRoom() = 0; behaviac::EBTStatus CoTest1(int time);