Merge branch 'master_test_gn' into master_test_gn_lifeGrid

protos/ActivityProto.proto

@@ -192,4 +192,13 @@ import "CommonProto.proto";
 		repeated int32 selectIds = 1;
 	}
 
+
+	// 妖晶购买道具
+	message BuyGoodsToItemRequest{
+		optional int32 goodId = 1;
+		optional int32 goodsNum = 2;
+	}
+	message BuyGoodsToItemResponse{
+		optional Drop drop = 1;
+	}
 	

protos/CommonProto.proto

@@ -835,13 +835,14 @@ option optimize_for = SPEED;
 	message ExpeditionSimpleBossInfo{
 		optional int32 heroTid = 1;//英雄模板id
 		optional int32 star = 2;
-		optional int32 level =3;
-		optional double remainHp =4;//剩余血量
+		optional int32 level = 3;
+		optional double remainHp = 4;//剩余血量
 		optional int32 position = 5; //位置 1 2 3 4 一次从左到右
+		optional int32 godSoulLv = 6;//神魂等级
 	}
 	
 	message ExpeditionTeamInfo{
-        repeated ExpeditionSimpleBossInfo hero =1;
+		repeated ExpeditionSimpleBossInfo hero =1;
 		repeated int32 PokemonInfos = 2;
 		optional int32 totalForce=3;
 		optional int32 teamInfo=4;//节点属性 招募试炼节点为怪物组id

protos/Family.proto

@@ -569,7 +569,7 @@ import "CommonProto.proto";
 		optional int32 canSweep = 3;//是否能扫荡，今天是否挑战过这个boss
 		optional int32 buffCount = 4;//当前buff到多少索引
 		optional int32 buffTime = 5;//buff结束时间
-		optional int32 sweepDamage = 6;//上次挑战或扫荡的伤害
+		optional int64 sweepDamage = 6;//上次挑战或扫荡的伤害
 		repeated int32 refreshedBoss = 7;//已经使用过刷新的boss，打死后不再刷新次数
 		optional int32 isRefresh = 8;//本次请求是否有刷新，刷新1，不刷新0
 	}
@@ -581,7 +581,7 @@ import "CommonProto.proto";
 		optional int32 kill = 1;//本次是否击杀boss
 		optional Drop drop = 2;
 		optional FightData fightData = 3;//战斗
-		optional int32 damage = 4;//伤害值
+		optional int64 damage = 4;//伤害值
 	}
 	message GuildChallengeIndication{
 		optional int32 curBoss = 1;//当前bossId

protos/MessageTypeProto.proto

@@ -1367,6 +1367,11 @@ enum MessageType{
 
 	UpOrDownTransformationRequest = 3050022;
 
+
+	// 购买道具礼包（妖晶）
+	BuyGoodsToItemRequest = 3050023;
+	BuyGoodsToItemResponse = 3050024;
+
 	
 	//周卡
 	WeekCardInfoRequest = 3050030;