diff --git a/server/robotserver/android_agent.cc b/server/robotserver/android_agent.cc new file mode 100644 index 00000000..9baa4582 --- /dev/null +++ b/server/robotserver/android_agent.cc @@ -0,0 +1,13 @@ +#include "precompile.h" + +#include + +#include "android_agent.h" + +AndroidAgent::AndroidAgent() +{ +} + +AndroidAgent::~AndroidAgent() +{ +} diff --git a/server/robotserver/android_agent.h b/server/robotserver/android_agent.h new file mode 100644 index 00000000..de3701d7 --- /dev/null +++ b/server/robotserver/android_agent.h @@ -0,0 +1,26 @@ +#pragma once + +#include "base_agent.h" + +namespace a8 +{ + template + static auto SpToWp(std::shared_ptr sp) + { + return std::weak_ptr(sp); + } +} + +class AndroidAgent +{ +public: + AndroidAgent(); + + //virtual ~AndroidAgent() override; + ~AndroidAgent(); + + //BEHAVIAC_DECLARE_AGENTTYPE(AndroidAgent, BaseAgent) + +public: + +}; diff --git a/server/robotserver/base_agent.cc b/server/robotserver/base_agent.cc index fd0a694a..b037c773 100644 --- a/server/robotserver/base_agent.cc +++ b/server/robotserver/base_agent.cc @@ -1,3 +1,4 @@ +#if 0 #include "precompile.h" #include "base_agent.h" @@ -197,3 +198,4 @@ void BaseAgent::AbortCoroutine(int co_id) } } } +#endif diff --git a/server/robotserver/btcoroutine.cc b/server/robotserver/btcoroutine.cc index 8c9c161f..68934c30 100644 --- a/server/robotserver/btcoroutine.cc +++ b/server/robotserver/btcoroutine.cc @@ -1,5 +1,5 @@ #include "precompile.h" - +#if 0 #include "btcoroutine.h" #include "base_agent.h" #include "btcontext.h" @@ -22,3 +22,4 @@ void BtCoroutine::Abort(long long frameno) is_abort_ = true; abort_frameno = frameno; } +#endif diff --git a/server/robotserver/btevent.cc b/server/robotserver/btevent.cc index 7b052167..bf85be3a 100644 --- a/server/robotserver/btevent.cc +++ b/server/robotserver/btevent.cc @@ -1,5 +1,5 @@ #include "precompile.h" - +#if 0 #include "btevent.h" #include "creature.h" #include "trigger.h" @@ -40,3 +40,4 @@ void BtEvent::FireEvent(BaseAgent* agent) break; } } +#endif diff --git a/server/robotserver/player.cc b/server/robotserver/player.cc index c4b27fb8..c249de91 100644 --- a/server/robotserver/player.cc +++ b/server/robotserver/player.cc @@ -15,14 +15,12 @@ void Player::Update() } -void Player::Init(int idx, - const std::string& account_id, - const std::string& session_id, - std::shared_ptr socket) +void Player::Init(int idx, const std::string& account_id) { + std::shared_ptr socket; socket_handle_ = idx; account_id_ = account_id; - session_id_ = session_id; + //session_id_ = session_id; web_socket_ = socket; web_socket_->on_error = [this] (a8::WebSocketClient*,int err_code) diff --git a/server/robotserver/player.h b/server/robotserver/player.h index 8a3fda74..143dd0b6 100644 --- a/server/robotserver/player.h +++ b/server/robotserver/player.h @@ -17,10 +17,7 @@ public: void Update(); - void Init(int idx, - const std::string& account_id, - const std::string& session_id, - std::shared_ptr socket); + void Init(int idx, const std::string& account_id); template void SendMsg(T& msg) {