From b41e51cf0b493cd61ae847821020abcae76c9151 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 23 Jul 2020 16:49:29 +0800 Subject: [PATCH] 1 --- server/gameserver/aicomponent.h | 1 + server/gameserver/android.cc | 4 ---- server/gameserver/android.h | 9 ++------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/server/gameserver/aicomponent.h b/server/gameserver/aicomponent.h index 7789fec..fba3938 100644 --- a/server/gameserver/aicomponent.h +++ b/server/gameserver/aicomponent.h @@ -8,6 +8,7 @@ class AIComponent virtual ~AIComponent(); virtual void Update(int delta_time); + virtual float GetAttackRate() { return 0;}; void SetAiLevel(int ai_level); int GetAiLevel(); diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index 9e1de53..690fbb6 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -8,11 +8,7 @@ Android::Android():Human() { - #if 1 ai = new AndroidNewAI; - #else - ai = new AndroidAI; - #endif ai->owner = this; #if 0 ++PerfMonitor::Instance()->entity_num[ET_Android]; diff --git a/server/gameserver/android.h b/server/gameserver/android.h index cf6c092..1a5a3ea 100644 --- a/server/gameserver/android.h +++ b/server/gameserver/android.h @@ -7,16 +7,11 @@ namespace MetaData class Robot; } -class AndroidAI; -class AndroidNewAI; +class AIComponent; class Android : public Human { public: - #if 1 - AndroidNewAI* ai = nullptr; - #else - AndroidAI* ai = nullptr; - #endif + AIComponent* ai = nullptr; MetaData::Robot* robot_meta = nullptr; virtual ~Android() override;