diff --git a/comm/const.go b/comm/const.go index e15e45385..7d3c7a80f 100644 --- a/comm/const.go +++ b/comm/const.go @@ -112,6 +112,7 @@ const ( ModuleVenture core.M_Modules = "venture" // ModuleAchieve core.M_Modules = "achieve" //全局成就 ModuleJielong core.M_Modules = "jielong" // + ModuleEntertainment core.M_Modules = "entertainment" // ) // 数据表名定义处 diff --git a/modules/entertainment/module.go b/modules/entertainment/module.go index a152b6056..e45ec6733 100644 --- a/modules/entertainment/module.go +++ b/modules/entertainment/module.go @@ -23,7 +23,7 @@ type Entertainment struct { // 模块名 func (this *Entertainment) GetType() core.M_Modules { - return comm.ModuleDragon + return comm.ModuleEntertainment } // 模块初始化接口 注册用户创建角色事件 @@ -42,11 +42,16 @@ func (this *Entertainment) OnInstallComp() { this.model = this.RegisterComp(new(modelComp)).(*modelComp) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.gameMgr = this.RegisterComp(new(gameMgrComp)).(*gameMgrComp) + //this.xxl = this.RegisterComp(new(MapData)).(*MapData) } func (this *Entertainment) Start() (err error) { if err = this.ModuleBase.Start(); err != nil { return } + + this.xxl = new(MapData) + this.xxl.InitMap() + this.xxl.SwapGirde(1, 0) return } diff --git a/modules/entertainment/xxl_test.go b/modules/entertainment/xxl_test.go index f8f39df68..e9b5d1163 100644 --- a/modules/entertainment/xxl_test.go +++ b/modules/entertainment/xxl_test.go @@ -8,9 +8,6 @@ import ( "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules/entertainment" - "go_dreamfactory/modules/equipment" - "go_dreamfactory/modules/items" - "go_dreamfactory/modules/user" "go_dreamfactory/pb" "go_dreamfactory/services" "go_dreamfactory/sys/configure" @@ -56,23 +53,36 @@ func (this *TestService) InitSys() { } } +var ( + conf = flag.String("conf", "../../bin/conf/worker_1.yaml", "获取需要启动的服务配置文件") //启动服务的Id +) + +type Service struct { + services.ServiceBase +} + +func NewService(ops ...rpcx.Option) core.IService { + s := new(Service) + s.Configure(ops...) + return s +} + func Test_Main(t *testing.T) { - service = newService( - rpcx.SetConfPath("../../bin/conf/worker_1.yaml"), + flag.Parse() + s := NewService( + rpcx.SetConfPath(*conf), + rpcx.SetVersion("1.0.0.0"), ) - service.OnInstallComp( //装备组件 - s_gateComp, //此服务需要接受用户的消息 需要装备网关组件 + s.OnInstallComp( //装备组件 + services.NewGateRouteComp(), //此服务需要接受用户的消息 需要装备网关组件 ) go func() { - lego.Run(service, //运行模块 + lego.Run(s, //运行模块 entertainment.NewModule(), - items.NewModule(), - user.NewModule(), - equipment.NewModule(), ) }() - time.Sleep(time.Second * 2) + time.Sleep(time.Second * 2000) //equipment.CloneEquipment() } @@ -98,3 +108,16 @@ func wordSepNormalizeFunc(f *flag.FlagSet, name string) flag.NormalizedName { } return flag.NormalizedName(name) } + +// 初始化worker需要的一些系统工具 +func (this *Service) InitSys() { + this.ServiceBase.InitSys() + //初始化配置中心系统 每个服务都会用到的就在这个初始化就好 + + //存储系统 + if err := db.OnInit(this.GetSettings().Sys["db"], db.SetServiceId(this.GetTag())); err != nil { + panic(fmt.Sprintf("init sys.db err: %s", err.Error())) + } else { + log.Infof("init sys.db success!") + } +} diff --git a/modules/entertainment/xxlmap.go b/modules/entertainment/xxlmap.go index d6621275c..bbea75346 100644 --- a/modules/entertainment/xxlmap.go +++ b/modules/entertainment/xxlmap.go @@ -3,6 +3,7 @@ package entertainment import ( "crypto/rand" "fmt" + "go_dreamfactory/lego/core" "math/big" ) @@ -23,6 +24,11 @@ type MapData struct { Data map[int32]*Girde // 地图数据 } +func (this *MapData) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.Data = make(map[int32]*Girde, Width*Height) + return +} + // func (this *MapData) init() { // this.Data = make(map[int32]*Girde, Width*Height) // } @@ -50,7 +56,7 @@ func (this *MapData) GetKeyData(key int32) (data *Girde) { // 初始化地图数据 func (this *MapData) InitMap() { this.Data = make(map[int32]*Girde, Width*Height) - for i := 0; i < Width; i++ { + for i := Width - 1; i >= 0; i-- { for j := 0; j < Height; j++ { tmp := GetRandType() key := int32(i*10 + j) @@ -62,14 +68,14 @@ func (this *MapData) InitMap() { Itype: tmp, } // 校验 检查格子的左边的左边 和下边和下下边 - if j-2 > 0 { + if j-2 >= 0 { i1 := this.GetKeyType(int32(i*10 + j - 1)) i2 := this.GetKeyType(int32(i*10 + j - 2)) if i1 == i2 && tmp == i1 { bOk = false } } - if i-2 > 0 { + if i-2 >= 0 { i1 := this.GetKeyType(int32((i-1)*10 + j)) i2 := this.GetKeyType(int32((i-2)*10 + j)) if i1 == i2 && tmp == i1 { @@ -86,11 +92,14 @@ func (this *MapData) InitMap() { } this.Data[key].Itype = tmp } + fmt.Printf("key:%d,x:%d,y:%d,type:%d \n", key, i, j, tmp) } } + + this.Debugf() } -// 交换2个元素 +// 交换2个元素(参数 id ) func (this *MapData) SwapGirde(i, j int32) bool { var ( bSwap bool // 能否交换 @@ -103,7 +112,7 @@ func (this *MapData) SwapGirde(i, j int32) bool { } // 校验是不是挨着的 - if g1.X+1 == g2.X { + if g1.X-1 == g2.X { bSwap = true } if g1.X+1 == g2.X { @@ -112,17 +121,33 @@ func (this *MapData) SwapGirde(i, j int32) bool { if g1.Y+1 == g2.Y { bSwap = true } - if g1.Y+1 == g2.Y { + if g1.Y-1 == g2.Y { bSwap = true } // 更新地图数据 - tmp = new(Girde) - *tmp = *g1 + tmp = &Girde{ + X: g1.X, + Y: g1.Y, + ID: g1.ID, + Itype: g1.Itype, + } this.Data[i] = g2 this.Data[j] = tmp + this.Debugf() return bSwap } +func (this *MapData) Debugf() { + fmt.Printf("================\n") + for i := Width - 1; i >= 0; i-- { + for j := 0; j < Height; j++ { + key := int32(i*10 + j) + fmt.Printf("%d-%d-%d ", i, j, this.Data[key].Itype) + } + fmt.Printf("\n") + } +} + // 校验地图可消除的 判断各组上面2个和右边两个是否三个相等 func (this *MapData) CheckMap() { var ( @@ -130,7 +155,7 @@ func (this *MapData) CheckMap() { ) del = map[int32]struct{}{} - for i := 0; i < Width; i++ { + for i := Width - 1; i >= 0; i-- { for j := 0; j < Height; j++ { key := int32(i*10 + j) iType := this.GetKeyType(key) @@ -167,7 +192,7 @@ func (this *MapData) CheckMap() { // 下落 生成新的格子 func (this *MapData) DropGirde() (Data map[int32]*Girde) { - for i := 0; i < Width; i++ { + for i := Width - 1; i >= 0; i-- { for j := 0; j < Height; j++ { key := int32(i*10 + j) var sz []*Girde diff --git a/modules/jielong/api_lvlist.go b/modules/jielong/api_lvlist.go index 8730ff4f1..a73093dc1 100644 --- a/modules/jielong/api_lvlist.go +++ b/modules/jielong/api_lvlist.go @@ -35,10 +35,12 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.JielongGetListRe if list.Lasttime < configure.Now().Unix() { update := make(map[string]interface{}, 0) list.Lasttime = utils.WeekIntervalTime() - list.Wincount = 0 + list.Curwin = 0 // 本周连胜 + list.Weekmax = 0 // 本周最大连胜 list.Reward = map[int32]int32{} update["lasttime"] = list.Lasttime - update["wincount"] = list.Wincount + update["curwin"] = list.Curwin + update["weekmax"] = list.Weekmax update["reward"] = list.Reward this.module.modelJielong.changeJielongData(session.GetUserId(), update) } diff --git a/modules/jielong/api_result.go b/modules/jielong/api_result.go index edcc58480..8cbfa9bad 100644 --- a/modules/jielong/api_result.go +++ b/modules/jielong/api_result.go @@ -34,15 +34,19 @@ func (this *apiComp) Result(session comm.IUserSession, req *pb.JielongResultReq) list.Status = 0 update["status"] = list.Status // 重置状态 if req.Bwin { - list.Wincount += 1 // 连胜+1 - if list.Wincount > list.Hisotry { - list.Hisotry = list.Wincount + list.Curwin += 1 // 连胜+1 + if list.Curwin > list.Weekmax { + list.Weekmax = list.Curwin + update["weekmax"] = list.Weekmax + } + if list.Weekmax > list.Hisotry { + list.Hisotry = list.Weekmax update["hisotry"] = list.Hisotry } } else { - list.Wincount = 0 // 连胜清零 + list.Curwin = 0 // 连胜清零 } - update["wincount"] = list.Wincount + update["curwin"] = list.Curwin this.module.modelJielong.changeJielongData(session.GetUserId(), update) session.SendMsg(string(this.module.GetType()), "result", &pb.JielongResultResp{ Data: list, diff --git a/modules/jielong/api_reward.go b/modules/jielong/api_reward.go index b9eed68ae..cecb42c57 100644 --- a/modules/jielong/api_reward.go +++ b/modules/jielong/api_reward.go @@ -44,7 +44,7 @@ func (this *apiComp) Reward(session comm.IUserSession, req *pb.JielongRewardReq) return } else { for _, v := range c { - if list.Wincount >= v.Condition { + if list.Weekmax >= v.Condition { if _, ok := list.Reward[v.Condition]; !ok { res = append(res, v.Reward...) list.Reward[v.Condition] = 1 diff --git a/modules/jielong/api_start.go b/modules/jielong/api_start.go index 81d2284e3..a9b6b3465 100644 --- a/modules/jielong/api_start.go +++ b/modules/jielong/api_start.go @@ -7,12 +7,12 @@ import ( ) // 参数校验 -func (this *apiComp) StartGameCheck(session comm.IUserSession, req *pb.JielongStarGameReq) (errdata *pb.ErrorData) { +func (this *apiComp) StartGameCheck(session comm.IUserSession, req *pb.JielongStartGameReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) StartGame(session comm.IUserSession, req *pb.JielongStarGameReq) (errdata *pb.ErrorData) { +func (this *apiComp) StartGame(session comm.IUserSession, req *pb.JielongStartGameReq) (errdata *pb.ErrorData) { var ( list *pb.DBJielongData err error @@ -39,13 +39,13 @@ func (this *apiComp) StartGame(session comm.IUserSession, req *pb.JielongStarGam return } if list.Status == 1 { - list.Wincount = 0 - update["wincount"] = list.Wincount + list.Curwin = 0 + update["curwin"] = list.Curwin } if len(update) > 0 { this.module.modelJielong.changeJielongData(session.GetUserId(), update) } - session.SendMsg(string(this.module.GetType()), "startgame", &pb.JielongStarGameResp{ + session.SendMsg(string(this.module.GetType()), "startgame", &pb.JielongStartGameResp{ Susses: true, }) return diff --git a/modules/jielong/mode_jielong.go b/modules/jielong/mode_jielong.go index 69a6eca15..b16354934 100644 --- a/modules/jielong/mode_jielong.go +++ b/modules/jielong/mode_jielong.go @@ -38,9 +38,7 @@ func (this *ModelJielong) getUserJielongData(uid string) (results *pb.DBJielongD results = &pb.DBJielongData{ Id: primitive.NewObjectID().Hex(), Uid: uid, - Wincount: 0, Reward: map[int32]int32{}, - Hisotry: 0, Gotarr: map[int32]int32{}, Lasttime: utils.WeekIntervalTime(), } diff --git a/pb/jielong_db.pb.go b/pb/jielong_db.pb.go index aa3ddabfd..2abce8408 100644 --- a/pb/jielong_db.pb.go +++ b/pb/jielong_db.pb.go @@ -28,12 +28,13 @@ type DBJielongData struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` // Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` - Wincount int32 `protobuf:"varint,3,opt,name=wincount,proto3" json:"wincount"` // 连续胜利次数 + Curwin int32 `protobuf:"varint,3,opt,name=curwin,proto3" json:"curwin"` // 本周连胜次数 Reward map[int32]int32 `protobuf:"bytes,4,rep,name=reward,proto3" json:"reward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` Hisotry int32 `protobuf:"varint,5,opt,name=hisotry,proto3" json:"hisotry"` // 历史最高连胜次数 Gotarr map[int32]int32 `protobuf:"bytes,6,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,7,opt,name=lasttime,proto3" json:"lasttime"` - Status int32 `protobuf:"varint,8,opt,name=status,proto3" json:"status"` // 记录状态 此字段客户端忽略 + Status int32 `protobuf:"varint,8,opt,name=status,proto3" json:"status"` // 记录状态 此字段客户端忽略 + Weekmax int32 `protobuf:"varint,9,opt,name=weekmax,proto3" json:"weekmax"` // 本周最大连胜次数 } func (x *DBJielongData) Reset() { @@ -82,9 +83,9 @@ func (x *DBJielongData) GetUid() string { return "" } -func (x *DBJielongData) GetWincount() int32 { +func (x *DBJielongData) GetCurwin() int32 { if x != nil { - return x.Wincount + return x.Curwin } return 0 } @@ -124,36 +125,44 @@ func (x *DBJielongData) GetStatus() int32 { return 0 } +func (x *DBJielongData) GetWeekmax() int32 { + if x != nil { + return x.Weekmax + } + return 0 +} + var File_jielong_jielong_db_proto protoreflect.FileDescriptor var file_jielong_jielong_db_proto_rawDesc = []byte{ 0x0a, 0x18, 0x6a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x2f, 0x6a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, - 0x67, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf9, 0x02, 0x0a, 0x0d, 0x44, + 0x67, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8f, 0x03, 0x0a, 0x0d, 0x44, 0x42, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 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, 0x1a, - 0x0a, 0x08, 0x77, 0x69, 0x6e, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x77, 0x69, 0x6e, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x32, 0x0a, 0x06, 0x72, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x4a, - 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, - 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x18, - 0x0a, 0x07, 0x68, 0x69, 0x73, 0x6f, 0x74, 0x72, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x07, 0x68, 0x69, 0x73, 0x6f, 0x74, 0x72, 0x79, 0x12, 0x32, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, - 0x72, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x4a, 0x69, 0x65, - 0x6c, 0x6f, 0x6e, 0x67, 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, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, - 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, - 0x75, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, - 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 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, 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, + 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x63, 0x75, 0x72, 0x77, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x63, 0x75, 0x72, 0x77, 0x69, 0x6e, 0x12, 0x32, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x4a, 0x69, 0x65, 0x6c, 0x6f, + 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, + 0x73, 0x6f, 0x74, 0x72, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, + 0x6f, 0x74, 0x72, 0x79, 0x12, 0x32, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x18, 0x06, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, + 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, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, + 0x74, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x18, 0x0a, 0x07, + 0x77, 0x65, 0x65, 0x6b, 0x6d, 0x61, 0x78, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, + 0x65, 0x65, 0x6b, 0x6d, 0x61, 0x78, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, + 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, 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/jielong_msg.pb.go b/pb/jielong_msg.pb.go index 4eed433b4..235596438 100644 --- a/pb/jielong_msg.pb.go +++ b/pb/jielong_msg.pb.go @@ -303,14 +303,14 @@ func (x *JielongRewardResp) GetRes() []*UserAtno { } // 开始接龙 -type JielongStarGameReq struct { +type JielongStartGameReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields } -func (x *JielongStarGameReq) Reset() { - *x = JielongStarGameReq{} +func (x *JielongStartGameReq) Reset() { + *x = JielongStartGameReq{} if protoimpl.UnsafeEnabled { mi := &file_jielong_jielong_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -318,13 +318,13 @@ func (x *JielongStarGameReq) Reset() { } } -func (x *JielongStarGameReq) String() string { +func (x *JielongStartGameReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*JielongStarGameReq) ProtoMessage() {} +func (*JielongStartGameReq) ProtoMessage() {} -func (x *JielongStarGameReq) ProtoReflect() protoreflect.Message { +func (x *JielongStartGameReq) ProtoReflect() protoreflect.Message { mi := &file_jielong_jielong_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -336,12 +336,12 @@ func (x *JielongStarGameReq) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use JielongStarGameReq.ProtoReflect.Descriptor instead. -func (*JielongStarGameReq) Descriptor() ([]byte, []int) { +// Deprecated: Use JielongStartGameReq.ProtoReflect.Descriptor instead. +func (*JielongStartGameReq) Descriptor() ([]byte, []int) { return file_jielong_jielong_msg_proto_rawDescGZIP(), []int{6} } -type JielongStarGameResp struct { +type JielongStartGameResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -349,8 +349,8 @@ type JielongStarGameResp struct { Susses bool `protobuf:"varint,1,opt,name=susses,proto3" json:"susses"` } -func (x *JielongStarGameResp) Reset() { - *x = JielongStarGameResp{} +func (x *JielongStartGameResp) Reset() { + *x = JielongStartGameResp{} if protoimpl.UnsafeEnabled { mi := &file_jielong_jielong_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -358,13 +358,13 @@ func (x *JielongStarGameResp) Reset() { } } -func (x *JielongStarGameResp) String() string { +func (x *JielongStartGameResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*JielongStarGameResp) ProtoMessage() {} +func (*JielongStartGameResp) ProtoMessage() {} -func (x *JielongStarGameResp) ProtoReflect() protoreflect.Message { +func (x *JielongStartGameResp) ProtoReflect() protoreflect.Message { mi := &file_jielong_jielong_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -376,12 +376,12 @@ func (x *JielongStarGameResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use JielongStarGameResp.ProtoReflect.Descriptor instead. -func (*JielongStarGameResp) Descriptor() ([]byte, []int) { +// Deprecated: Use JielongStartGameResp.ProtoReflect.Descriptor instead. +func (*JielongStartGameResp) Descriptor() ([]byte, []int) { return file_jielong_jielong_msg_proto_rawDescGZIP(), []int{7} } -func (x *JielongStarGameResp) GetSusses() bool { +func (x *JielongStartGameResp) GetSusses() bool { if x != nil { return x.Susses } @@ -413,13 +413,13 @@ var file_jielong_jielong_msg_proto_rawDesc = []byte{ 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1b, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x14, 0x0a, - 0x12, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x72, 0x47, 0x61, 0x6d, 0x65, - 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x13, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x53, 0x74, - 0x61, 0x72, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x75, - 0x73, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x75, 0x73, 0x73, - 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x15, 0x0a, + 0x13, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x72, 0x74, 0x47, 0x61, 0x6d, + 0x65, 0x52, 0x65, 0x71, 0x22, 0x2e, 0x0a, 0x14, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x53, + 0x74, 0x61, 0x72, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, + 0x73, 0x75, 0x73, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x75, + 0x73, 0x73, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -436,16 +436,16 @@ func file_jielong_jielong_msg_proto_rawDescGZIP() []byte { var file_jielong_jielong_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_jielong_jielong_msg_proto_goTypes = []interface{}{ - (*JielongGetListReq)(nil), // 0: JielongGetListReq - (*JielongGetListResp)(nil), // 1: JielongGetListResp - (*JielongResultReq)(nil), // 2: JielongResultReq - (*JielongResultResp)(nil), // 3: JielongResultResp - (*JielongRewardReq)(nil), // 4: JielongRewardReq - (*JielongRewardResp)(nil), // 5: JielongRewardResp - (*JielongStarGameReq)(nil), // 6: JielongStarGameReq - (*JielongStarGameResp)(nil), // 7: JielongStarGameResp - (*DBJielongData)(nil), // 8: DBJielongData - (*UserAtno)(nil), // 9: UserAtno + (*JielongGetListReq)(nil), // 0: JielongGetListReq + (*JielongGetListResp)(nil), // 1: JielongGetListResp + (*JielongResultReq)(nil), // 2: JielongResultReq + (*JielongResultResp)(nil), // 3: JielongResultResp + (*JielongRewardReq)(nil), // 4: JielongRewardReq + (*JielongRewardResp)(nil), // 5: JielongRewardResp + (*JielongStartGameReq)(nil), // 6: JielongStartGameReq + (*JielongStartGameResp)(nil), // 7: JielongStartGameResp + (*DBJielongData)(nil), // 8: DBJielongData + (*UserAtno)(nil), // 9: UserAtno } var file_jielong_jielong_msg_proto_depIdxs = []int32{ 8, // 0: JielongGetListResp.data:type_name -> DBJielongData @@ -540,7 +540,7 @@ func file_jielong_jielong_msg_proto_init() { } } file_jielong_jielong_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JielongStarGameReq); i { + switch v := v.(*JielongStartGameReq); i { case 0: return &v.state case 1: @@ -552,7 +552,7 @@ func file_jielong_jielong_msg_proto_init() { } } file_jielong_jielong_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JielongStarGameResp); i { + switch v := v.(*JielongStartGameResp); i { case 0: return &v.state case 1: diff --git a/services/worker/main.go b/services/worker/main.go index 903d60182..2deb7b44e 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -20,6 +20,7 @@ import ( "go_dreamfactory/modules/dispatch" "go_dreamfactory/modules/dragon" "go_dreamfactory/modules/enchant" + "go_dreamfactory/modules/entertainment" "go_dreamfactory/modules/equipment" "go_dreamfactory/modules/forum" "go_dreamfactory/modules/friend" @@ -165,6 +166,7 @@ func main() { venture.NewModule(), achieve.NewModule(), jielong.NewModule(), + entertainment.NewModule(), ) }