diff --git a/modules/guildgve/api_challengefinish.go b/modules/guildgve/api_challengefinish.go
index a786a506a..bd8b8ab61 100644
--- a/modules/guildgve/api_challengefinish.go
+++ b/modules/guildgve/api_challengefinish.go
@@ -25,6 +25,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
 		info   *pb.DBGuildGve
 		prop   []*cfg.Gameatn
 		award  []*pb.UserAssets
+		hp     int32
 		ok     bool
 		err    error
 	)
@@ -133,6 +134,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
 					this.module.modelRank.updateRank(info)
 					go this.module.modelGuildGve.booskill(req.Guildid, req.Boosid, info)
 				}
+				hp = v.Hp
 			}
 			break
 		}
@@ -175,6 +177,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
 	session.SendMsg(string(this.module.GetType()), "challengefinish", &pb.GuildGveChallengeFinishResp{
 		Guildid:    req.Guildid,
 		Boosid:     req.Boosid,
+		Hp:         hp,
 		Efficient:  ok,
 		Award:      award,
 		Score:      score.Id,
diff --git a/modules/items/module.go b/modules/items/module.go
index 5cc717d23..4ba9786ed 100644
--- a/modules/items/module.go
+++ b/modules/items/module.go
@@ -189,7 +189,7 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b
 			errdata = &pb.ErrorData{
 				Code:    pb.ErrorCode_ConfigNoFound,
 				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
-				Message: err.Error(),
+				Message: fmt.Sprintf("%s---%v", err.Error(), items),
 			}
 		} else {
 			errdata = &pb.ErrorData{
diff --git a/pb/chat_db.pb.go b/pb/chat_db.pb.go
index 6f84f7f02..85fa47992 100644
--- a/pb/chat_db.pb.go
+++ b/pb/chat_db.pb.go
@@ -86,6 +86,7 @@ const (
 	ChatType_EquipmentShare ChatType = 4 //装备分享
 	ChatType_ItemShare      ChatType = 5 //道具分享
 	ChatType_Parkour        ChatType = 6 //捕羊大赛邀请
+	ChatType_Questionnaire  ChatType = 7 //问答分享
 )
 
 // Enum value maps for ChatType.
@@ -98,6 +99,7 @@ var (
 		4: "EquipmentShare",
 		5: "ItemShare",
 		6: "Parkour",
+		7: "Questionnaire",
 	}
 	ChatType_value = map[string]int32{
 		"Text":           0,
@@ -107,6 +109,7 @@ var (
 		"EquipmentShare": 4,
 		"ItemShare":      5,
 		"Parkour":        6,
+		"Questionnaire":  7,
 	}
 )
 
@@ -369,15 +372,16 @@ var file_chat_chat_db_proto_rawDesc = []byte{
 	0x0a, 0x05, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x72, 0x69,
 	0x76, 0x61, 0x74, 0x65, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x53,
 	0x65, 0x72, 0x76, 0x65, 0x72, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x79, 0x73, 0x74, 0x65,
-	0x6d, 0x10, 0x04, 0x2a, 0x6f, 0x0a, 0x08, 0x43, 0x68, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x08, 0x0a, 0x04, 0x54, 0x65, 0x78, 0x74, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x6f, 0x6f,
-	0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x68,
-	0x61, 0x72, 0x65, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x61,
-	0x72, 0x65, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e,
-	0x74, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x04, 0x12, 0x0d, 0x0a, 0x09, 0x49, 0x74, 0x65, 0x6d,
-	0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x05, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x6b, 0x6f,
-	0x75, 0x72, 0x10, 0x06, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x6d, 0x10, 0x04, 0x2a, 0x82, 0x01, 0x0a, 0x08, 0x43, 0x68, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x08, 0x0a, 0x04, 0x54, 0x65, 0x78, 0x74, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x6f,
+	0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x53,
+	0x68, 0x61, 0x72, 0x65, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68,
+	0x61, 0x72, 0x65, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
+	0x6e, 0x74, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x04, 0x12, 0x0d, 0x0a, 0x09, 0x49, 0x74, 0x65,
+	0x6d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x05, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x6b,
+	0x6f, 0x75, 0x72, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0d, 0x51, 0x75, 0x65, 0x73, 0x74, 0x69, 0x6f,
+	0x6e, 0x6e, 0x61, 0x69, 0x72, 0x65, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/guildgve_msg.pb.go b/pb/guildgve_msg.pb.go
index 24e7e7c4e..8a7946236 100644
--- a/pb/guildgve_msg.pb.go
+++ b/pb/guildgve_msg.pb.go
@@ -730,10 +730,11 @@ type GuildGveChallengeFinishResp struct {
 
 	Guildid    string        `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid"`
 	Boosid     int32         `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
-	Award      []*UserAssets `protobuf:"bytes,3,rep,name=award,proto3" json:"award"`            //奖励
-	Efficient  bool          `protobuf:"varint,4,opt,name=efficient,proto3" json:"efficient"`   //是否有效
-	Score      int32         `protobuf:"varint,5,opt,name=score,proto3" json:"score"`           //评级id
-	Boosticket int32         `protobuf:"varint,6,opt,name=boosticket,proto3" json:"boosticket"` //工会boos战门票
+	Hp         int32         `protobuf:"varint,3,opt,name=hp,proto3" json:"hp"`
+	Award      []*UserAssets `protobuf:"bytes,4,rep,name=award,proto3" json:"award"`            //奖励
+	Efficient  bool          `protobuf:"varint,5,opt,name=efficient,proto3" json:"efficient"`   //是否有效
+	Score      int32         `protobuf:"varint,6,opt,name=score,proto3" json:"score"`           //评级id
+	Boosticket int32         `protobuf:"varint,7,opt,name=boosticket,proto3" json:"boosticket"` //工会boos战门票
 }
 
 func (x *GuildGveChallengeFinishResp) Reset() {
@@ -782,6 +783,13 @@ func (x *GuildGveChallengeFinishResp) GetBoosid() int32 {
 	return 0
 }
 
+func (x *GuildGveChallengeFinishResp) GetHp() int32 {
+	if x != nil {
+		return x.Hp
+	}
+	return 0
+}
+
 func (x *GuildGveChallengeFinishResp) GetAward() []*UserAssets {
 	if x != nil {
 		return x.Award
@@ -1198,18 +1206,19 @@ var file_guildgve_guildgve_msg_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06,
 	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42,
 	0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70,
-	0x6f, 0x72, 0x74, 0x22, 0xc6, 0x01, 0x0a, 0x1b, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
+	0x6f, 0x72, 0x74, 0x22, 0xd6, 0x01, 0x0a, 0x1b, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
 	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52,
 	0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a,
 	0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62,
-	0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03,
+	0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x02, 0x68, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04,
 	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74,
 	0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x66, 0x66, 0x69,
-	0x63, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x66, 0x66,
+	0x63, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x66, 0x66,
 	0x69, 0x63, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
-	0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05,
+	0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
+	0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x39, 0x0a, 0x16,
 	0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x43, 0x68, 0x61, 0x6e,
 	0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01,