Merge branch 'master_test_gn' into master_test_gn_xxp

# Conflicts:
#	protos/CommonProto.proto

protos/CommonProto.proto

@@ -1225,5 +1225,15 @@ option optimize_for = SPEED;
 	    optional int32 teamId = 2; //队伍id
 		optional int32 time = 3; //探索小时
 	}
+	//消耗命石数据
+	message LifeStoneInfo{
+		optional int32 itemId = 1;//命石id
+		optional int32 costNum = 2;//消耗数量
+	}
 
-	
+	//命格数据
+	message LifeGridInfo{
+		optional int32 gridId = 1;//命格id
+		optional int32 gridIndex = 2;//命格索引
+		optional int32 itemId = 3;//命石id
+	}

protos/HeroInfoProto.proto

@@ -500,4 +500,34 @@ import "CommonProto.proto";
 		optional int32 id = 1;//变身卡id
 		optional int32 index = 2;//位置
 	}
+
+	//命石合成升级
+	message LifeStoneUpRequest{
+		optional int32 type = 1;//操作类型 1:批量合成  2:一键合成  3:命石单个合成  4:快速合成 
+		optional int32 gridId = 2;//当前选择命格id 这个值大于0说明在命格界面操作 否则是在背包操作
+		optional int32 gridIndex = 3;//当前命格内索引
+		optional int32 curGemId = 4;//当前选择命石id
+		optional int32 selectNum = 5;//批量时选择消耗数量
+	}
+	
+	//当前命石已装备的情况返回命格数据
+	message LifeStoneUpResponse{
+		optional LifeGridInfo lifeGridInfo = 1;//命格信息
+		optional Drop drop = 2;//合成掉落
+	}
+
+	//命格穿戴/卸下
+	message LifeGridChangeRequest{
+		optional int32 type = 1;//操作类型 1:穿戴  2:卸下
+		optional int32 position = 2;//命格id
+		optional int32 index = 3;//命格里格子索引
+		optional int32 lifeStoneId = 4;//当前选择命石道具id
+	}
+
+	//返回命格数据
+	message LifeGridChangeResponse{
+		optional LifeGridInfo lifeGridInfo = 1;//命格信息
+	}
+
+
 	

protos/MessageTypeProto.proto

@@ -1132,8 +1132,15 @@ enum MessageType{
 	TRUMP_GACHA_SELECT_ITEM_REQUEST = 20215;//天地洪炉活动选择道具协议
 	TRUMP_GACHA_SELECT_ITEM_RESPONSE = 20216;
 
-	GET_TRUMP_SELECT_ITEM_REQUEST = 20217;//获取天地洪炉活动选择up道具协议
+	GET_TRUMP_SELECT_ITEM_REQUEST = 20217;//获取天地洪炉抽奖选择up道具协议
 	GET_TRUMP_SELECT_ITEM_RESPONSE = 20218;
+
+	LIFE_STONE_UP_REQUEST = 20219;//命石合成协议
+	LIFE_STONE_UP_RESPONSE = 20220;
+
+	LIFE_GRID_CHANGE_REQUEST = 20221;//命格穿戴/卸下协议
+	LIFE_GRID_CHANGE_RESPONSE = 20222;
+
 	
 	//30000以后 新增协议号使用协议名定义 协议号自动映射
 	

protos/PlayerInfoProto.proto

@@ -89,6 +89,7 @@ import "CommonProto.proto";
 		optional int32 xiuweiLevel = 48; // 主角修为等级
 		repeated PracticeSkillInfo practiceSkillInfos = 49;//修行技能数据
 		repeated FaBaoSoulInfo FaBaoSoulInfos = 50;//法宝之魂数据
+		repeated LifeGridInfo lifeGridInfos = 51;//命格数据
 	}