From 7632c96830567ecefa49bd94aec5ecbbd5cd59a8 Mon Sep 17 00:00:00 2001
From: duhui <d1769111741@163.com>
Date: Thu, 17 Dec 2020 10:00:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=8A=A5=E5=8A=9F=E8=83=BD=E5=92=8C?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/ChatProto.proto   | 4 ++--
 protos/CommonProto.proto | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/protos/ChatProto.proto b/protos/ChatProto.proto
index 246cbca..ccc44f3 100644
--- a/protos/ChatProto.proto
+++ b/protos/ChatProto.proto
@@ -16,8 +16,8 @@ message ChatInfo{
     optional uint64 messageId = 11; // 消息号
     //跑马灯用
     optional int32 messageType = 13; // 消息类型 1:吉运,2:勤勉
-    optional int32 itemId =14; // 查看道具id
-	//optional string item = 14; // 物品信息，用#分割
+    //optional int32 itemId =14; // 查看道具id
+	optional string itemId = 14; // 物品信息，用#分割
     optional int32 type = 15;  //0:系统 1:其他
     optional int32 startTime = 16 ; // 开始时间
     optional int32 endTime = 17;  //结束时间
diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index aaf8f43..7f6da8c 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -236,6 +236,7 @@ option optimize_for = SPEED;
 		optional int32 fightSeed = 3;	
 		optional int32 fightMaxTime =4; //战斗最长时间	
 		optional int32 fightType = 5 ; // 战斗类型
+		optional string fightId = 6; //战斗id唯一，玩家id#服务器id#战斗类型id#时间戳
 	}
 
 	message ExploreDetail{