From 77518da3791ae62b9587af62e5024d0b0e68e8e4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 29 Jun 2023 20:10:05 +0800 Subject: [PATCH] 1 --- .../internal/behaviac_agent_member_visitor.h | 6 ------ .../types/internal/behaviac_agent_meta.cpp | 7 ++----- .../types/internal/behaviac_agent_meta.h | 1 - .../types/internal/behaviac_customized_types.cpp | 15 --------------- .../types/internal/behaviac_customized_types.h | 16 ---------------- server/bin/exported/boss_40101.xml | 8 +++----- server/bin/exported/meta/game2006.meta.xml | 4 ++-- server/gameserver/android_agent.cc | 9 --------- server/gameserver/android_agent.h | 1 - 9 files changed, 7 insertions(+), 60 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 7731b6d4..cb00bd8b 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 @@ -89,12 +89,6 @@ template<> inline behaviac::EBTStatus AndroidAgent::_Execute_Method_AndroidAgent::DoRandomShot(); } -struct METHOD_TYPE_AndroidAgent_GetState { }; -template<> inline State_e AndroidAgent::_Execute_Method_() -{ - return this->AndroidAgent::GetState(); -} - struct METHOD_TYPE_HeroAgent_DoAttack { }; template<> inline behaviac::EBTStatus HeroAgent::_Execute_Method_() 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 f1b792b8..f30a4f4c 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 @@ -373,7 +373,7 @@ namespace behaviac virtual bool load() { - AgentMeta::SetTotalSignature(1804086084u); + AgentMeta::SetTotalSignature(4008517491u); AgentMeta* meta = NULL; BEHAVIAC_UNUSED_VAR(meta); @@ -438,7 +438,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // AndroidAgent - meta = BEHAVIAC_NEW AgentMeta(1745853881u); + meta = BEHAVIAC_NEW AgentMeta(43777759u); AgentMeta::GetAgentMetas()[2475098143u] = meta; meta->RegisterCustomizedProperty(2916366392u, BEHAVIAC_NEW CCustomizedProperty< int >(2916366392u, "find_enemy_target_uniid", "0")); meta->RegisterCustomizedProperty(2276820502u, BEHAVIAC_NEW CCustomizedProperty< int >(2276820502u, "selected_skill_id", "0")); @@ -466,7 +466,6 @@ namespace behaviac meta->RegisterMethod(2424678062u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetFindEnemyResultTargetUniId)); meta->RegisterMethod(3533946671u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_AndroidAgent_GetPos)); meta->RegisterMethod(1369696888u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_AndroidAgent_GetSafeAreaRadius)); - meta->RegisterMethod(1666360340u, BEHAVIAC_NEW CAgentMethod< State_e >(FunctionPointer_AndroidAgent_GetState)); meta->RegisterMethod(3603629747u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_AndroidAgent_HasBuffEffect)); meta->RegisterMethod(3047011226u, BEHAVIAC_NEW CAgentMethod_1< bool, float >(FunctionPointer_AndroidAgent_HasTarget)); meta->RegisterMethod(3929552993u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_IsCrazeMode)); @@ -543,7 +542,6 @@ namespace behaviac AgentMeta::Register("BaseAgent"); AgentMeta::Register("AndroidAgent"); AgentMeta::Register("HeroAgent"); - AgentMeta::Register("State_e"); AgentMeta::Register("glm::vec3"); return true; @@ -555,7 +553,6 @@ namespace behaviac AgentMeta::UnRegister("BaseAgent"); AgentMeta::UnRegister("AndroidAgent"); AgentMeta::UnRegister("HeroAgent"); - AgentMeta::UnRegister("State_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 70f5c193..d344e731 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 @@ -76,7 +76,6 @@ namespace behaviac inline int FunctionPointer_AndroidAgent_GetFindEnemyResultTargetUniId(Agent* self) { return ((AndroidAgent*)self)->GetFindEnemyResultTargetUniId(); } inline glm::vec3 FunctionPointer_AndroidAgent_GetPos(Agent* self) { return (glm::vec3)((BaseAgent*)self)->_Execute_Method_(); } inline float FunctionPointer_AndroidAgent_GetSafeAreaRadius(Agent* self) { return ((AndroidAgent*)self)->GetSafeAreaRadius(); } - inline State_e FunctionPointer_AndroidAgent_GetState(Agent* self) { return (State_e)((AndroidAgent*)self)->_Execute_Method_(); } inline bool FunctionPointer_AndroidAgent_HasBuffEffect(Agent* self, int buff_effect) { return (bool)((BaseAgent*)self)->_Execute_Method_(buff_effect); } inline bool FunctionPointer_AndroidAgent_HasTarget(Agent* self, float range) { return (bool)((BaseAgent*)self)->_Execute_Method_(range); } inline bool FunctionPointer_AndroidAgent_IsCrazeMode(Agent* self) { return ((AndroidAgent*)self)->IsCrazeMode(); } 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 192e9a78..753e892d 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 @@ -4,18 +4,3 @@ #include "../behaviac_types.h" -// ------------------- -// Customized enums -// ------------------- - -BEHAVIAC_BEGIN_ENUM_EX(State_e, State_e) -{ - BEHAVIAC_ENUMCLASS_DISPLAY_INFO_EX(L"State_e", L""); - - BEHAVIAC_ENUM_ITEM_EX(kPreBattle, "kPreBattle"); - BEHAVIAC_ENUM_ITEM_EX(kFly, "kFly"); - BEHAVIAC_ENUM_ITEM_EX(kJump, "kJump"); - BEHAVIAC_ENUM_ITEM_EX(kBattling, "kBattling"); -} -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 d390a5a0..d0f55932 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 @@ -7,22 +7,6 @@ #include "behaviac/agent/agent.h" -// ------------------- -// Customized enums -// ------------------- - -enum State_e -{ - kPreBattle = 1, - kFly = 2, - kJump = 3, - kBattling = 4, -}; - -DECLARE_BEHAVIAC_ENUM_EX(State_e, State_e); -BEHAVIAC_DECLARE_TYPE_VECTOR_HANDLER(State_e); - - // ------------------- // Customized structs // ------------------- diff --git a/server/bin/exported/boss_40101.xml b/server/bin/exported/boss_40101.xml index 3361240c..87c83f84 100644 --- a/server/bin/exported/boss_40101.xml +++ b/server/bin/exported/boss_40101.xml @@ -3,11 +3,9 @@ - - - - - + + + diff --git a/server/bin/exported/meta/game2006.meta.xml b/server/bin/exported/meta/game2006.meta.xml index 36bf13eb..a11f7af2 100644 --- a/server/bin/exported/meta/game2006.meta.xml +++ b/server/bin/exported/meta/game2006.meta.xml @@ -1,13 +1,13 @@ - + - + diff --git a/server/gameserver/android_agent.cc b/server/gameserver/android_agent.cc index 9fbab25b..66ffee10 100644 --- a/server/gameserver/android_agent.cc +++ b/server/gameserver/android_agent.cc @@ -25,15 +25,6 @@ AndroidAgent::~AndroidAgent() { } -State_e AndroidAgent::GetState() -{ -#ifdef DEBUG1 - a8::XPrintf("GetState\n", {}); -#endif - return kPreBattle; -} - - glm::vec3& AndroidAgent::AdjustShotDir(glm::vec3& shot_dir) { if (GetOwner()->IsAndroid()) { diff --git a/server/gameserver/android_agent.h b/server/gameserver/android_agent.h index a0e68241..729738f9 100644 --- a/server/gameserver/android_agent.h +++ b/server/gameserver/android_agent.h @@ -12,7 +12,6 @@ public: BEHAVIAC_DECLARE_AGENTTYPE(AndroidAgent, BaseAgent) - State_e GetState(); bool IsCrazeMode(); bool IsCrazeModePrepareMode();