From 2f0183ba229044b9e196058bab7f314250292057 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 21 Aug 2024 11:14:04 +0800 Subject: [PATCH 1/3] 1 --- server/robotserver/android_agent.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/robotserver/android_agent.cc b/server/robotserver/android_agent.cc index a850a386..ad70c6ed 100644 --- a/server/robotserver/android_agent.cc +++ b/server/robotserver/android_agent.cc @@ -163,7 +163,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; }; From d5e7d8c3ca0dc320e8be024c7726eb52285977bc Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 21 Aug 2024 13:25:18 +0800 Subject: [PATCH 2/3] 1 --- server/robotserver/android_agent.cc | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/server/robotserver/android_agent.cc b/server/robotserver/android_agent.cc index ad70c6ed..2d91d6a2 100644 --- a/server/robotserver/android_agent.cc +++ b/server/robotserver/android_agent.cc @@ -200,11 +200,28 @@ behaviac::EBTStatus AndroidAgent::CoJoin() PRE_ENTER_COROUTINE(); cs::CMJoin msg; msg.set_server_id(6); - msg.set_team_uuid(""); + msg.set_team_uuid("ihCQQdNzoYFC^6q4ohsao39br%Ui!C9u2d^qvzek5hOB$3q1"); msg.set_account_id(owner_->GetAccountId()); - msg.set_proto_version(cs::ProtoVersion); - //weapons msg.set_session_id(owner_->GetSessionId()); + msg.set_proto_version(cs::ProtoVersion); + std::string payload_data = "ihCQQdNzoYFC^6q4ohsao39br%Ui!C9u2d^qvzek5hOB$3q1:|"; + { + auto xobj = a8::MutableXObject::CreateObject(); + auto team_list = a8::MutableXObject::CreateArray(); + { + auto member_list = a8::MutableXObject::CreateArray(); + + auto member = a8::MutableXObject::CreateObject(); + member->SetVal("account_id", owner_->GetAccountId()); + member->SetVal("session_id", owner_->GetSessionId()); + member_list->Push(*member.get()); + + team_list->SetVal("members", *member_list.get()); + } + xobj->SetVal("team_list", *team_list.get()); + payload_data += xobj->ToJsonStr(); + } + msg.set_payload_data(payload_data); owner_->SendMsg(msg); //a8::XPrintf("CoJoin %d\n", {owner_->GetSocketId()}); From 162a82befe4e65d1d402b884aa899ed505b8e92a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 21 Aug 2024 13:33:03 +0800 Subject: [PATCH 3/3] 1 --- server/robotserver/android_agent.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/robotserver/android_agent.cc b/server/robotserver/android_agent.cc index 2d91d6a2..305c3ccc 100644 --- a/server/robotserver/android_agent.cc +++ b/server/robotserver/android_agent.cc @@ -8,6 +8,7 @@ #include #include +#include #include "android_agent.h" #include "player.h" @@ -209,14 +210,17 @@ behaviac::EBTStatus AndroidAgent::CoJoin() auto xobj = a8::MutableXObject::CreateObject(); auto team_list = a8::MutableXObject::CreateArray(); { + auto team = a8::MutableXObject::CreateObject(); auto member_list = a8::MutableXObject::CreateArray(); - auto member = a8::MutableXObject::CreateObject(); member->SetVal("account_id", owner_->GetAccountId()); member->SetVal("session_id", owner_->GetSessionId()); member_list->Push(*member.get()); - team_list->SetVal("members", *member_list.get()); + team->SetVal("team_uuid", f8::App::Instance()->NewGlobalUuid()); + team->SetVal("members", *member_list.get()); + + team_list->Push(*team.get()); } xobj->SetVal("team_list", *team_list.get()); payload_data += xobj->ToJsonStr();