上传工会任务代码

modules/buried/modelburied.go

@@ -108,3 +108,7 @@ func (this *buriedModel) updateUserBurieds(uid string, data *pb.DBBuried) (err e
 	})
 	return
 }
+
+func (this *buriedModel) userlock(uid string) (result *redis.RedisMutex, err error) {
+	return this.model.Redis.NewRedisMutex(fmt.Sprintf("ulockburied:%s", uid))
+}

modules/buried/module.go

@@ -100,7 +100,7 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
 		return
 	}
 	this.Debug("激活埋点!", log.Field{Key: "condiIds", Value: condiIds})
-	lock, _ := this.modelBuried.userlock(uid)
+	lock, _ := model.userlock(uid)
 	err = lock.Lock()
 	if err != nil {
 		this.Error("埋点分布式锁失效 err!", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
@@ -289,7 +289,7 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32,
 	}
 
 	this.Debug("完成埋点!", log.Field{Key: "finishcondiIds", Value: finishcondiIds})
-	lock, _ := this.modelBuried.userlock(uid)
+	lock, _ := model.userlock(uid)
 	err = lock.Lock()
 	if err != nil {
 		this.Error("埋点分布式锁失效 err!", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})

modules/user/module.go

@@ -110,7 +110,8 @@ func (this *User) GetUser(uid string) (user *pb.DBUser) {
 	if this.IsCross() {
 		user, err = this.getRemoteUser(uid)
 		if err != nil {
-			this.Errorf("查询远程玩家信息 tag:%v err:%v", this.service.GetTag(), err)
+			this.Error("查询用户信息失败!", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
+			// this.Errorf("查询远程玩家信息 tag:%v err:%v", this.service.GetTag(), err)
 			return nil
 		}
 	} else {

pb/uniongve_db.pb.go

@@ -28,8 +28,9 @@ type DBUnionGve struct {
 
 	Unionid   string            `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"`      //工会id
 	Notice    string            `protobuf:"bytes,2,opt,name=notice,proto3" json:"notice"`        //公告
-	Currstage int32             `protobuf:"varint,3,opt,name=currstage,proto3" json:"currstage"` //当前第几阶段
+	Fire      int32             `protobuf:"varint,3,opt,name=fire,proto3" json:"fire"`           //火力
-	Boos      []*DBUnionGveBoss `protobuf:"bytes,4,rep,name=boos,proto3" json:"boos"`            //boos列表
+	Currstage int32             `protobuf:"varint,4,opt,name=currstage,proto3" json:"currstage"` //当前第几阶段
+	Boos      []*DBUnionGveBoss `protobuf:"bytes,5,rep,name=boos,proto3" json:"boos"`            //boos列表
 }
 
 func (x *DBUnionGve) Reset() {
@@ -78,6 +79,13 @@ func (x *DBUnionGve) GetNotice() string {
 	return ""
 }
 
+func (x *DBUnionGve) GetFire() int32 {
+	if x != nil {
+		return x.Fire
+	}
+	return 0
+}
+
 func (x *DBUnionGve) GetCurrstage() int32 {
 	if x != nil {
 		return x.Currstage
@@ -216,26 +224,28 @@ var File_uniongve_uniongve_db_proto protoreflect.FileDescriptor
 
 var file_uniongve_uniongve_db_proto_rawDesc = []byte{
 	0x0a, 0x1a, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x2f, 0x75, 0x6e, 0x69, 0x6f, 0x6e,
-	0x67, 0x76, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x81, 0x01, 0x0a,
+	0x67, 0x76, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x95, 0x01, 0x0a,
 	0x0a, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x75,
 	0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e,
 	0x69, 0x6f, 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x1c, 0x0a,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a,
-	0x09, 0x63, 0x75, 0x72, 0x72, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x04, 0x66, 0x69, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x69, 0x72,
-	0x52, 0x09, 0x63, 0x75, 0x72, 0x72, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x23, 0x0a, 0x04, 0x62,
+	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x72, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x04,
-	0x6f, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x55, 0x6e,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x75, 0x72, 0x72, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12,
-	0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x62, 0x6f, 0x6f, 0x73,
+	0x23, 0x0a, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
-	0x22, 0x5e, 0x0a, 0x0e, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x42, 0x6f,
+	0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04,
-	0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x62, 0x6f, 0x6f, 0x73, 0x22, 0x5e, 0x0a, 0x0e, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47,
-	0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70,
+	0x76, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x12, 0x24, 0x0a, 0x06, 0x72, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x0e,
-	0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x47,
+	0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x12, 0x24,
-	0x76, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64,
+	0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c,
-	0x22, 0x3d, 0x0a, 0x0b, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12,
+	0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65,
-	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+	0x63, 0x6f, 0x72, 0x64, 0x22, 0x3d, 0x0a, 0x0b, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x65, 0x63,
-	0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02,
+	0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42,
+	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
-	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (

pb/uniongve_msg.pb.go

@@ -115,6 +115,339 @@ func (x *UniongveInfoResp) GetInfo() *DBUnionGve {
 	return nil
 }
 
+//集火设置
+type UniongveSetFireReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Boosid int32  `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"`
+	Notice string `protobuf:"bytes,2,opt,name=notice,proto3" json:"notice"`
+}
+
+func (x *UniongveSetFireReq) Reset() {
+	*x = UniongveSetFireReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UniongveSetFireReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UniongveSetFireReq) ProtoMessage() {}
+
+func (x *UniongveSetFireReq) ProtoReflect() protoreflect.Message {
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UniongveSetFireReq.ProtoReflect.Descriptor instead.
+func (*UniongveSetFireReq) Descriptor() ([]byte, []int) {
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *UniongveSetFireReq) GetBoosid() int32 {
+	if x != nil {
+		return x.Boosid
+	}
+	return 0
+}
+
+func (x *UniongveSetFireReq) GetNotice() string {
+	if x != nil {
+		return x.Notice
+	}
+	return ""
+}
+
+//集火设置 回应
+type UniongveSetFireResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *UniongveSetFireResp) Reset() {
+	*x = UniongveSetFireResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UniongveSetFireResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UniongveSetFireResp) ProtoMessage() {}
+
+func (x *UniongveSetFireResp) ProtoReflect() protoreflect.Message {
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UniongveSetFireResp.ProtoReflect.Descriptor instead.
+func (*UniongveSetFireResp) Descriptor() ([]byte, []int) {
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{3}
+}
+
+//排行榜请求
+type UniongveRankReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *UniongveRankReq) Reset() {
+	*x = UniongveRankReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UniongveRankReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UniongveRankReq) ProtoMessage() {}
+
+func (x *UniongveRankReq) ProtoReflect() protoreflect.Message {
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UniongveRankReq.ProtoReflect.Descriptor instead.
+func (*UniongveRankReq) Descriptor() ([]byte, []int) {
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{4}
+}
+
+//工会排名对象
+type UniongveRankItem struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"`
+	Name    string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
+	Rank    int32  `protobuf:"varint,3,opt,name=rank,proto3" json:"rank"`
+}
+
+func (x *UniongveRankItem) Reset() {
+	*x = UniongveRankItem{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UniongveRankItem) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UniongveRankItem) ProtoMessage() {}
+
+func (x *UniongveRankItem) ProtoReflect() protoreflect.Message {
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UniongveRankItem.ProtoReflect.Descriptor instead.
+func (*UniongveRankItem) Descriptor() ([]byte, []int) {
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *UniongveRankItem) GetUnionid() string {
+	if x != nil {
+		return x.Unionid
+	}
+	return ""
+}
+
+func (x *UniongveRankItem) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *UniongveRankItem) GetRank() int32 {
+	if x != nil {
+		return x.Rank
+	}
+	return 0
+}
+
+//排行榜请求
+type UniongveRankResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	List []*UniongveRankReq `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
+}
+
+func (x *UniongveRankResp) Reset() {
+	*x = UniongveRankResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UniongveRankResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UniongveRankResp) ProtoMessage() {}
+
+func (x *UniongveRankResp) ProtoReflect() protoreflect.Message {
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UniongveRankResp.ProtoReflect.Descriptor instead.
+func (*UniongveRankResp) Descriptor() ([]byte, []int) {
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *UniongveRankResp) GetList() []*UniongveRankReq {
+	if x != nil {
+		return x.List
+	}
+	return nil
+}
+
+//工会轮盘
+type UniongveRouletteReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *UniongveRouletteReq) Reset() {
+	*x = UniongveRouletteReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UniongveRouletteReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UniongveRouletteReq) ProtoMessage() {}
+
+func (x *UniongveRouletteReq) ProtoReflect() protoreflect.Message {
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UniongveRouletteReq.ProtoReflect.Descriptor instead.
+func (*UniongveRouletteReq) Descriptor() ([]byte, []int) {
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{7}
+}
+
+//工会轮盘
+type UniongveRouletteResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
+}
+
+func (x *UniongveRouletteResp) Reset() {
+	*x = UniongveRouletteResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UniongveRouletteResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UniongveRouletteResp) ProtoMessage() {}
+
+func (x *UniongveRouletteResp) ProtoReflect() protoreflect.Message {
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[8]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UniongveRouletteResp.ProtoReflect.Descriptor instead.
+func (*UniongveRouletteResp) Descriptor() ([]byte, []int) {
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *UniongveRouletteResp) GetAward() []*UserAssets {
+	if x != nil {
+		return x.Award
+	}
+	return nil
+}
+
 //挑战请求
 type UniongveChallengeReq struct {
 	state         protoimpl.MessageState
@@ -129,7 +462,7 @@ type UniongveChallengeReq struct {
 func (x *UniongveChallengeReq) Reset() {
 	*x = UniongveChallengeReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uniongve_uniongve_msg_proto_msgTypes[2]
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -142,7 +475,7 @@ func (x *UniongveChallengeReq) String() string {
 func (*UniongveChallengeReq) ProtoMessage() {}
 
 func (x *UniongveChallengeReq) ProtoReflect() protoreflect.Message {
-	mi := &file_uniongve_uniongve_msg_proto_msgTypes[2]
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -155,7 +488,7 @@ func (x *UniongveChallengeReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UniongveChallengeReq.ProtoReflect.Descriptor instead.
 func (*UniongveChallengeReq) Descriptor() ([]byte, []int) {
-	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{2}
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *UniongveChallengeReq) GetUnionid() string {
@@ -193,7 +526,7 @@ type UniongveChallengeResp struct {
 func (x *UniongveChallengeResp) Reset() {
 	*x = UniongveChallengeResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uniongve_uniongve_msg_proto_msgTypes[3]
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -206,7 +539,7 @@ func (x *UniongveChallengeResp) String() string {
 func (*UniongveChallengeResp) ProtoMessage() {}
 
 func (x *UniongveChallengeResp) ProtoReflect() protoreflect.Message {
-	mi := &file_uniongve_uniongve_msg_proto_msgTypes[3]
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -219,7 +552,7 @@ func (x *UniongveChallengeResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UniongveChallengeResp.ProtoReflect.Descriptor instead.
 func (*UniongveChallengeResp) Descriptor() ([]byte, []int) {
-	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{3}
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *UniongveChallengeResp) GetUnionid() string {
@@ -256,7 +589,7 @@ type UniongveChallengeFinishRep struct {
 func (x *UniongveChallengeFinishRep) Reset() {
 	*x = UniongveChallengeFinishRep{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uniongve_uniongve_msg_proto_msgTypes[4]
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -269,7 +602,7 @@ func (x *UniongveChallengeFinishRep) String() string {
 func (*UniongveChallengeFinishRep) ProtoMessage() {}
 
 func (x *UniongveChallengeFinishRep) ProtoReflect() protoreflect.Message {
-	mi := &file_uniongve_uniongve_msg_proto_msgTypes[4]
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -282,7 +615,7 @@ func (x *UniongveChallengeFinishRep) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UniongveChallengeFinishRep.ProtoReflect.Descriptor instead.
 func (*UniongveChallengeFinishRep) Descriptor() ([]byte, []int) {
-	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{4}
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *UniongveChallengeFinishRep) GetBattleConfId() int32 {
@@ -312,7 +645,7 @@ type UniongveChallengeFinishResp struct {
 func (x *UniongveChallengeFinishResp) Reset() {
 	*x = UniongveChallengeFinishResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uniongve_uniongve_msg_proto_msgTypes[5]
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -325,7 +658,7 @@ func (x *UniongveChallengeFinishResp) String() string {
 func (*UniongveChallengeFinishResp) ProtoMessage() {}
 
 func (x *UniongveChallengeFinishResp) ProtoReflect() protoreflect.Message {
-	mi := &file_uniongve_uniongve_msg_proto_msgTypes[5]
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -338,7 +671,7 @@ func (x *UniongveChallengeFinishResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UniongveChallengeFinishResp.ProtoReflect.Descriptor instead.
 func (*UniongveChallengeFinishResp) Descriptor() ([]byte, []int) {
-	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{5}
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *UniongveChallengeFinishResp) GetBattleConfId() int32 {
@@ -355,6 +688,54 @@ func (x *UniongveChallengeFinishResp) GetReport() *BattleReport {
 	return nil
 }
 
+//工会战 信息变化
+type UniongveInfoChangePush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Info *DBUnionGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+}
+
+func (x *UniongveInfoChangePush) Reset() {
+	*x = UniongveInfoChangePush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[13]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UniongveInfoChangePush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UniongveInfoChangePush) ProtoMessage() {}
+
+func (x *UniongveInfoChangePush) ProtoReflect() protoreflect.Message {
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[13]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UniongveInfoChangePush.ProtoReflect.Descriptor instead.
+func (*UniongveInfoChangePush) Descriptor() ([]byte, []int) {
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{13}
+}
+
+func (x *UniongveInfoChangePush) GetInfo() *DBUnionGve {
+	if x != nil {
+		return x.Info
+	}
+	return nil
+}
+
 //工会战 阶段变化
 type UniongveStageChangePush struct {
 	state         protoimpl.MessageState
@@ -367,7 +748,7 @@ type UniongveStageChangePush struct {
 func (x *UniongveStageChangePush) Reset() {
 	*x = UniongveStageChangePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uniongve_uniongve_msg_proto_msgTypes[6]
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -380,7 +761,7 @@ func (x *UniongveStageChangePush) String() string {
 func (*UniongveStageChangePush) ProtoMessage() {}
 
 func (x *UniongveStageChangePush) ProtoReflect() protoreflect.Message {
-	mi := &file_uniongve_uniongve_msg_proto_msgTypes[6]
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -393,7 +774,7 @@ func (x *UniongveStageChangePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UniongveStageChangePush.ProtoReflect.Descriptor instead.
 func (*UniongveStageChangePush) Descriptor() ([]byte, []int) {
-	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{6}
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *UniongveStageChangePush) GetInfo() *DBUnionGve {
@@ -415,7 +796,7 @@ type UniongveBoosChangePush struct {
 func (x *UniongveBoosChangePush) Reset() {
 	*x = UniongveBoosChangePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uniongve_uniongve_msg_proto_msgTypes[7]
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -428,7 +809,7 @@ func (x *UniongveBoosChangePush) String() string {
 func (*UniongveBoosChangePush) ProtoMessage() {}
 
 func (x *UniongveBoosChangePush) ProtoReflect() protoreflect.Message {
-	mi := &file_uniongve_uniongve_msg_proto_msgTypes[7]
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -441,7 +822,7 @@ func (x *UniongveBoosChangePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UniongveBoosChangePush.ProtoReflect.Descriptor instead.
 func (*UniongveBoosChangePush) Descriptor() ([]byte, []int) {
-	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{7}
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *UniongveBoosChangePush) GetInfo() *DBUnionGve {
@@ -451,6 +832,45 @@ func (x *UniongveBoosChangePush) GetInfo() *DBUnionGve {
 	return nil
 }
 
+//工会战 轮盘变化推送
+type UniongveRouletteChangePush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *UniongveRouletteChangePush) Reset() {
+	*x = UniongveRouletteChangePush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_uniongve_uniongve_msg_proto_msgTypes[16]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UniongveRouletteChangePush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UniongveRouletteChangePush) ProtoMessage() {}
+
+func (x *UniongveRouletteChangePush) ProtoReflect() protoreflect.Message {
+	mi := &file_uniongve_uniongve_msg_proto_msgTypes[16]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UniongveRouletteChangePush.ProtoReflect.Descriptor instead.
+func (*UniongveRouletteChangePush) Descriptor() ([]byte, []int) {
+	return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{16}
+}
+
 var File_uniongve_uniongve_msg_proto protoreflect.FileDescriptor
 
 var file_uniongve_uniongve_msg_proto_rawDesc = []byte{
@@ -459,48 +879,75 @@ var file_uniongve_uniongve_msg_proto_rawDesc = []byte{
 	0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x2f, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65,
 	0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c,
 	0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0x2b, 0x0a, 0x0f, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x49, 0x6e,
+	0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2b,
-	0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64,
+	0x0a, 0x0f, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x22,
+	0x71, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x33, 0x0a, 0x10, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x22, 0x33, 0x0a, 0x10, 0x55,
-	0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x52, 0x04,
+	0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
-	0x69, 0x6e, 0x66, 0x6f, 0x22, 0x72, 0x0a, 0x14, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65,
+	0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
-	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
+	0x22, 0x44, 0x0a, 0x12, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x53, 0x65, 0x74, 0x46,
-	0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75,
+	0x69, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64,
-	0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x16,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x28,
+	0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
+	0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x22, 0x15, 0x0a, 0x13, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67,
-	0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x76, 0x65, 0x53, 0x65, 0x74, 0x46, 0x69, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x11, 0x0a,
-	0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x6a, 0x0a, 0x15, 0x55, 0x6e, 0x69, 0x6f,
+	0x0f, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71,
-	0x6e, 0x67, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73,
+	0x22, 0x54, 0x0a, 0x10, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b,
-	0x70, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18,
-	0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x12, 0x12,
-	0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x73, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
-	0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
+	0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22, 0x38, 0x0a, 0x10, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67,
-	0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, 0x0a, 0x1a, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65,
+	0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x6c, 0x69,
-	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52,
+	0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x55, 0x6e, 0x69, 0x6f, 0x6e,
-	0x65, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66,
+	0x67, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x22, 0x15, 0x0a, 0x13, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c,
-	0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02,
+	0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x14, 0x55, 0x6e, 0x69, 0x6f, 0x6e,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66,
+	0x67, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x68, 0x0a, 0x1b, 0x55, 0x6e, 0x69, 0x6f, 0x6e,
+	0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
-	0x67, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69,
+	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61,
-	0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x72, 0x64, 0x22, 0x72, 0x0a, 0x14, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x43, 0x68,
-	0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61,
+	0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e,
-	0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65,
+	0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69,
-	0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74,
+	0x6f, 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02,
-	0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06,
-	0x74, 0x22, 0x3a, 0x0a, 0x17, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x53, 0x74, 0x61,
+	0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42,
-	0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06,
-	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x55,
+	0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x6a, 0x0a, 0x15, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67,
-	0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x39, 0x0a,
+	0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x16, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61,
+	0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
+	0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47,
+	0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69,
-	0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e,
+	0x66, 0x6f, 0x22, 0x61, 0x0a, 0x1a, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x43, 0x68,
+	0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x70,
+	0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
+	0x6e, 0x66, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x68, 0x0a, 0x1b, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76,
+	0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
+	0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f,
+	0x72, 0x74, 0x18, 0x02, 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,
+	0x39, 0x0a, 0x16, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 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, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f,
+	0x6e, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x3a, 0x0a, 0x17, 0x55, 0x6e,
+	0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x53, 0x74, 0x61, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67,
+	0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65,
+	0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x39, 0x0a, 0x16, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67,
+	0x76, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68,
+	0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
+	0x2e, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66,
+	0x6f, 0x22, 0x1c, 0x0a, 0x1a, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x52, 0x6f, 0x75,
+	0x6c, 0x65, 0x74, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -515,34 +962,47 @@ func file_uniongve_uniongve_msg_proto_rawDescGZIP() []byte {
 	return file_uniongve_uniongve_msg_proto_rawDescData
 }
 
-var file_uniongve_uniongve_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_uniongve_uniongve_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
 var file_uniongve_uniongve_msg_proto_goTypes = []interface{}{
 	(*UniongveInfoReq)(nil),             // 0: UniongveInfoReq
 	(*UniongveInfoResp)(nil),            // 1: UniongveInfoResp
-	(*UniongveChallengeReq)(nil),        // 2: UniongveChallengeReq
+	(*UniongveSetFireReq)(nil),          // 2: UniongveSetFireReq
-	(*UniongveChallengeResp)(nil),       // 3: UniongveChallengeResp
+	(*UniongveSetFireResp)(nil),         // 3: UniongveSetFireResp
-	(*UniongveChallengeFinishRep)(nil),  // 4: UniongveChallengeFinishRep
+	(*UniongveRankReq)(nil),             // 4: UniongveRankReq
-	(*UniongveChallengeFinishResp)(nil), // 5: UniongveChallengeFinishResp
+	(*UniongveRankItem)(nil),            // 5: UniongveRankItem
-	(*UniongveStageChangePush)(nil),     // 6: UniongveStageChangePush
+	(*UniongveRankResp)(nil),            // 6: UniongveRankResp
-	(*UniongveBoosChangePush)(nil),      // 7: UniongveBoosChangePush
+	(*UniongveRouletteReq)(nil),         // 7: UniongveRouletteReq
-	(*DBUnionGve)(nil),                  // 8: DBUnionGve
+	(*UniongveRouletteResp)(nil),        // 8: UniongveRouletteResp
-	(*BattleFormation)(nil),             // 9: BattleFormation
+	(*UniongveChallengeReq)(nil),        // 9: UniongveChallengeReq
-	(*BattleInfo)(nil),                  // 10: BattleInfo
+	(*UniongveChallengeResp)(nil),       // 10: UniongveChallengeResp
-	(*BattleReport)(nil),                // 11: BattleReport
+	(*UniongveChallengeFinishRep)(nil),  // 11: UniongveChallengeFinishRep
+	(*UniongveChallengeFinishResp)(nil), // 12: UniongveChallengeFinishResp
+	(*UniongveInfoChangePush)(nil),      // 13: UniongveInfoChangePush
+	(*UniongveStageChangePush)(nil),     // 14: UniongveStageChangePush
+	(*UniongveBoosChangePush)(nil),      // 15: UniongveBoosChangePush
+	(*UniongveRouletteChangePush)(nil),  // 16: UniongveRouletteChangePush
+	(*DBUnionGve)(nil),                  // 17: DBUnionGve
+	(*UserAssets)(nil),                  // 18: UserAssets
+	(*BattleFormation)(nil),             // 19: BattleFormation
+	(*BattleInfo)(nil),                  // 20: BattleInfo
+	(*BattleReport)(nil),                // 21: BattleReport
 }
 var file_uniongve_uniongve_msg_proto_depIdxs = []int32{
-	8,  // 0: UniongveInfoResp.info:type_name -> DBUnionGve
+	17, // 0: UniongveInfoResp.info:type_name -> DBUnionGve
-	9,  // 1: UniongveChallengeReq.battle:type_name -> BattleFormation
+	4,  // 1: UniongveRankResp.list:type_name -> UniongveRankReq
-	10, // 2: UniongveChallengeResp.info:type_name -> BattleInfo
+	18, // 2: UniongveRouletteResp.award:type_name -> UserAssets
-	10, // 3: UniongveChallengeFinishRep.info:type_name -> BattleInfo
+	19, // 3: UniongveChallengeReq.battle:type_name -> BattleFormation
-	11, // 4: UniongveChallengeFinishResp.report:type_name -> BattleReport
+	20, // 4: UniongveChallengeResp.info:type_name -> BattleInfo
-	8,  // 5: UniongveStageChangePush.info:type_name -> DBUnionGve
+	20, // 5: UniongveChallengeFinishRep.info:type_name -> BattleInfo
-	8,  // 6: UniongveBoosChangePush.info:type_name -> DBUnionGve
+	21, // 6: UniongveChallengeFinishResp.report:type_name -> BattleReport
-	7,  // [7:7] is the sub-list for method output_type
+	17, // 7: UniongveInfoChangePush.info:type_name -> DBUnionGve
-	7,  // [7:7] is the sub-list for method input_type
+	17, // 8: UniongveStageChangePush.info:type_name -> DBUnionGve
-	7,  // [7:7] is the sub-list for extension type_name
+	17, // 9: UniongveBoosChangePush.info:type_name -> DBUnionGve
-	7,  // [7:7] is the sub-list for extension extendee
+	10, // [10:10] is the sub-list for method output_type
-	0,  // [0:7] is the sub-list for field type_name
+	10, // [10:10] is the sub-list for method input_type
+	10, // [10:10] is the sub-list for extension type_name
+	10, // [10:10] is the sub-list for extension extendee
+	0,  // [0:10] is the sub-list for field type_name
 }
 
 func init() { file_uniongve_uniongve_msg_proto_init() }
@@ -552,6 +1012,7 @@ func file_uniongve_uniongve_msg_proto_init() {
 	}
 	file_uniongve_uniongve_db_proto_init()
 	file_battle_battle_msg_proto_init()
+	file_comm_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_uniongve_uniongve_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UniongveInfoReq); i {
@@ -578,7 +1039,7 @@ func file_uniongve_uniongve_msg_proto_init() {
 			}
 		}
 		file_uniongve_uniongve_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UniongveChallengeReq); i {
+			switch v := v.(*UniongveSetFireReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -590,7 +1051,7 @@ func file_uniongve_uniongve_msg_proto_init() {
 			}
 		}
 		file_uniongve_uniongve_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UniongveChallengeResp); i {
+			switch v := v.(*UniongveSetFireResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -602,7 +1063,7 @@ func file_uniongve_uniongve_msg_proto_init() {
 			}
 		}
 		file_uniongve_uniongve_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UniongveChallengeFinishRep); i {
+			switch v := v.(*UniongveRankReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -614,7 +1075,7 @@ func file_uniongve_uniongve_msg_proto_init() {
 			}
 		}
 		file_uniongve_uniongve_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UniongveChallengeFinishResp); i {
+			switch v := v.(*UniongveRankItem); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -626,7 +1087,7 @@ func file_uniongve_uniongve_msg_proto_init() {
 			}
 		}
 		file_uniongve_uniongve_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UniongveStageChangePush); i {
+			switch v := v.(*UniongveRankResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -638,6 +1099,102 @@ func file_uniongve_uniongve_msg_proto_init() {
 			}
 		}
 		file_uniongve_uniongve_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UniongveRouletteReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_uniongve_uniongve_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UniongveRouletteResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_uniongve_uniongve_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UniongveChallengeReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_uniongve_uniongve_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UniongveChallengeResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_uniongve_uniongve_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UniongveChallengeFinishRep); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_uniongve_uniongve_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UniongveChallengeFinishResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_uniongve_uniongve_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UniongveInfoChangePush); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_uniongve_uniongve_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UniongveStageChangePush); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_uniongve_uniongve_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UniongveBoosChangePush); i {
 			case 0:
 				return &v.state
@@ -649,6 +1206,18 @@ func file_uniongve_uniongve_msg_proto_init() {
 				return nil
 			}
 		}
+		file_uniongve_uniongve_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UniongveRouletteChangePush); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -656,7 +1225,7 @@ func file_uniongve_uniongve_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_uniongve_uniongve_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   8,
+			NumMessages:   17,
 			NumExtensions: 0,
 			NumServices:   0,
 		},