diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index 9b979371..06e15f02 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -62,9 +62,9 @@ aux_source_directory(../../third_party/recastnavigation/DetourTileCache/Source SRC_LIST ) -aux_source_directory(behaviac_generated/types/internal - SRC_LIST -) +#aux_source_directory(behaviac_generated/types/internal +# SRC_LIST +#) aux_source_directory(mtb SRC_LIST @@ -74,6 +74,10 @@ aux_source_directory(mt SRC_LIST ) +aux_source_directory(buff + SRC_LIST +) + execute_process( COMMAND touch -a cs_proto.pb.h COMMAND touch -a cs_proto.pb.cc diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index 3b8b7e46..2c6c2e7c 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -17,21 +17,27 @@ Android::Android():Human() #if 0 ++PerfMonitor::Instance()->entity_num[ET_Android]; #endif + #if 0 agent_ = behaviac::Agent::Create(); if (!agent_) { abort(); } + #endif + #if 0 agent_->SetOwner(this); f8::BtMgr::Instance()->BtLoad(agent_, "android_pvp"); f8::BtMgr::Instance()->BtSetCurrent(agent_, "android_pvp"); + #endif } Android::~Android() { + #if 0 if (agent_) { f8::BtMgr::Instance()->BtDestory(agent_); agent_ = nullptr; } + #endif #if 0 --PerfMonitor::Instance()->entity_num[ET_Android]; #endif @@ -107,7 +113,9 @@ void Android::InternalUpdate(int delta_time) #endif Global::Instance()->verify_set_pos = 0; } + #if 0 agent_->Exec(); + #endif } void Android::GiveEquip() diff --git a/server/gameserver/android_agent.cc b/server/gameserver/android_agent.cc index 0eee8a7e..10794dcf 100644 --- a/server/gameserver/android_agent.cc +++ b/server/gameserver/android_agent.cc @@ -1,5 +1,5 @@ #include "precompile.h" - +#if 0 #include "android_agent.h" #include "android.h" #include "room.h" @@ -306,3 +306,4 @@ behaviac::EBTStatus AndroidAgent::DoPursuit() "CoPursuit" ); } +#endif diff --git a/server/gameserver/android_agent.h b/server/gameserver/android_agent.h index dc5cfa5f..472ca898 100644 --- a/server/gameserver/android_agent.h +++ b/server/gameserver/android_agent.h @@ -1,7 +1,7 @@ #pragma once #include "base_agent.h" - +#if 0 class Android; class AndroidAgent : public BaseAgent { @@ -23,3 +23,4 @@ public: private: Android* owner_ = nullptr; }; +#endif diff --git a/server/gameserver/base_agent.cc b/server/gameserver/base_agent.cc index fc5d4054..7d848dbd 100644 --- a/server/gameserver/base_agent.cc +++ b/server/gameserver/base_agent.cc @@ -1,5 +1,5 @@ #include "precompile.h" - +#if 0 #include "base_agent.h" #include "room.h" #include "creature.h" @@ -173,3 +173,4 @@ behaviac::EBTStatus BaseAgent::CoAttackTarget(int target_id) "CoAttackTarget" ); } +#endif diff --git a/server/gameserver/base_agent.h b/server/gameserver/base_agent.h index a2eb9e41..a25ee1f5 100644 --- a/server/gameserver/base_agent.h +++ b/server/gameserver/base_agent.h @@ -1,5 +1,6 @@ #pragma once +#if 0 #include "behaviac/behaviac.h" #include "behaviac_customized_types.h" @@ -43,3 +44,4 @@ protected: private: Creature* owner_ = nullptr; }; +#endif