From 2eeab08a8e1d8bb28d7b2a875216466b104ae8fd Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 3 Sep 2019 13:44:20 +0800 Subject: [PATCH 1/4] scene msg --- protos/CommonProto.proto | 6 ++++++ protos/SceneFight.proto | 1 + 2 files changed, 7 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 8ee2094..dcf5777 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -454,6 +454,11 @@ option optimize_for = SPEED; optional int32 heroTid = 4; } + message SceneMsg{ + optional int32 time = 1 ;//发生时间 + optional string msg = 2 ;// 场景消息 + } + //地图点散落的矿石信息 message PosMineral{ optional int32 pos = 1;// 坐标点 @@ -488,6 +493,7 @@ option optimize_for = SPEED; repeated ActorEffectBufferInfo actorEffectBufferInfo =4;//场景中所有buffer信息 repeated int32 barrierPoint = 5 ;// 阻挡点 repeated PosMineral posMineral = 6;// 散落的矿石信息 + repeated SceneMsg sceneMsg = 7; // 场景消息 } diff --git a/protos/SceneFight.proto b/protos/SceneFight.proto index 7b9f3ce..0d88d04 100644 --- a/protos/SceneFight.proto +++ b/protos/SceneFight.proto @@ -29,6 +29,7 @@ message BroadMsgIndication{ repeated int32 removeActorId = 4 ;//演员被移除 repeated int32 removePosMineralId=5; // 被删除的地图路径矿物信息 repeated PosMineral PosMineral = 6; //路径矿物信息变更 + repeated SceneMsg sceneMsg = 7; // 场景消息 } message SceneEndIndication{ From d5c648b3ab064fe6093cbba839a727540d3d219f Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 3 Sep 2019 14:38:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 6 ++++++ protos/MessageTypeProto.proto | 6 ++++++ protos/PlayerInfoProto.proto | 27 +++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 8ee2094..deb7d7f 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -620,4 +620,10 @@ option optimize_for = SPEED; message StrongerInfo{ optional int32 curScore = 1; optional int32 maxScore = 2; + } + + message QuestionOptions{ + optional string content = 1; //问题描述 + optional int32 type = 2; //单选0 多选1 填空2 + repeated string options =3;//选项描述 } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 30fa9f5..244bd7a 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -358,6 +358,8 @@ enum MessageType{ GET_PHONE_REWARD_REQUEST = 1664;//获取绑定手机号奖励 GET_PHONE_REWARD_RESPONSE = 1665; + GET_QUESTION_REWARD_REQUEST = 1666;//问卷 + GET_QUESTION_REWARD_RESPONSE = 1667; // H 10700 HERO_RAND_REQQUEST = 10701; @@ -441,6 +443,7 @@ enum MessageType{ PLAYER_BACKCINFO_INDICATION = 11504;//客服平台推送 // Q 11600 + QUESTION_INDICATION = 11600;//问卷推送 // R 11700 RECONNECT_REQUEST = 11700; //重连请求 RECONNECT_RESPONSE = 11701; @@ -599,6 +602,9 @@ enum MessageType{ UPDATE_PHONE_INFO_REQUEST = 12013; //更新手机号 UPDATE_PHONE_INFO_RESPONSE = 12014; + + UPDATE_QUESTION_REQUEST = 12015; //问卷 + UPDATE_QUESTION_RESPONSE = 12016; // V 12100 VIEW_FIGHTREPLAY_REQUEST = 12100; // 查看战斗回放 diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 2513d6f..a8051ca 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -514,3 +514,30 @@ import "CommonProto.proto"; message GetToBeStrongerResponse{ repeated StrongerInfo infos = 1; } + + + message QuestionIndication{ + optional int32 state = 1; //state -1关闭 1开启 + } + + message GetQuestionRequest{ + + } + + message GetQuestionResponse{ + optional string id= 1; //问卷id + optional string questDes= 2; //问卷描述 + optional string reward= 3; //问卷奖励 + optional string start= 4; //开始时间 + optional string end= 5; //问卷结束时间 + repeated QuestionOptions questOptions =6; //问卷问题 + } + + + message upDataQuestionRequest{ + repeated string options = 1; //问题答案 ABCD形式 多选拼接多个 + } + + message upDataQuestionResponse{ + optional int32 result = 1;//-1失败 0成功 + } From 9b3ff7a88c74105ad58a9777a2ca09a267a3aca4 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 3 Sep 2019 14:53:37 +0800 Subject: [PATCH 3/4] kill nums --- protos/CommonProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index dcf5777..c698777 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -473,6 +473,7 @@ option optimize_for = SPEED; optional int32 mineral = 5; // 矿石 optional int32 camp = 6; //阵营 repeated BloodyHeroInfo heroInfo = 7 ; // 英雄信息 + optional int32 killNums=8; // 击杀数 } message SceneActor{ From d1b33774957a9c133ef850fa88b23fef7250ae96 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 3 Sep 2019 14:56:43 +0800 Subject: [PATCH 4/4] delete unuse msg --- protos/CommonProto.proto | 2 -- 1 file changed, 2 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 3e9bee6..750d654 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -494,8 +494,6 @@ option optimize_for = SPEED; repeated ActorEffectBufferInfo actorEffectBufferInfo =4;//场景中所有buffer信息 repeated int32 barrierPoint = 5 ;// 阻挡点 repeated PosMineral posMineral = 6;// 散落的矿石信息 - repeated SceneMsg sceneMsg = 7; // 场景消息 - } message SceneGetFullMsgResponse{