1
This commit is contained in:
parent
05482d018b
commit
b915ae99bb
@ -2448,7 +2448,6 @@ void Human::NotifyObservers(cs::SMUpdate* msg, cs::MFActivePlayerData* active_pl
|
|||||||
if (observer != this && !observer->follow_synced_active_player) {
|
if (observer != this && !observer->follow_synced_active_player) {
|
||||||
msg->set_active_player_id(GetUniId());
|
msg->set_active_player_id(GetUniId());
|
||||||
FillMFActivePlayerData(msg->mutable_active_player_data());
|
FillMFActivePlayerData(msg->mutable_active_player_data());
|
||||||
msg->mutable_active_player_data()->set_name(GetName());
|
|
||||||
if (!refreshed_view) {
|
if (!refreshed_view) {
|
||||||
std::set<int> synced_objects;
|
std::set<int> synced_objects;
|
||||||
{
|
{
|
||||||
|
@ -1310,6 +1310,7 @@ void Player::AsyncRequestWatchWar(bool send_rsp_msg)
|
|||||||
cs::SMWatchWar respmsg;
|
cs::SMWatchWar respmsg;
|
||||||
Human* target = hum->room->GetWatchWarTarget(hum);
|
Human* target = hum->room->GetWatchWarTarget(hum);
|
||||||
if (target) {
|
if (target) {
|
||||||
|
respmsg.set_name(target->GetName());
|
||||||
hum->SendNotifyMsg(respmsg);
|
hum->SendNotifyMsg(respmsg);
|
||||||
hum->FollowTarget(target);
|
hum->FollowTarget(target);
|
||||||
target->StartRefreshViewTimer();
|
target->StartRefreshViewTimer();
|
||||||
|
@ -1071,6 +1071,7 @@ message SMWatchWar
|
|||||||
{
|
{
|
||||||
optional int32 error_code = 1 [default = 0]; //错误码 0:成功 1:失败
|
optional int32 error_code = 1 [default = 0]; //错误码 0:成功 1:失败
|
||||||
optional string error_msg = 2; //错误信息
|
optional string error_msg = 2; //错误信息
|
||||||
|
optional string name = 3; //昵称
|
||||||
}
|
}
|
||||||
|
|
||||||
//加入成功
|
//加入成功
|
||||||
|
Loading…
x
Reference in New Issue
Block a user