diff --git a/comm/const.go b/comm/const.go index 278b0af92..379de271b 100644 --- a/comm/const.go +++ b/comm/const.go @@ -345,6 +345,8 @@ const ( TablekfPushGiftbag = "pushgiftbag" TableGamePuzzle = "puzzle" + + TableGameLattice = "lattice" ) // RPC服务接口定义处 diff --git a/modules/uigame/api_getlattice.go b/modules/uigame/api_getlattice.go new file mode 100644 index 000000000..88fa1eb30 --- /dev/null +++ b/modules/uigame/api_getlattice.go @@ -0,0 +1,61 @@ +package uigame + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" +) + +//参数校验 +func (this *apiComp) GetLatticeCheck(session comm.IUserSession, req *pb.UiGameGetLatticeReq) (errdata *pb.ErrorData) { + + return +} + +func (this *apiComp) GetLattice(session comm.IUserSession, req *pb.UiGameGetLatticeReq) (errdata *pb.ErrorData) { + if errdata = this.GetLatticeCheck(session, req); errdata != nil { + return // 参数校验失败直接返回 + } + var ( + activity *pb.DBHuodong + err error + hdData *pb.DBLatticeData // 玩家的活动数据 + update map[string]interface{} // + ) + curTime := configure.Now().Unix() + if activity, err = this.module.ModuleActivity.GetHdInfoByHdId(req.Hdid); err != nil { // 活动不存在 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ActivityInvalid, + Title: pb.ErrorCode_ActivityInvalid.ToString(), + } + return + } + if activity.Stime > curTime || curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ActivityNotIntime, + Title: pb.ErrorCode_ActivityNotIntime.ToString(), + } + return + } + + // 获取玩家活动数据 + hdData, _ = this.module.modelLattice.getLatticeList(session.GetUserId(), activity.Id) + if e, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { + + if conf, err := this.module.configure.GetLatticeConsumConf(); err != nil { + if conf.Getmax > hdData.Val { // 超过今日上限 + if e.ConsumPs/conf.Usepawer >= hdData.Val { + hdData.Val = e.ConsumPs / conf.Usepawer + if conf.Getmax < hdData.Val { // 超过今日上限 + hdData.Val = conf.Getmax + update["val"] = hdData.Val + this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度 + } + } + } + } + } + + session.SendMsg(string(this.module.GetType()), "getlattice", &pb.UiGameGetLatticeResp{Data: hdData}) + return +} diff --git a/modules/uigame/api_puzzlereward.go b/modules/uigame/api_puzzlereward.go index 18fbd4d57..0854ed146 100644 --- a/modules/uigame/api_puzzlereward.go +++ b/modules/uigame/api_puzzlereward.go @@ -17,8 +17,36 @@ func (this *apiComp) PuzzleReward(session comm.IUserSession, req *pb.UiGamePuzzl return // 参数校验失败直接返回 } + var ( + atno []*pb.UserAtno + ) list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid) + if conf, err := this.module.configure.GetPuzzleConf(req.PuzzleId); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } else { + list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid) + if _, ok := list.Puzzle[req.PuzzleId]; ok { // 重复拼图 + return + } - session.SendMsg(string(this.module.GetType()), "puzzlereward", &pb.UiGamePuzzleRewardResp{Data: list}) + if errdata, atno = this.module.DispenseAtno(session, conf.Puzzleward, true); errdata != nil { + return + } + // 记录数据 + list.Puzzle[req.PuzzleId] = 1 + update := make(map[string]interface{}, 0) + update["puzzle"] = list.Puzzle + this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度 + } + + session.SendMsg(string(this.module.GetType()), "puzzlereward", &pb.UiGamePuzzleRewardResp{ + Data: list, + Atno: atno, + }) return } diff --git a/modules/uigame/comp_configure.go b/modules/uigame/comp_configure.go index 350af1c97..2f35ef1e9 100644 --- a/modules/uigame/comp_configure.go +++ b/modules/uigame/comp_configure.go @@ -81,3 +81,18 @@ func (this *configureComp) GetPuzzleConsumConf() (conf *cfg.GameUiGameConsumData this.module.Errorf("GetPuzzleConf conf not found key :puzzle") return } + +func (this *configureComp) GetLatticeConsumConf() (conf *cfg.GameUiGameConsumData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_consum); err == nil { + if configure, ok := v.(*cfg.GameUiGameConsum); ok { + if conf = configure.Get(2); conf != nil { + return + } + } + } + this.module.Errorf("GetLatticeConsumConf conf not found key :puzzle") + return +} diff --git a/modules/uigame/model_lattice.go b/modules/uigame/model_lattice.go new file mode 100644 index 000000000..c61a6dc6e --- /dev/null +++ b/modules/uigame/model_lattice.go @@ -0,0 +1,52 @@ +package uigame + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + + "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +type modelLattice struct { + modules.MCompModel + module *UiGame +} + +func (this *modelLattice) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.TableName = string(comm.TableGameLattice) + err = this.MCompModel.Init(service, module, comp, options) + this.module = module.(*UiGame) + // uid 创建索引 + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) + return +} + +func (this *modelLattice) getLatticeList(uid string, hid string) (result *pb.DBLatticeData, err error) { + result = &pb.DBLatticeData{} + if err = this.Get(uid, result); err != nil { + if mgo.MongodbNil == err { + result = &pb.DBLatticeData{ + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Hdoid: hid, + Gotarr: map[int32]int32{}, + Lattice: map[int32]*pb.LatticeData{}, + Lasttime: 0, + Val: 0, + Total: 0, + } + err = nil + this.module.modelPuzzle.Add(uid, result) + } + return + } + err = nil + return result, err +} diff --git a/modules/uigame/model_uigame.go b/modules/uigame/model_puzzle.go similarity index 90% rename from modules/uigame/model_uigame.go rename to modules/uigame/model_puzzle.go index d68d35d20..d3511d76e 100644 --- a/modules/uigame/model_uigame.go +++ b/modules/uigame/model_puzzle.go @@ -50,6 +50,6 @@ func (this *modelPuzzle) getPuzzleList(uid string, hid string) (result *pb.DBPuz return result, err } -func (this *modelPuzzle) modifyVikingDataByObjId(uid string, data map[string]interface{}) error { - return this.Change(uid, data) -} +// func (this *modelPuzzle) modifyVikingDataByObjId(uid string, data map[string]interface{}) error { +// return this.Change(uid, data) +// } diff --git a/modules/uigame/module.go b/modules/uigame/module.go index c84d57e22..3924d1697 100644 --- a/modules/uigame/module.go +++ b/modules/uigame/module.go @@ -10,10 +10,11 @@ import ( type UiGame struct { modules.ModuleBase - modelPuzzle *modelPuzzle - api *apiComp - configure *configureComp - service base.IRPCXService + modelPuzzle *modelPuzzle + api *apiComp + configure *configureComp + service base.IRPCXService + modelLattice *modelLattice } func NewModule() core.IModule { @@ -34,6 +35,7 @@ func (this *UiGame) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.modelPuzzle = this.RegisterComp(new(modelPuzzle)).(*modelPuzzle) + this.modelLattice = this.RegisterComp(new(modelLattice)).(*modelLattice) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } diff --git a/pb/uigame_db.pb.go b/pb/uigame_db.pb.go index 4613378e7..b4b5e8bcd 100644 --- a/pb/uigame_db.pb.go +++ b/pb/uigame_db.pb.go @@ -116,6 +116,157 @@ func (x *DBPuzzleData) GetVal() int32 { return 0 } +// 小关的数据 +type LatticeData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data map[int32]int32 `protobuf:"bytes,1,rep,name=data,proto3" json:"data" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 迷宫数据 +} + +func (x *LatticeData) Reset() { + *x = LatticeData{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_db_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LatticeData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LatticeData) ProtoMessage() {} + +func (x *LatticeData) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_db_proto_msgTypes[1] + 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 LatticeData.ProtoReflect.Descriptor instead. +func (*LatticeData) Descriptor() ([]byte, []int) { + return file_uigame_uigame_db_proto_rawDescGZIP(), []int{1} +} + +func (x *LatticeData) GetData() map[int32]int32 { + if x != nil { + return x.Data + } + return nil +} + +type DBLatticeData 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"` // 奖励领取状态 + Lattice map[int32]*LatticeData `protobuf:"bytes,5,rep,name=lattice,proto3" json:"lattice" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,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"` // 当前第几层 + Total int32 `protobuf:"varint,8,opt,name=total,proto3" json:"total"` // 总的层数 +} + +func (x *DBLatticeData) Reset() { + *x = DBLatticeData{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_db_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBLatticeData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBLatticeData) ProtoMessage() {} + +func (x *DBLatticeData) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_db_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 DBLatticeData.ProtoReflect.Descriptor instead. +func (*DBLatticeData) Descriptor() ([]byte, []int) { + return file_uigame_uigame_db_proto_rawDescGZIP(), []int{2} +} + +func (x *DBLatticeData) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBLatticeData) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBLatticeData) GetHdoid() string { + if x != nil { + return x.Hdoid + } + return "" +} + +func (x *DBLatticeData) GetGotarr() map[int32]int32 { + if x != nil { + return x.Gotarr + } + return nil +} + +func (x *DBLatticeData) GetLattice() map[int32]*LatticeData { + if x != nil { + return x.Lattice + } + return nil +} + +func (x *DBLatticeData) GetLasttime() int64 { + if x != nil { + return x.Lasttime + } + return 0 +} + +func (x *DBLatticeData) GetVal() int32 { + if x != nil { + return x.Val + } + return 0 +} + +func (x *DBLatticeData) GetTotal() int32 { + if x != nil { + return x.Total + } + return 0 +} + var File_uigame_uigame_db_proto protoreflect.FileDescriptor var file_uigame_uigame_db_proto_rawDesc = []byte{ @@ -141,8 +292,39 @@ var file_uigame_uigame_db_proto_rawDesc = []byte{ 0x1a, 0x39, 0x0a, 0x0b, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 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, 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, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x72, 0x0a, 0x0b, 0x4c, + 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2a, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x4c, 0x61, 0x74, 0x74, 0x69, + 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 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, 0x22, + 0xfb, 0x02, 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, + 0x28, 0x09, 0x52, 0x05, 0x68, 0x64, 0x6f, 0x69, 0x64, 0x12, 0x32, 0x0a, 0x06, 0x67, 0x6f, 0x74, + 0x61, 0x72, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x4c, 0x61, + 0x74, 0x74, 0x69, 0x63, 0x65, 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, 0x35, 0x0a, + 0x07, 0x6c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, + 0x2e, 0x44, 0x42, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x4c, + 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6c, 0x61, 0x74, + 0x74, 0x69, 0x63, 0x65, 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, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 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, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -157,20 +339,29 @@ 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, 3) +var file_uigame_uigame_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_uigame_uigame_db_proto_goTypes = []interface{}{ - (*DBPuzzleData)(nil), // 0: DBPuzzleData - nil, // 1: DBPuzzleData.GotarrEntry - nil, // 2: DBPuzzleData.PuzzleEntry + (*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 } var file_uigame_uigame_db_proto_depIdxs = []int32{ - 1, // 0: DBPuzzleData.gotarr:type_name -> DBPuzzleData.GotarrEntry - 2, // 1: DBPuzzleData.puzzle:type_name -> DBPuzzleData.PuzzleEntry - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 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 } func init() { file_uigame_uigame_db_proto_init() } @@ -191,6 +382,30 @@ func file_uigame_uigame_db_proto_init() { return nil } } + file_uigame_uigame_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LatticeData); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_uigame_uigame_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBLatticeData); 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{ @@ -198,7 +413,7 @@ func file_uigame_uigame_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_uigame_uigame_db_proto_rawDesc, NumEnums: 0, - NumMessages: 3, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/uigame_msg.pb.go b/pb/uigame_msg.pb.go index 0d4d7220d..b23d09b6f 100644 --- a/pb/uigame_msg.pb.go +++ b/pb/uigame_msg.pb.go @@ -338,6 +338,325 @@ func (x *UiGamePuzzleRewardResp) GetAtno() []*UserAtno { return nil } +///////////////////// +type UiGameGetLatticeReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` +} + +func (x *UiGameGetLatticeReq) Reset() { + *x = UiGameGetLatticeReq{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameGetLatticeReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameGetLatticeReq) ProtoMessage() {} + +func (x *UiGameGetLatticeReq) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_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 UiGameGetLatticeReq.ProtoReflect.Descriptor instead. +func (*UiGameGetLatticeReq) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{6} +} + +func (x *UiGameGetLatticeReq) GetHdid() string { + if x != nil { + return x.Hdid + } + return "" +} + +// 获取活动列表 +type UiGameGetLatticeResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBLatticeData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *UiGameGetLatticeResp) Reset() { + *x = UiGameGetLatticeResp{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameGetLatticeResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameGetLatticeResp) ProtoMessage() {} + +func (x *UiGameGetLatticeResp) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_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 UiGameGetLatticeResp.ProtoReflect.Descriptor instead. +func (*UiGameGetLatticeResp) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{7} +} + +func (x *UiGameGetLatticeResp) GetData() *DBLatticeData { + if x != nil { + return x.Data + } + return nil +} + +// 拼图 +type UiGameLatticeGridReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` + Grid int32 `protobuf:"varint,2,opt,name=grid,proto3" json:"grid"` // 格子ID +} + +func (x *UiGameLatticeGridReq) Reset() { + *x = UiGameLatticeGridReq{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameLatticeGridReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameLatticeGridReq) ProtoMessage() {} + +func (x *UiGameLatticeGridReq) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_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 UiGameLatticeGridReq.ProtoReflect.Descriptor instead. +func (*UiGameLatticeGridReq) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{8} +} + +func (x *UiGameLatticeGridReq) GetHdid() string { + if x != nil { + return x.Hdid + } + return "" +} + +func (x *UiGameLatticeGridReq) GetGrid() int32 { + if x != nil { + return x.Grid + } + return 0 +} + +type UiGameLatticeGridResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBLatticeData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` + Atno []*UserAtno `protobuf:"bytes,2,rep,name=atno,proto3" json:"atno"` // 奖励 +} + +func (x *UiGameLatticeGridResp) Reset() { + *x = UiGameLatticeGridResp{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameLatticeGridResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameLatticeGridResp) ProtoMessage() {} + +func (x *UiGameLatticeGridResp) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_msg_proto_msgTypes[9] + 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 UiGameLatticeGridResp.ProtoReflect.Descriptor instead. +func (*UiGameLatticeGridResp) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{9} +} + +func (x *UiGameLatticeGridResp) GetData() *DBLatticeData { + if x != nil { + return x.Data + } + return nil +} + +func (x *UiGameLatticeGridResp) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + return nil +} + +// 拼图领取奖励 +type UiGameLatticeRewardReq 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 *UiGameLatticeRewardReq) Reset() { + *x = UiGameLatticeRewardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameLatticeRewardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameLatticeRewardReq) ProtoMessage() {} + +func (x *UiGameLatticeRewardReq) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_msg_proto_msgTypes[10] + 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 UiGameLatticeRewardReq.ProtoReflect.Descriptor instead. +func (*UiGameLatticeRewardReq) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{10} +} + +func (x *UiGameLatticeRewardReq) GetHdid() string { + if x != nil { + return x.Hdid + } + return "" +} + +func (x *UiGameLatticeRewardReq) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +// 获取活动列表 +type UiGameLatticeRewardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBLatticeData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` + Atno []*UserAtno `protobuf:"bytes,2,rep,name=atno,proto3" json:"atno"` // 奖励 +} + +func (x *UiGameLatticeRewardResp) Reset() { + *x = UiGameLatticeRewardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameLatticeRewardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameLatticeRewardResp) ProtoMessage() {} + +func (x *UiGameLatticeRewardResp) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_msg_proto_msgTypes[11] + 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 UiGameLatticeRewardResp.ProtoReflect.Descriptor instead. +func (*UiGameLatticeRewardResp) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{11} +} + +func (x *UiGameLatticeRewardResp) GetData() *DBLatticeData { + if x != nil { + return x.Data + } + return nil +} + +func (x *UiGameLatticeRewardResp) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + return nil +} + var File_uigame_uigame_msg_proto protoreflect.FileDescriptor var file_uigame_uigame_msg_proto_rawDesc = []byte{ @@ -370,8 +689,34 @@ var file_uigame_uigame_msg_proto_rawDesc = []byte{ 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 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, + 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, + 0x29, 0x0a, 0x13, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x74, 0x74, + 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x14, 0x55, 0x69, + 0x47, 0x61, 0x6d, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 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, 0x22, 0x3e, 0x0a, 0x14, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, + 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x47, 0x72, 0x69, 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, 0x12, 0x0a, 0x04, 0x67, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x04, 0x67, 0x72, 0x69, 0x64, 0x22, 0x5a, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, + 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x47, 0x72, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 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, 0x22, 0x3c, 0x0a, 0x16, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x61, 0x74, 0x74, + 0x69, 0x63, 0x65, 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, 0x5c, 0x0a, 0x17, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, + 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x64, + 0x61, 0x74, 0x61, 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, } var ( @@ -386,28 +731,40 @@ 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, 6) +var file_uigame_uigame_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12) var file_uigame_uigame_msg_proto_goTypes = []interface{}{ - (*UiGameGetPuzzleReq)(nil), // 0: UiGameGetPuzzleReq - (*UiGameGetPuzzleResp)(nil), // 1: UiGameGetPuzzleResp - (*UiGamePuzzleGridReq)(nil), // 2: UiGamePuzzleGridReq - (*UiGamePuzzleGridResp)(nil), // 3: UiGamePuzzleGridResp - (*UiGamePuzzleRewardReq)(nil), // 4: UiGamePuzzleRewardReq - (*UiGamePuzzleRewardResp)(nil), // 5: UiGamePuzzleRewardResp - (*DBPuzzleData)(nil), // 6: DBPuzzleData - (*UserAtno)(nil), // 7: UserAtno + (*UiGameGetPuzzleReq)(nil), // 0: UiGameGetPuzzleReq + (*UiGameGetPuzzleResp)(nil), // 1: UiGameGetPuzzleResp + (*UiGamePuzzleGridReq)(nil), // 2: UiGamePuzzleGridReq + (*UiGamePuzzleGridResp)(nil), // 3: UiGamePuzzleGridResp + (*UiGamePuzzleRewardReq)(nil), // 4: UiGamePuzzleRewardReq + (*UiGamePuzzleRewardResp)(nil), // 5: UiGamePuzzleRewardResp + (*UiGameGetLatticeReq)(nil), // 6: UiGameGetLatticeReq + (*UiGameGetLatticeResp)(nil), // 7: UiGameGetLatticeResp + (*UiGameLatticeGridReq)(nil), // 8: UiGameLatticeGridReq + (*UiGameLatticeGridResp)(nil), // 9: UiGameLatticeGridResp + (*UiGameLatticeRewardReq)(nil), // 10: UiGameLatticeRewardReq + (*UiGameLatticeRewardResp)(nil), // 11: UiGameLatticeRewardResp + (*DBPuzzleData)(nil), // 12: DBPuzzleData + (*UserAtno)(nil), // 13: UserAtno + (*DBLatticeData)(nil), // 14: DBLatticeData } var file_uigame_uigame_msg_proto_depIdxs = []int32{ - 6, // 0: UiGameGetPuzzleResp.data:type_name -> DBPuzzleData - 6, // 1: UiGamePuzzleGridResp.data:type_name -> DBPuzzleData - 7, // 2: UiGamePuzzleGridResp.atno:type_name -> UserAtno - 6, // 3: UiGamePuzzleRewardResp.data:type_name -> DBPuzzleData - 7, // 4: UiGamePuzzleRewardResp.atno:type_name -> UserAtno - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 12, // 0: UiGameGetPuzzleResp.data:type_name -> DBPuzzleData + 12, // 1: UiGamePuzzleGridResp.data:type_name -> DBPuzzleData + 13, // 2: UiGamePuzzleGridResp.atno:type_name -> UserAtno + 12, // 3: UiGamePuzzleRewardResp.data:type_name -> DBPuzzleData + 13, // 4: UiGamePuzzleRewardResp.atno:type_name -> UserAtno + 14, // 5: UiGameGetLatticeResp.data:type_name -> DBLatticeData + 14, // 6: UiGameLatticeGridResp.data:type_name -> DBLatticeData + 13, // 7: UiGameLatticeGridResp.atno:type_name -> UserAtno + 14, // 8: UiGameLatticeRewardResp.data:type_name -> DBLatticeData + 13, // 9: UiGameLatticeRewardResp.atno:type_name -> UserAtno + 10, // [10:10] is the sub-list for method output_type + 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_uigame_uigame_msg_proto_init() } @@ -490,6 +847,78 @@ func file_uigame_uigame_msg_proto_init() { return nil } } + file_uigame_uigame_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameGetLatticeReq); 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[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameGetLatticeResp); 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[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameLatticeGridReq); 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[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameLatticeGridResp); 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[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameLatticeRewardReq); 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[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameLatticeRewardResp); 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{ @@ -497,7 +926,7 @@ func file_uigame_uigame_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_uigame_uigame_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 6, + NumMessages: 12, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.PassCheckExp.go b/sys/configure/structs/Game.PassCheckExp.go new file mode 100644 index 000000000..44f0abbab --- /dev/null +++ b/sys/configure/structs/Game.PassCheckExp.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GamePassCheckExp struct { + _dataMap map[int32]*GamePassCheckExpData + _dataList []*GamePassCheckExpData +} + +func NewGamePassCheckExp(_buf []map[string]interface{}) (*GamePassCheckExp, error) { + _dataList := make([]*GamePassCheckExpData, 0, len(_buf)) + dataMap := make(map[int32]*GamePassCheckExpData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePassCheckExpData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GamePassCheckExp{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePassCheckExp) GetDataMap() map[int32]*GamePassCheckExpData { + return table._dataMap +} + +func (table *GamePassCheckExp) GetDataList() []*GamePassCheckExpData { + return table._dataList +} + +func (table *GamePassCheckExp) Get(key int32) *GamePassCheckExpData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PassCheckExpData.go b/sys/configure/structs/Game.PassCheckExpData.go new file mode 100644 index 000000000..31e2d3c69 --- /dev/null +++ b/sys/configure/structs/Game.PassCheckExpData.go @@ -0,0 +1,39 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GamePassCheckExpData struct { + Id int32 + Parameter int32 + PasscheckType int32 +} + +const TypeId_GamePassCheckExpData = -1113094548 + +func (*GamePassCheckExpData) GetTypeId() int32 { + return -1113094548 +} + +func (_v *GamePassCheckExpData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["parameter"].(float64); !_ok_ { err = errors.New("parameter error"); return }; _v.Parameter = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["passcheck_type"].(float64); !_ok_ { err = errors.New("passcheck_type error"); return }; _v.PasscheckType = int32(_tempNum_) } + return +} + +func DeserializeGamePassCheckExpData(_buf map[string]interface{}) (*GamePassCheckExpData, error) { + v := &GamePassCheckExpData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.PassCheckTask.go b/sys/configure/structs/Game.PassCheckTask.go new file mode 100644 index 000000000..6a576655f --- /dev/null +++ b/sys/configure/structs/Game.PassCheckTask.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GamePassCheckTask struct { + _dataMap map[int32]*GamePassCheckTaskData + _dataList []*GamePassCheckTaskData +} + +func NewGamePassCheckTask(_buf []map[string]interface{}) (*GamePassCheckTask, error) { + _dataList := make([]*GamePassCheckTaskData, 0, len(_buf)) + dataMap := make(map[int32]*GamePassCheckTaskData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePassCheckTaskData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GamePassCheckTask{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePassCheckTask) GetDataMap() map[int32]*GamePassCheckTaskData { + return table._dataMap +} + +func (table *GamePassCheckTask) GetDataList() []*GamePassCheckTaskData { + return table._dataList +} + +func (table *GamePassCheckTask) Get(key int32) *GamePassCheckTaskData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PassCheckTaskData.go b/sys/configure/structs/Game.PassCheckTaskData.go new file mode 100644 index 000000000..8a128f0e8 --- /dev/null +++ b/sys/configure/structs/Game.PassCheckTaskData.go @@ -0,0 +1,47 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GamePassCheckTaskData struct { + Id int32 + Parameter int32 + PasscheckType int32 + Page int32 + Pro int32 + Text string + Score int32 +} + +const TypeId_GamePassCheckTaskData = 1409433706 + +func (*GamePassCheckTaskData) GetTypeId() int32 { + return 1409433706 +} + +func (_v *GamePassCheckTaskData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["parameter"].(float64); !_ok_ { err = errors.New("parameter error"); return }; _v.Parameter = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["passcheck_type"].(float64); !_ok_ { err = errors.New("passcheck_type error"); return }; _v.PasscheckType = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["page"].(float64); !_ok_ { err = errors.New("page error"); return }; _v.Page = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pro"].(float64); !_ok_ { err = errors.New("pro error"); return }; _v.Pro = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Text error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Text, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) } + return +} + +func DeserializeGamePassCheckTaskData(_buf map[string]interface{}) (*GamePassCheckTaskData, error) { + v := &GamePassCheckTaskData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index c4e7abe68..2a1652dd3 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -107,6 +107,8 @@ type Tables struct { PayGiftpack *GamePayGiftpack WorldBattle *GameWorldBattle PassCheck *GamePassCheck + PassCheckExp *GamePassCheckExp + PassCheckTask *GamePassCheckTask Mail *GameMail CombatLevel *GameCombatLevel CombatManster *GameCombatManster @@ -240,7 +242,6 @@ type Tables struct { UiGameLattice *GameUiGameLattice UiGameMiner *GameUiGameMiner PushGift *GamePushGift - UiGameConsum *GameUiGameConsum } func NewTables(loader JsonLoader) (*Tables, error) { @@ -824,6 +825,18 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.PassCheck, err = NewGamePassCheck(buf) ; err != nil { return nil, err } + if buf, err = loader("game_passcheckexp") ; err != nil { + return nil, err + } + if tables.PassCheckExp, err = NewGamePassCheckExp(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_passchecktask") ; err != nil { + return nil, err + } + if tables.PassCheckTask, err = NewGamePassCheckTask(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_mail") ; err != nil { return nil, err } @@ -1622,11 +1635,5 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.PushGift, err = NewGamePushGift(buf) ; err != nil { return nil, err } - if buf, err = loader("game_uigameconsum") ; err != nil { - return nil, err - } - if tables.UiGameConsum, err = NewGameUiGameConsum(buf) ; err != nil { - return nil, err - } return tables, nil }