diff --git a/modules/uigame/api_latticegrid.go b/modules/uigame/api_latticegrid.go index 36cbd9b0a..c2bd2e854 100644 --- a/modules/uigame/api_latticegrid.go +++ b/modules/uigame/api_latticegrid.go @@ -38,10 +38,13 @@ func (this *apiComp) LatticeGrid(session comm.IUserSession, req *pb.UiGameLattic } if v1, ok := list.Lattice[list.Floor]; ok { if _, ok := v1.Data[req.Grid]; ok { - errdata = &pb.ErrorData{ // 重复领取 - Code: pb.ErrorCode_ActivityRepatReward, - Title: pb.ErrorCode_ActivityRepatReward.ToString(), - } + list.Curpos = req.Grid + update["curpos"] = list.Curpos + this.module.modelLattice.modifyLatticeListByObjId(session.GetUserId(), update) + session.SendMsg(string(this.module.GetType()), "latticegrid", &pb.UiGameLatticeGridResp{ + Data: list, + Atno: atno, + }) return } list.Lattice[list.Floor].Data[req.Grid] = 1 @@ -97,9 +100,9 @@ func (this *apiComp) LatticeGrid(session comm.IUserSession, req *pb.UiGameLattic update["total"] = list.Total } } - // list.Gotarr[req.Grid] = 1 - // update["gotarr"] = list.Gotarr + list.Curpos = req.Grid + update["curpos"] = list.Curpos this.module.modelLattice.modifyLatticeListByObjId(session.GetUserId(), update) session.SendMsg(string(this.module.GetType()), "latticegrid", &pb.UiGameLatticeGridResp{ Data: list, diff --git a/pb/uigame_db.pb.go b/pb/uigame_db.pb.go index 9fd43ea3f..d7085555e 100644 --- a/pb/uigame_db.pb.go +++ b/pb/uigame_db.pb.go @@ -179,6 +179,7 @@ type DBLatticeData struct { Total int32 `protobuf:"varint,8,opt,name=total,proto3" json:"total"` // 总的层数 BReward bool `protobuf:"varint,9,opt,name=bReward,proto3" json:"bReward"` // 总奖励 Floor int32 `protobuf:"varint,10,opt,name=floor,proto3" json:"floor"` // 当前第几层 + Curpos int32 `protobuf:"varint,11,opt,name=curpos,proto3" json:"curpos"` // 当前位置 } func (x *DBLatticeData) Reset() { @@ -283,6 +284,13 @@ func (x *DBLatticeData) GetFloor() int32 { return 0 } +func (x *DBLatticeData) GetCurpos() int32 { + if x != nil { + return x.Curpos + } + return 0 +} + // 矿工 type DBMinerData struct { state protoimpl.MessageState @@ -412,7 +420,7 @@ var file_uigame_uigame_db_proto_rawDesc = []byte{ 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, - 0xab, 0x03, 0x0a, 0x0d, 0x44, 0x42, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, + 0xc3, 0x03, 0x0a, 0x0d, 0x44, 0x42, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x64, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, @@ -430,32 +438,34 @@ var file_uigame_uigame_db_proto_rawDesc = []byte{ 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x62, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x6f, 0x74, 0x61, - 0x72, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x1a, 0x48, 0x0a, 0x0c, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xfa, 0x01, - 0x0a, 0x0b, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, - 0x14, 0x0a, 0x05, 0x68, 0x64, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x68, 0x64, 0x6f, 0x69, 0x64, 0x12, 0x30, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x18, - 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x44, - 0x61, 0x74, 0x61, 0x2e, 0x47, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, - 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, - 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x76, 0x61, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x62, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, - 0x39, 0x0a, 0x0b, 0x47, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x05, 0x52, 0x05, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x70, + 0x6f, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x73, + 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x48, 0x0a, 0x0c, 0x4c, + 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x22, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x4c, + 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xfa, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, + 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x64, 0x6f, 0x69, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x68, 0x64, 0x6f, 0x69, 0x64, 0x12, 0x30, 0x0a, + 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, + 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x6f, 0x74, 0x61, + 0x72, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, + 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, + 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x12, 0x18, 0x0a, + 0x07, 0x62, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, + 0x62, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x6f, 0x74, 0x61, 0x72, + 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/pb/uigame_msg.pb.go b/pb/uigame_msg.pb.go index b3af37d24..a15e0fb5c 100644 --- a/pb/uigame_msg.pb.go +++ b/pb/uigame_msg.pb.go @@ -1060,118 +1060,6 @@ func (x *UiGameMinerKeyResp) GetAtno() []*UserAtno { return nil } -// 拼图领取奖励 -type UiGameMinerRewardReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 活动ID - Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id"` -} - -func (x *UiGameMinerRewardReq) Reset() { - *x = UiGameMinerRewardReq{} - if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *UiGameMinerRewardReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*UiGameMinerRewardReq) ProtoMessage() {} - -func (x *UiGameMinerRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[20] - 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 UiGameMinerRewardReq.ProtoReflect.Descriptor instead. -func (*UiGameMinerRewardReq) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{20} -} - -func (x *UiGameMinerRewardReq) GetHdid() string { - if x != nil { - return x.Hdid - } - return "" -} - -func (x *UiGameMinerRewardReq) GetId() int32 { - if x != nil { - return x.Id - } - return 0 -} - -// 获取活动列表 -type UiGameMinerRewardResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Data *DBMinerData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` - Atno []*UserAtno `protobuf:"bytes,2,rep,name=atno,proto3" json:"atno"` // 奖励 -} - -func (x *UiGameMinerRewardResp) Reset() { - *x = UiGameMinerRewardResp{} - if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *UiGameMinerRewardResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*UiGameMinerRewardResp) ProtoMessage() {} - -func (x *UiGameMinerRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[21] - 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 UiGameMinerRewardResp.ProtoReflect.Descriptor instead. -func (*UiGameMinerRewardResp) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{21} -} - -func (x *UiGameMinerRewardResp) GetData() *DBMinerData { - if x != nil { - return x.Data - } - return nil -} - -func (x *UiGameMinerRewardResp) GetAtno() []*UserAtno { - if x != nil { - return x.Atno - } - return nil -} - // 进度变化推送 type UiGameMinerChangePush struct { state protoimpl.MessageState @@ -1184,7 +1072,7 @@ type UiGameMinerChangePush struct { func (x *UiGameMinerChangePush) Reset() { *x = UiGameMinerChangePush{} if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[22] + mi := &file_uigame_uigame_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1197,7 +1085,7 @@ func (x *UiGameMinerChangePush) String() string { func (*UiGameMinerChangePush) ProtoMessage() {} func (x *UiGameMinerChangePush) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[22] + mi := &file_uigame_uigame_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1210,7 +1098,7 @@ func (x *UiGameMinerChangePush) ProtoReflect() protoreflect.Message { // Deprecated: Use UiGameMinerChangePush.ProtoReflect.Descriptor instead. func (*UiGameMinerChangePush) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{22} + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{20} } func (x *UiGameMinerChangePush) GetData() *DBMinerData { @@ -1231,7 +1119,7 @@ type UiGameMinerFinishReq struct { func (x *UiGameMinerFinishReq) Reset() { *x = UiGameMinerFinishReq{} if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[23] + mi := &file_uigame_uigame_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1244,7 +1132,7 @@ func (x *UiGameMinerFinishReq) String() string { func (*UiGameMinerFinishReq) ProtoMessage() {} func (x *UiGameMinerFinishReq) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[23] + mi := &file_uigame_uigame_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1257,7 +1145,7 @@ func (x *UiGameMinerFinishReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UiGameMinerFinishReq.ProtoReflect.Descriptor instead. func (*UiGameMinerFinishReq) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{23} + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{21} } func (x *UiGameMinerFinishReq) GetHdid() string { @@ -1279,7 +1167,7 @@ type UiGameMinerFinishResp struct { func (x *UiGameMinerFinishResp) Reset() { *x = UiGameMinerFinishResp{} if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[24] + mi := &file_uigame_uigame_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1292,7 +1180,7 @@ func (x *UiGameMinerFinishResp) String() string { func (*UiGameMinerFinishResp) ProtoMessage() {} func (x *UiGameMinerFinishResp) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[24] + mi := &file_uigame_uigame_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1305,7 +1193,7 @@ func (x *UiGameMinerFinishResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UiGameMinerFinishResp.ProtoReflect.Descriptor instead. func (*UiGameMinerFinishResp) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{24} + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{22} } func (x *UiGameMinerFinishResp) GetData() *DBMinerData { @@ -1412,29 +1300,20 @@ var file_uigame_uigame_msg_proto_rawDesc = []byte{ 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, - 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x3a, 0x0a, 0x14, 0x55, 0x69, 0x47, - 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, - 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x58, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4d, - 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, - 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, - 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, - 0x39, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x43, 0x68, - 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, - 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2a, 0x0a, 0x14, 0x55, 0x69, - 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, - 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x22, 0x58, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, - 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, - 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x39, 0x0a, 0x15, 0x55, 0x69, 0x47, + 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, + 0x73, 0x68, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x22, 0x2a, 0x0a, 0x14, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x69, + 0x6e, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, + 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, + 0x22, 0x58, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x46, + 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, + 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, + 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, + 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1449,7 +1328,7 @@ func file_uigame_uigame_msg_proto_rawDescGZIP() []byte { return file_uigame_uigame_msg_proto_rawDescData } -var file_uigame_uigame_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 25) +var file_uigame_uigame_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 23) var file_uigame_uigame_msg_proto_goTypes = []interface{}{ (*UiGameGetPuzzleReq)(nil), // 0: UiGameGetPuzzleReq (*UiGameGetPuzzleResp)(nil), // 1: UiGameGetPuzzleResp @@ -1471,44 +1350,40 @@ var file_uigame_uigame_msg_proto_goTypes = []interface{}{ (*UiGameGetMinerResp)(nil), // 17: UiGameGetMinerResp (*UiGameMinerKeyReq)(nil), // 18: UiGameMinerKeyReq (*UiGameMinerKeyResp)(nil), // 19: UiGameMinerKeyResp - (*UiGameMinerRewardReq)(nil), // 20: UiGameMinerRewardReq - (*UiGameMinerRewardResp)(nil), // 21: UiGameMinerRewardResp - (*UiGameMinerChangePush)(nil), // 22: UiGameMinerChangePush - (*UiGameMinerFinishReq)(nil), // 23: UiGameMinerFinishReq - (*UiGameMinerFinishResp)(nil), // 24: UiGameMinerFinishResp - (*DBPuzzleData)(nil), // 25: DBPuzzleData - (*UserAtno)(nil), // 26: UserAtno - (*DBLatticeData)(nil), // 27: DBLatticeData - (*DBMinerData)(nil), // 28: DBMinerData + (*UiGameMinerChangePush)(nil), // 20: UiGameMinerChangePush + (*UiGameMinerFinishReq)(nil), // 21: UiGameMinerFinishReq + (*UiGameMinerFinishResp)(nil), // 22: UiGameMinerFinishResp + (*DBPuzzleData)(nil), // 23: DBPuzzleData + (*UserAtno)(nil), // 24: UserAtno + (*DBLatticeData)(nil), // 25: DBLatticeData + (*DBMinerData)(nil), // 26: DBMinerData } var file_uigame_uigame_msg_proto_depIdxs = []int32{ - 25, // 0: UiGameGetPuzzleResp.data:type_name -> DBPuzzleData - 25, // 1: UiGamePuzzleGridResp.data:type_name -> DBPuzzleData - 26, // 2: UiGamePuzzleGridResp.atno:type_name -> UserAtno - 25, // 3: UiGamePuzzleRewardResp.data:type_name -> DBPuzzleData - 26, // 4: UiGamePuzzleRewardResp.atno:type_name -> UserAtno - 25, // 5: UiGamePuzzleChangePush.data:type_name -> DBPuzzleData - 27, // 6: UiGameGetLatticeResp.data:type_name -> DBLatticeData - 27, // 7: UiGameLatticeGridResp.data:type_name -> DBLatticeData - 26, // 8: UiGameLatticeGridResp.atno:type_name -> UserAtno - 27, // 9: UiGameLatticeRewardResp.data:type_name -> DBLatticeData - 26, // 10: UiGameLatticeRewardResp.atno:type_name -> UserAtno - 27, // 11: UiGameLatticeFinishResp.data:type_name -> DBLatticeData - 26, // 12: UiGameLatticeFinishResp.atno:type_name -> UserAtno - 27, // 13: UiGameLatticeChangePush.data:type_name -> DBLatticeData - 28, // 14: UiGameGetMinerResp.data:type_name -> DBMinerData - 28, // 15: UiGameMinerKeyResp.data:type_name -> DBMinerData - 26, // 16: UiGameMinerKeyResp.atno:type_name -> UserAtno - 28, // 17: UiGameMinerRewardResp.data:type_name -> DBMinerData - 26, // 18: UiGameMinerRewardResp.atno:type_name -> UserAtno - 28, // 19: UiGameMinerChangePush.data:type_name -> DBMinerData - 28, // 20: UiGameMinerFinishResp.data:type_name -> DBMinerData - 26, // 21: UiGameMinerFinishResp.atno:type_name -> UserAtno - 22, // [22:22] is the sub-list for method output_type - 22, // [22:22] is the sub-list for method input_type - 22, // [22:22] is the sub-list for extension type_name - 22, // [22:22] is the sub-list for extension extendee - 0, // [0:22] is the sub-list for field type_name + 23, // 0: UiGameGetPuzzleResp.data:type_name -> DBPuzzleData + 23, // 1: UiGamePuzzleGridResp.data:type_name -> DBPuzzleData + 24, // 2: UiGamePuzzleGridResp.atno:type_name -> UserAtno + 23, // 3: UiGamePuzzleRewardResp.data:type_name -> DBPuzzleData + 24, // 4: UiGamePuzzleRewardResp.atno:type_name -> UserAtno + 23, // 5: UiGamePuzzleChangePush.data:type_name -> DBPuzzleData + 25, // 6: UiGameGetLatticeResp.data:type_name -> DBLatticeData + 25, // 7: UiGameLatticeGridResp.data:type_name -> DBLatticeData + 24, // 8: UiGameLatticeGridResp.atno:type_name -> UserAtno + 25, // 9: UiGameLatticeRewardResp.data:type_name -> DBLatticeData + 24, // 10: UiGameLatticeRewardResp.atno:type_name -> UserAtno + 25, // 11: UiGameLatticeFinishResp.data:type_name -> DBLatticeData + 24, // 12: UiGameLatticeFinishResp.atno:type_name -> UserAtno + 25, // 13: UiGameLatticeChangePush.data:type_name -> DBLatticeData + 26, // 14: UiGameGetMinerResp.data:type_name -> DBMinerData + 26, // 15: UiGameMinerKeyResp.data:type_name -> DBMinerData + 24, // 16: UiGameMinerKeyResp.atno:type_name -> UserAtno + 26, // 17: UiGameMinerChangePush.data:type_name -> DBMinerData + 26, // 18: UiGameMinerFinishResp.data:type_name -> DBMinerData + 24, // 19: UiGameMinerFinishResp.atno:type_name -> UserAtno + 20, // [20:20] is the sub-list for method output_type + 20, // [20:20] is the sub-list for method input_type + 20, // [20:20] is the sub-list for extension type_name + 20, // [20:20] is the sub-list for extension extendee + 0, // [0:20] is the sub-list for field type_name } func init() { file_uigame_uigame_msg_proto_init() } @@ -1760,30 +1635,6 @@ func file_uigame_uigame_msg_proto_init() { } } file_uigame_uigame_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UiGameMinerRewardReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_uigame_uigame_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UiGameMinerRewardResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_uigame_uigame_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UiGameMinerChangePush); i { case 0: return &v.state @@ -1795,7 +1646,7 @@ func file_uigame_uigame_msg_proto_init() { return nil } } - file_uigame_uigame_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_uigame_uigame_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UiGameMinerFinishReq); i { case 0: return &v.state @@ -1807,7 +1658,7 @@ func file_uigame_uigame_msg_proto_init() { return nil } } - file_uigame_uigame_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + file_uigame_uigame_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UiGameMinerFinishResp); i { case 0: return &v.state @@ -1826,7 +1677,7 @@ func file_uigame_uigame_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_uigame_uigame_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 25, + NumMessages: 23, NumExtensions: 0, NumServices: 0, },