diff --git a/modules/uigame/api_latticereward.go b/modules/uigame/api_latticereward.go index b66bbc3a7..b7757ec9f 100644 --- a/modules/uigame/api_latticereward.go +++ b/modules/uigame/api_latticereward.go @@ -34,8 +34,8 @@ func (this *apiComp) LatticeReward(session comm.IUserSession, req *pb.UiGameLatt } return } else { - list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid) - if _, ok := list.Puzzle[req.Id]; ok { + list, _ := this.module.modelLattice.getLatticeList(session.GetUserId(), req.Hdid) + if _, ok := list.Gotarr[req.Id]; ok { return } @@ -43,10 +43,10 @@ func (this *apiComp) LatticeReward(session comm.IUserSession, req *pb.UiGameLatt return } // 记录数据 - list.Puzzle[req.Id] = 1 + list.Gotarr[req.Id] = 1 update := make(map[string]interface{}, 0) - update["puzzle"] = list.Puzzle - this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度 + update["gotarr"] = list.Gotarr + this.module.modelLattice.modifyLatticeListByObjId(session.GetUserId(), update) // 修改进度 } session.SendMsg(string(this.module.GetType()), "latticereward", &pb.UiGameLatticeRewardResp{ diff --git a/modules/uigame/api_puzzlegrid.go b/modules/uigame/api_puzzlegrid.go index 66dbf94d8..542c271eb 100644 --- a/modules/uigame/api_puzzlegrid.go +++ b/modules/uigame/api_puzzlegrid.go @@ -24,28 +24,34 @@ func (this *apiComp) PuzzleGrid(session comm.IUserSession, req *pb.UiGamePuzzleG return // 参数校验失败直接返回 } var ( - consum *cfg.Gameatn // 获取消耗 + atno []*pb.UserAtno ) list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid) if _, ok := list.Puzzle[req.Grid]; ok { // 重复拼图 return } + // 校验消耗 - if conf, err := this.module.configure.GetPuzzleConsumConf(); err != nil { - consum = &cfg.Gameatn{ - A: conf.Itemget.A, - T: conf.Itemget.T, - N: 1, + if conf, err := this.module.configure.GetPuzzleConsumConf(); err == nil { + if conf.Cost.N > 0 { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.Cost}, true); errdata != nil { + return + } + } + if conf.Itemget.N > 0 { + if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{conf.Itemget}, true); errdata != nil { + return + } } - } - if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{consum}, true); errdata != nil { - return } list.Puzzle[req.Grid] = 1 update := make(map[string]interface{}, 0) update["puzzle"] = list.Puzzle - this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度 - session.SendMsg(string(this.module.GetType()), "puzzlegrid", &pb.UiGamePuzzleGridResp{Data: list}) + this.module.modelPuzzle.modifyPuzzleListByObjId(session.GetUserId(), update) // 修改进度 + session.SendMsg(string(this.module.GetType()), "puzzlegrid", &pb.UiGamePuzzleGridResp{ + Data: list, + Atno: atno, + }) return } diff --git a/modules/uigame/api_puzzlereward.go b/modules/uigame/api_puzzlereward.go index 04b7baddd..c0ec2a8be 100644 --- a/modules/uigame/api_puzzlereward.go +++ b/modules/uigame/api_puzzlereward.go @@ -41,7 +41,7 @@ func (this *apiComp) PuzzleReward(session comm.IUserSession, req *pb.UiGamePuzzl list.Gotarr[req.PuzzleId] = 1 update := make(map[string]interface{}, 0) update["gotarr"] = list.Gotarr - this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度 + this.module.modelPuzzle.modifyPuzzleListByObjId(session.GetUserId(), update) // 修改进度 } session.SendMsg(string(this.module.GetType()), "puzzlereward", &pb.UiGamePuzzleRewardResp{ diff --git a/modules/uigame/model_lattice.go b/modules/uigame/model_lattice.go index de838f918..83391278d 100644 --- a/modules/uigame/model_lattice.go +++ b/modules/uigame/model_lattice.go @@ -50,3 +50,7 @@ func (this *modelLattice) getLatticeList(uid string, hid string) (result *pb.DBL err = nil return result, err } + +func (this *modelLattice) modifyLatticeListByObjId(uid string, data map[string]interface{}) error { + return this.Change(uid, data) +} diff --git a/pb/uigame_db.pb.go b/pb/uigame_db.pb.go index b4b5e8bcd..1bf0d9e74 100644 --- a/pb/uigame_db.pb.go +++ b/pb/uigame_db.pb.go @@ -267,6 +267,102 @@ func (x *DBLatticeData) GetTotal() int32 { return 0 } +// 矿工 +type DBMinerData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` + Hdoid string `protobuf:"bytes,3,opt,name=hdoid,proto3" json:"hdoid"` // 活动唯一id + Gotarr map[int32]int32 `protobuf:"bytes,4,rep,name=gotarr,proto3" json:"gotarr" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 进度 + Lasttime int64 `protobuf:"varint,6,opt,name=lasttime,proto3" json:"lasttime"` + Val int32 `protobuf:"varint,7,opt,name=val,proto3" json:"val"` // 今天获得N次抓取机会 + BReward bool `protobuf:"varint,8,opt,name=bReward,proto3" json:"bReward"` +} + +func (x *DBMinerData) Reset() { + *x = DBMinerData{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_db_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBMinerData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBMinerData) ProtoMessage() {} + +func (x *DBMinerData) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_db_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 DBMinerData.ProtoReflect.Descriptor instead. +func (*DBMinerData) Descriptor() ([]byte, []int) { + return file_uigame_uigame_db_proto_rawDescGZIP(), []int{3} +} + +func (x *DBMinerData) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBMinerData) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBMinerData) GetHdoid() string { + if x != nil { + return x.Hdoid + } + return "" +} + +func (x *DBMinerData) GetGotarr() map[int32]int32 { + if x != nil { + return x.Gotarr + } + return nil +} + +func (x *DBMinerData) GetLasttime() int64 { + if x != nil { + return x.Lasttime + } + return 0 +} + +func (x *DBMinerData) GetVal() int32 { + if x != nil { + return x.Val + } + return 0 +} + +func (x *DBMinerData) GetBReward() bool { + if x != nil { + return x.BReward + } + return false +} + var File_uigame_uigame_db_proto protoreflect.FileDescriptor var file_uigame_uigame_db_proto_rawDesc = []byte{ @@ -323,8 +419,24 @@ 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, 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, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 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 ( @@ -339,29 +451,32 @@ func file_uigame_uigame_db_proto_rawDescGZIP() []byte { return file_uigame_uigame_db_proto_rawDescData } -var file_uigame_uigame_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_uigame_uigame_db_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_uigame_uigame_db_proto_goTypes = []interface{}{ (*DBPuzzleData)(nil), // 0: DBPuzzleData (*LatticeData)(nil), // 1: LatticeData (*DBLatticeData)(nil), // 2: DBLatticeData - nil, // 3: DBPuzzleData.GotarrEntry - nil, // 4: DBPuzzleData.PuzzleEntry - nil, // 5: LatticeData.DataEntry - nil, // 6: DBLatticeData.GotarrEntry - nil, // 7: DBLatticeData.LatticeEntry + (*DBMinerData)(nil), // 3: DBMinerData + nil, // 4: DBPuzzleData.GotarrEntry + nil, // 5: DBPuzzleData.PuzzleEntry + nil, // 6: LatticeData.DataEntry + nil, // 7: DBLatticeData.GotarrEntry + nil, // 8: DBLatticeData.LatticeEntry + nil, // 9: DBMinerData.GotarrEntry } var file_uigame_uigame_db_proto_depIdxs = []int32{ - 3, // 0: DBPuzzleData.gotarr:type_name -> DBPuzzleData.GotarrEntry - 4, // 1: DBPuzzleData.puzzle:type_name -> DBPuzzleData.PuzzleEntry - 5, // 2: LatticeData.data:type_name -> LatticeData.DataEntry - 6, // 3: DBLatticeData.gotarr:type_name -> DBLatticeData.GotarrEntry - 7, // 4: DBLatticeData.lattice:type_name -> DBLatticeData.LatticeEntry - 1, // 5: DBLatticeData.LatticeEntry.value:type_name -> LatticeData - 6, // [6:6] is the sub-list for method output_type - 6, // [6:6] is the sub-list for method input_type - 6, // [6:6] is the sub-list for extension type_name - 6, // [6:6] is the sub-list for extension extendee - 0, // [0:6] is the sub-list for field type_name + 4, // 0: DBPuzzleData.gotarr:type_name -> DBPuzzleData.GotarrEntry + 5, // 1: DBPuzzleData.puzzle:type_name -> DBPuzzleData.PuzzleEntry + 6, // 2: LatticeData.data:type_name -> LatticeData.DataEntry + 7, // 3: DBLatticeData.gotarr:type_name -> DBLatticeData.GotarrEntry + 8, // 4: DBLatticeData.lattice:type_name -> DBLatticeData.LatticeEntry + 9, // 5: DBMinerData.gotarr:type_name -> DBMinerData.GotarrEntry + 1, // 6: DBLatticeData.LatticeEntry.value:type_name -> LatticeData + 7, // [7:7] is the sub-list for method output_type + 7, // [7:7] is the sub-list for method input_type + 7, // [7:7] is the sub-list for extension type_name + 7, // [7:7] is the sub-list for extension extendee + 0, // [0:7] is the sub-list for field type_name } func init() { file_uigame_uigame_db_proto_init() } @@ -406,6 +521,18 @@ func file_uigame_uigame_db_proto_init() { return nil } } + file_uigame_uigame_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBMinerData); 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{ @@ -413,7 +540,7 @@ func file_uigame_uigame_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_uigame_uigame_db_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/uigame_msg.pb.go b/pb/uigame_msg.pb.go index 8014703cb..7c841d5bb 100644 --- a/pb/uigame_msg.pb.go +++ b/pb/uigame_msg.pb.go @@ -704,6 +704,364 @@ func (x *UiGameLatticeRewardResp) GetAtno() []*UserAtno { return nil } +////////////矿工 +type UiGameGetMinerReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 活动ID +} + +func (x *UiGameGetMinerReq) Reset() { + *x = UiGameGetMinerReq{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameGetMinerReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameGetMinerReq) ProtoMessage() {} + +func (x *UiGameGetMinerReq) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_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 UiGameGetMinerReq.ProtoReflect.Descriptor instead. +func (*UiGameGetMinerReq) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{13} +} + +func (x *UiGameGetMinerReq) GetHdid() string { + if x != nil { + return x.Hdid + } + return "" +} + +// 获取活动列表 +type UiGameGetMinerResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBMinerData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *UiGameGetMinerResp) Reset() { + *x = UiGameGetMinerResp{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameGetMinerResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameGetMinerResp) ProtoMessage() {} + +func (x *UiGameGetMinerResp) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_msg_proto_msgTypes[14] + 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 UiGameGetMinerResp.ProtoReflect.Descriptor instead. +func (*UiGameGetMinerResp) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{14} +} + +func (x *UiGameGetMinerResp) GetData() *DBMinerData { + if x != nil { + return x.Data + } + return nil +} + +type UiGameMinerKeyReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 拼图活动ID + Cid int32 `protobuf:"varint,2,opt,name=cid,proto3" json:"cid"` +} + +func (x *UiGameMinerKeyReq) Reset() { + *x = UiGameMinerKeyReq{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameMinerKeyReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameMinerKeyReq) ProtoMessage() {} + +func (x *UiGameMinerKeyReq) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_msg_proto_msgTypes[15] + 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 UiGameMinerKeyReq.ProtoReflect.Descriptor instead. +func (*UiGameMinerKeyReq) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{15} +} + +func (x *UiGameMinerKeyReq) GetHdid() string { + if x != nil { + return x.Hdid + } + return "" +} + +func (x *UiGameMinerKeyReq) GetCid() int32 { + if x != nil { + return x.Cid + } + return 0 +} + +type UiGameMinerKeyResp 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 *UiGameMinerKeyResp) Reset() { + *x = UiGameMinerKeyResp{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameMinerKeyResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameMinerKeyResp) ProtoMessage() {} + +func (x *UiGameMinerKeyResp) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_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 UiGameMinerKeyResp.ProtoReflect.Descriptor instead. +func (*UiGameMinerKeyResp) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{16} +} + +func (x *UiGameMinerKeyResp) GetData() *DBMinerData { + if x != nil { + return x.Data + } + return nil +} + +func (x *UiGameMinerKeyResp) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + 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 +} + +func (x *UiGameMinerRewardReq) Reset() { + *x = UiGameMinerRewardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[17] + 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[17] + 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{17} +} + +func (x *UiGameMinerRewardReq) GetHdid() string { + if x != nil { + return x.Hdid + } + return "" +} + +// 获取活动列表 +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[18] + 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[18] + 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{18} +} + +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 + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBMinerData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *UiGameMinerChangePush) Reset() { + *x = UiGameMinerChangePush{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameMinerChangePush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameMinerChangePush) ProtoMessage() {} + +func (x *UiGameMinerChangePush) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_msg_proto_msgTypes[19] + 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 UiGameMinerChangePush.ProtoReflect.Descriptor instead. +func (*UiGameMinerChangePush) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{19} +} + +func (x *UiGameMinerChangePush) GetData() *DBMinerData { + if x != nil { + return x.Data + } + return nil +} + var File_uigame_uigame_msg_proto protoreflect.FileDescriptor var file_uigame_uigame_msg_proto_rawDesc = []byte{ @@ -766,8 +1124,35 @@ var file_uigame_uigame_msg_proto_rawDesc = []byte{ 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 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, + 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x27, 0x0a, 0x11, 0x55, + 0x69, 0x47, 0x61, 0x6d, 0x65, 0x47, 0x65, 0x74, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x68, 0x64, 0x69, 0x64, 0x22, 0x36, 0x0a, 0x12, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x47, 0x65, + 0x74, 0x4d, 0x69, 0x6e, 0x65, 0x72, 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, 0x22, 0x39, 0x0a, 0x11, + 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x52, 0x65, + 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x55, 0x0a, 0x12, 0x55, 0x69, 0x47, 0x61, 0x6d, + 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x4b, 0x65, 0x79, 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, 0x2a, + 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, 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, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -782,7 +1167,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, 13) +var file_uigame_uigame_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 20) var file_uigame_uigame_msg_proto_goTypes = []interface{}{ (*UiGameGetPuzzleReq)(nil), // 0: UiGameGetPuzzleReq (*UiGameGetPuzzleResp)(nil), // 1: UiGameGetPuzzleResp @@ -797,27 +1182,41 @@ var file_uigame_uigame_msg_proto_goTypes = []interface{}{ (*UiGameLatticeGridResp)(nil), // 10: UiGameLatticeGridResp (*UiGameLatticeRewardReq)(nil), // 11: UiGameLatticeRewardReq (*UiGameLatticeRewardResp)(nil), // 12: UiGameLatticeRewardResp - (*DBPuzzleData)(nil), // 13: DBPuzzleData - (*UserAtno)(nil), // 14: UserAtno - (*DBLatticeData)(nil), // 15: DBLatticeData + (*UiGameGetMinerReq)(nil), // 13: UiGameGetMinerReq + (*UiGameGetMinerResp)(nil), // 14: UiGameGetMinerResp + (*UiGameMinerKeyReq)(nil), // 15: UiGameMinerKeyReq + (*UiGameMinerKeyResp)(nil), // 16: UiGameMinerKeyResp + (*UiGameMinerRewardReq)(nil), // 17: UiGameMinerRewardReq + (*UiGameMinerRewardResp)(nil), // 18: UiGameMinerRewardResp + (*UiGameMinerChangePush)(nil), // 19: UiGameMinerChangePush + (*DBPuzzleData)(nil), // 20: DBPuzzleData + (*UserAtno)(nil), // 21: UserAtno + (*DBLatticeData)(nil), // 22: DBLatticeData + (*DBMinerData)(nil), // 23: DBMinerData } var file_uigame_uigame_msg_proto_depIdxs = []int32{ - 13, // 0: UiGameGetPuzzleResp.data:type_name -> DBPuzzleData - 13, // 1: UiGamePuzzleGridResp.data:type_name -> DBPuzzleData - 14, // 2: UiGamePuzzleGridResp.atno:type_name -> UserAtno - 13, // 3: UiGamePuzzleRewardResp.data:type_name -> DBPuzzleData - 14, // 4: UiGamePuzzleRewardResp.atno:type_name -> UserAtno - 13, // 5: UiGamePuzzleChangePush.data:type_name -> DBPuzzleData - 15, // 6: UiGameGetLatticeResp.data:type_name -> DBLatticeData - 15, // 7: UiGameLatticeGridResp.data:type_name -> DBLatticeData - 14, // 8: UiGameLatticeGridResp.atno:type_name -> UserAtno - 15, // 9: UiGameLatticeRewardResp.data:type_name -> DBLatticeData - 14, // 10: UiGameLatticeRewardResp.atno:type_name -> UserAtno - 11, // [11:11] is the sub-list for method output_type - 11, // [11:11] is the sub-list for method input_type - 11, // [11:11] is the sub-list for extension type_name - 11, // [11:11] is the sub-list for extension extendee - 0, // [0:11] is the sub-list for field type_name + 20, // 0: UiGameGetPuzzleResp.data:type_name -> DBPuzzleData + 20, // 1: UiGamePuzzleGridResp.data:type_name -> DBPuzzleData + 21, // 2: UiGamePuzzleGridResp.atno:type_name -> UserAtno + 20, // 3: UiGamePuzzleRewardResp.data:type_name -> DBPuzzleData + 21, // 4: UiGamePuzzleRewardResp.atno:type_name -> UserAtno + 20, // 5: UiGamePuzzleChangePush.data:type_name -> DBPuzzleData + 22, // 6: UiGameGetLatticeResp.data:type_name -> DBLatticeData + 22, // 7: UiGameLatticeGridResp.data:type_name -> DBLatticeData + 21, // 8: UiGameLatticeGridResp.atno:type_name -> UserAtno + 22, // 9: UiGameLatticeRewardResp.data:type_name -> DBLatticeData + 21, // 10: UiGameLatticeRewardResp.atno:type_name -> UserAtno + 23, // 11: UiGameGetMinerResp.data:type_name -> DBMinerData + 23, // 12: UiGameMinerKeyResp.data:type_name -> DBMinerData + 21, // 13: UiGameMinerKeyResp.atno:type_name -> UserAtno + 23, // 14: UiGameMinerRewardResp.data:type_name -> DBMinerData + 21, // 15: UiGameMinerRewardResp.atno:type_name -> UserAtno + 23, // 16: UiGameMinerChangePush.data:type_name -> DBMinerData + 17, // [17:17] is the sub-list for method output_type + 17, // [17:17] is the sub-list for method input_type + 17, // [17:17] is the sub-list for extension type_name + 17, // [17:17] is the sub-list for extension extendee + 0, // [0:17] is the sub-list for field type_name } func init() { file_uigame_uigame_msg_proto_init() } @@ -984,6 +1383,90 @@ func file_uigame_uigame_msg_proto_init() { return nil } } + file_uigame_uigame_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameGetMinerReq); 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[14].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameGetMinerResp); 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[15].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameMinerKeyReq); 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[16].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameMinerKeyResp); 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[17].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[18].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[19].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameMinerChangePush); 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{ @@ -991,7 +1474,7 @@ func file_uigame_uigame_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_uigame_uigame_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 13, + NumMessages: 20, NumExtensions: 0, NumServices: 0, },