From c9365d1f6997bfe5fd619d4ec712dab49dec46cb Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 8 Dec 2023 15:20:17 +0800 Subject: [PATCH 1/2] 1 --- server/gameserver/framemaker.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc index c8d5cb30..21df349e 100644 --- a/server/gameserver/framemaker.cc +++ b/server/gameserver/framemaker.cc @@ -319,9 +319,11 @@ void FrameMaker::SerializeShots(cs::SMUpdate* msg, Room* room, Human* hum, Frame if (idx < room->frame_event_data->shots_.size()) { auto& tuple = room->frame_event_data->shots_[idx]; if (std::get<0>(tuple).Get() && hum->CanSee(std::get<0>(tuple).Get())) { +#if 0 if (std::get<0>(tuple).Get()->IsPlayer()) { a8::XPrintf("player shot\n", {}); } +#endif *msg->add_shots() = std::get<1>(tuple); } else { #ifdef MYDEBUG1 From dc2502105ce83d3660be10090360c937c96e6214 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 8 Dec 2023 19:04:16 +0800 Subject: [PATCH 2/2] 1 --- server/robotserver/android_agent.cc | 35 ++++++++++++++++++----------- server/robotserver/android_agent.h | 1 + server/robotserver/httpproxy.cc | 10 +++++++-- server/robotserver/player.cc | 11 ++++----- server/robotserver/playermgr.cc | 4 ++-- 5 files changed, 39 insertions(+), 22 deletions(-) diff --git a/server/robotserver/android_agent.cc b/server/robotserver/android_agent.cc index c3a77707..548d4a17 100644 --- a/server/robotserver/android_agent.cc +++ b/server/robotserver/android_agent.cc @@ -73,7 +73,9 @@ behaviac::EBTStatus AndroidAgent::CoLogin() ( [context] (bool ok, a8::XObject* rsp_obj, f8::HttpContext* ctx) { +#if 0 a8::XPrintf("data:%s\n", {rsp_obj->ToJsonStr()}); +#endif if (ok) { std::string account_id = rsp_obj->At("account_id")->AsXValue().GetString(); std::string session_id = rsp_obj->At("session_id")->AsXValue().GetString(); @@ -90,7 +92,9 @@ behaviac::EBTStatus AndroidAgent::CoLogin() ( [context] (bool ok, a8::XObject* rsp_obj, f8::HttpContext* ctx) { +#if 0 a8::XPrintf("data:%s\n", {rsp_obj->ToJsonStr()}); +#endif if (ok) { context->login_ok = true; } else { @@ -146,7 +150,7 @@ behaviac::EBTStatus AndroidAgent::CoConnectBattleServer() owner_->GetWebSocket()->on_connect = [this, context] (a8::WebSocketClient* ) { - a8::XPrintf("id:%d WebSocketClient on_connect\n", {context->socket_id}); + //a8::XPrintf("id:%d WebSocketClient on_connect\n", {context->socket_id}); context->pending = false; context->connect_ok = true; }; @@ -191,7 +195,7 @@ behaviac::EBTStatus AndroidAgent::CoJoin() msg.set_session_id(owner_->GetSessionId()); owner_->SendMsg(msg); - a8::XPrintf("CoJoin %d\n", {owner_->GetSocketId()}); + //a8::XPrintf("CoJoin %d\n", {owner_->GetSocketId()}); auto context = MAKE_BTCONTEXT ( ); @@ -223,18 +227,23 @@ behaviac::EBTStatus AndroidAgent::CoUpdateGame() GlmHelper::RotateY(curr_dir_, a8::RandAngle()); last_dir_tick_ = a8::XGetTickCount(); } - { - cs::CMMove msg; - ToPb(curr_dir_, msg.mutable_move_dir()); - ToPb(curr_dir_, msg.mutable_attack_dir()); - msg.set_shot_start(1); - msg.set_shot_hold(1); - owner_->SendMsg(msg); - } - { - cs::CMPing msg; - owner_->SendMsg(msg); + if (a8::XGetTickCount() - last_send_tick_ > 80) { + last_send_tick_ = a8::XGetTickCount(); + { + cs::CMMove msg; + ToPb(curr_dir_, msg.mutable_move_dir()); + ToPb(curr_dir_, msg.mutable_attack_dir()); + msg.set_shot_start(1); + msg.set_shot_hold(1); + owner_->SendMsg(msg); + } + { + cs::CMPing msg; + owner_->SendMsg(msg); + } } + } else { + a8::XPrintf("disconnect\n", {}); } #endif return behaviac::BT_SUCCESS; diff --git a/server/robotserver/android_agent.h b/server/robotserver/android_agent.h index 4b553fca..37320139 100644 --- a/server/robotserver/android_agent.h +++ b/server/robotserver/android_agent.h @@ -41,5 +41,6 @@ private: std::shared_ptr owner_; glm::vec3 curr_dir_ = glm::vec3(0.0f, 0.0f, 0.0f); long long last_dir_tick_ = 0; + long long last_send_tick_ = 0; }; diff --git a/server/robotserver/httpproxy.cc b/server/robotserver/httpproxy.cc index 03479ca7..f031bf3f 100644 --- a/server/robotserver/httpproxy.cc +++ b/server/robotserver/httpproxy.cc @@ -65,11 +65,13 @@ protected: static void _ProxyCallback(std::shared_ptr request) { #ifdef MYDEBUG + #if 0 f8::UdpLog::Instance()->Debug("ProxyCallbBack request:%s", { request->GetParams()->ToJsonStr() }); #endif + #endif std::string seq_id = request->GetParams()->Get("seq_id"); std::shared_ptr req = HttpProxy::Instance()->GetRequest(seq_id); if (req) { @@ -126,12 +128,14 @@ std::string HttpProxy::HttpGet( proxy_url_params->SetVal("cb_url", a8::Format("http://%s:%d/webapp/index.php?c=Proxy&a=callback", { - "192.168.100.39", + //"192.168.100.39", + "127.0.0.1", 3333 //JsonDataMgr::Instance()->ip, //JsonDataMgr::Instance()->listen_port })); - std::string proxy_url = "http://192.168.100.21:8321/webapp/index.php?c=Proxy&a=get"; + //std::string proxy_url = "http://192.168.100.21:8321/webapp/index.php?c=Proxy&a=get"; + std::string proxy_url = "http://127.0.0.1:8321/webapp/index.php?c=Proxy&a=get"; //JsonDataMgr::Instance()->GetHttpProxyUrl(proxy_url); f8::HttpClientPool::Instance()->HttpGet ( @@ -140,12 +144,14 @@ std::string HttpProxy::HttpGet( long long cost_time = a8::XGetTickCount() - request->add_tick; if (ok) { #ifdef MYDEBUG + #if 0 f8::UdpLog::Instance()->Debug("ProxyHttpGet ok cost_time:%d url:%s params:%s", { cost_time, request->url, request->url_params.ToJsonStr(), }); + #endif #endif } else { f8::UdpLog::Instance()->Warning("ProxyHttpGet error cost_time:%d url:%s params:%s response:%s", diff --git a/server/robotserver/player.cc b/server/robotserver/player.cc index 48f85b05..f9e98864 100644 --- a/server/robotserver/player.cc +++ b/server/robotserver/player.cc @@ -39,7 +39,8 @@ void Player::Init(int idx, const std::string& account_id) IoMgr::Instance()->GetIoContext(0), //"192.168.100.45", //7601 - "192.144.200.110", + //"192.144.200.110", + "127.0.0.1", 7601 ); web_socket_->on_decode_userpacket = @@ -135,13 +136,13 @@ void Player::_SMMatchCancel(f8::MsgHdr* hdr, const cs::SMMatchCancel& msg) void Player::_SMJoinedNotify(f8::MsgHdr* hdr, const cs::SMJoinedNotify& msg) { - f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)}); + //f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)}); join_ok_ = true; } void Player::_SMMapInfo(f8::MsgHdr* hdr, const cs::SMMapInfo& msg) { - f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)}); + //f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)}); } void Player::_SMUpdate(f8::MsgHdr* hdr, const cs::SMUpdate& msg) @@ -151,7 +152,7 @@ void Player::_SMUpdate(f8::MsgHdr* hdr, const cs::SMUpdate& msg) void Player::_SMRollMsg(f8::MsgHdr* hdr, const cs::SMRollMsg& msg) { - f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)}); + //f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)}); } void Player::_SMVoiceNotify(f8::MsgHdr* hdr, const cs::SMVoiceNotify& msg) @@ -167,7 +168,7 @@ void Player::_SMDisconnectNotify(f8::MsgHdr* hdr, const cs::SMDisconnectNotify& void Player::_SMGameOver(f8::MsgHdr* hdr, const cs::SMGameOver& msg) { GetWebSocket()->Close(); - f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)}); + //f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)}); } void Player::_SMDebugMsg(f8::MsgHdr* hdr, const cs::SMDebugMsg& msg) diff --git a/server/robotserver/playermgr.cc b/server/robotserver/playermgr.cc index 2d199d22..74d13cd7 100644 --- a/server/robotserver/playermgr.cc +++ b/server/robotserver/playermgr.cc @@ -31,7 +31,7 @@ void PlayerMgr::Init() int count = 0; f8::Timer::Instance()->SetInterval ( - 3000, + 200, [this, count] (int et, const a8::Args* args) mutable { if (et == a8::TIMER_EXEC_EVENT) { @@ -42,7 +42,7 @@ void PlayerMgr::Init() account_id_hash_[hum->GetAccountId()] = hum; socket_id_hash_[hum->GetSocketId()] = hum; ++count; - if (count >= 200) { + if (count >= 2000) { f8::Timer::Instance()->DeleteCurrentTimer(); } }