diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json index 1bcd68a3f..fef60de84 100644 --- a/bin/json/game_rdtaskchoose.json +++ b/bin/json/game_rdtaskchoose.json @@ -3,6 +3,7 @@ "id": 10001, "num": 1, "preTid": 0, + "gotoLevel": "", "needItem": [ 0 ] @@ -11,6 +12,7 @@ "id": 10002, "num": 2, "preTid": 0, + "gotoLevel": "", "needItem": [ 0 ] @@ -19,6 +21,7 @@ "id": 10003, "num": 1, "preTid": 0, + "gotoLevel": "101", "needItem": [ 0 ] @@ -27,6 +30,7 @@ "id": 10004, "num": 1, "preTid": 0, + "gotoLevel": "", "needItem": [ 0 ] @@ -35,6 +39,7 @@ "id": 10005, "num": 2, "preTid": 0, + "gotoLevel": "", "needItem": [ 0 ] @@ -43,6 +48,7 @@ "id": 10006, "num": 1, "preTid": 0, + "gotoLevel": "", "needItem": [ 0 ] @@ -51,6 +57,7 @@ "id": 10007, "num": 2, "preTid": 0, + "gotoLevel": "", "needItem": [ 0 ] @@ -59,6 +66,7 @@ "id": 10008, "num": 3, "preTid": 170, + "gotoLevel": "", "needItem": [ 0 ] @@ -67,6 +75,7 @@ "id": 10009, "num": 1, "preTid": 0, + "gotoLevel": "", "needItem": [ 0 ] @@ -75,6 +84,7 @@ "id": 100010, "num": 2, "preTid": 0, + "gotoLevel": "", "needItem": [ 0 ] @@ -83,6 +93,7 @@ "id": 100011, "num": 1, "preTid": 0, + "gotoLevel": "101", "needItem": [ 0 ] @@ -91,6 +102,7 @@ "id": 100012, "num": 2, "preTid": 0, + "gotoLevel": "", "needItem": [ 0 ] diff --git a/cmd/v2/ui/tool_gen.go b/cmd/v2/ui/tool_gen.go index 2dfd7bcac..ddde87b61 100644 --- a/cmd/v2/ui/tool_gen.go +++ b/cmd/v2/ui/tool_gen.go @@ -19,6 +19,7 @@ import ( "fyne.io/fyne/v2/data/binding" "fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/layout" + "fyne.io/fyne/v2/storage" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" "github.com/sirupsen/logrus" @@ -97,15 +98,38 @@ func (this *appGen) LazyInit(obs observer.Observer) error { tmpDir.Text = gt.TmpDir } + // 打开目录 + openFolder := func(entry *widget.Entry) { + dConf := dialog.NewFolderOpen(func(lu fyne.ListableURI, err error) { + if lu == nil { + return + } + entry.Text = lu.Path() + entry.Refresh() + }, toolWin.w) + luri, _ := storage.ListerForURI(storage.NewFileURI(".")) + dConf.SetLocation(luri) + dConf.SetConfirmText("打开") + dConf.SetDismissText("取消") + dConf.Resize(fyne.NewSize(750, 500)) + dConf.Show() + } + form := widget.NewForm( widget.NewFormItem("服务地址", serverAddr), - widget.NewFormItem("项目目录", projectDir), - widget.NewFormItem("工作目录", workDir), + widget.NewFormItem("项目目录", container.NewBorder(nil, nil, nil, widget.NewButtonWithIcon("", theme.FolderIcon(), func() { + openFolder(projectDir) + }), projectDir)), + widget.NewFormItem("工作目录", container.NewBorder(nil, nil, nil, widget.NewButtonWithIcon("", theme.FolderIcon(), func() { + openFolder(workDir) + }), workDir)), widget.NewFormItem("LuBan Cli", client), widget.NewFormItem("输入目录", inputDir), widget.NewFormItem("输出Code目录", outputCodeDir), widget.NewFormItem("输出JSON目录", outputJsonDir), - widget.NewFormItem("临时目录", tmpDir), + widget.NewFormItem("临时目录", container.NewBorder(nil, nil, nil, widget.NewButtonWithIcon("", theme.FolderIcon(), func() { + openFolder(tmpDir) + }), tmpDir)), widget.NewFormItem("生成类型", genType), ) diff --git a/cmd/v2/ui/tool_pb.go b/cmd/v2/ui/tool_pb.go index 50319a0df..20eff78a1 100644 --- a/cmd/v2/ui/tool_pb.go +++ b/cmd/v2/ui/tool_pb.go @@ -18,6 +18,7 @@ import ( "fyne.io/fyne/v2/data/binding" "fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/layout" + "fyne.io/fyne/v2/storage" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" "github.com/sirupsen/logrus" @@ -40,6 +41,23 @@ func (this *appPbGen) LazyInit(obs observer.Observer) error { pcm := service.GetDbService().GetPbConf() logrus.Debugf("%v", pcm) + // 打开目录 + openFolder := func(entry *widget.Entry) { + dConf := dialog.NewFolderOpen(func(lu fyne.ListableURI, err error) { + if lu == nil { + return + } + entry.Text = lu.Path() + entry.Refresh() + }, toolWin.w) + luri, _ := storage.ListerForURI(storage.NewFileURI(".")) + dConf.SetLocation(luri) + dConf.SetConfirmText("打开") + dConf.SetDismissText("取消") + dConf.Resize(fyne.NewSize(750, 500)) + dConf.Show() + } + content := container.NewMax() content.Objects = []fyne.CanvasObject{} @@ -54,8 +72,13 @@ func (this *appPbGen) LazyInit(obs observer.Observer) error { outDir.PlaceHolder = "go输出目录" form := widget.NewForm( - widget.NewFormItem("proto目录", protoDir), - widget.NewFormItem("输出目录", outDir), + widget.NewFormItem("proto目录", container.NewBorder(nil, nil, nil, widget.NewButtonWithIcon("", theme.FolderIcon(), func() { + openFolder(protoDir) + this.folderList.initItem(protoDir.Text) + }), protoDir)), + widget.NewFormItem("输出目录", container.NewBorder(nil, nil, nil, widget.NewButtonWithIcon("", theme.FolderIcon(), func() { + openFolder(outDir) + }), outDir)), ) if pcm != nil { diff --git a/comm/const.go b/comm/const.go index 860f8e5a4..573a6c115 100644 --- a/comm/const.go +++ b/comm/const.go @@ -114,8 +114,10 @@ const ( TableRtask = "rtask" // 随机任务触发记录 TableRtaskRecord = "rrecord" - ///爬塔排行 - TablePagodaRank = "pagodarank" + ///记录用户爬塔排行数据 + TablePagodaRecord = "pagodarecord" + ///有序的爬塔排行 (正正的排行榜 最多只有50条) + TablePagodaRankList = "pagodaranklist" /// 美食馆 TableSmithy = "smithy" /// 赛季塔数据表 diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index 84a446439..f8f22637b 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -100,33 +100,20 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal mapData["pagodaId"] = cfg.LayerNum code = this.module.ModifySeasonPagodaData(session.GetUserId(), mapData) } - - rst, _ := this.module.modulerank.GetUserRandData(session.GetUserId()) - if rst.Uid == "" { - rst.Uid = session.GetUserId() - rst.Id = primitive.NewObjectID().Hex() - rst.Type = req.PagodaType - rst.Nickname = this.module.ModuleUser.GetUser(session.GetUserId()).Name - rst.Lv = this.module.ModuleUser.GetUser(session.GetUserId()).Lv - rst.PagodaId = pagoda.PagodaId - this.module.modulerank.AddRank(session.GetUserId(), rst) - } else { - if req.Report != nil && len(req.Report.Info.Redflist) > 0 { - sz := make([]*pb.LineUp, 5) - for i, v := range req.Report.Info.Redflist[0].Team { - if v != nil { - sz[i] = &pb.LineUp{ - Cid: v.HeroID, - Star: v.Star, - Lv: v.Lv, - } + // 记录爬塔明细数据 + if req.Report != nil && len(req.Report.Info.Redflist) > 0 { + sz := make([]*pb.LineUp, 5) + for i, v := range req.Report.Info.Redflist[0].Team { + if v != nil { + sz[i] = &pb.LineUp{ + Cid: v.HeroID, + Star: v.Star, + Lv: v.Lv, } } - - this.module.modulerank.updatePagodaRankList(session, seasonPagoda, req.Report.Info.Redflist[0].Leadpos, sz) } - mapData["pagodaId"] = cfg.LayerNum - this.module.modulerank.ChangeUserRank(session.GetUserId(), mapData) + + this.module.modulerank.addPagodaRankList(session, seasonPagoda, req.Report.Info.Redflist[0].Leadpos, sz) } pagoda.PagodaId = seasonPagoda.PagodaId pagoda.Type = seasonPagoda.Type diff --git a/modules/pagoda/api_ranklist.go b/modules/pagoda/api_ranklist.go index f5ae17109..56417c2e4 100644 --- a/modules/pagoda/api_ranklist.go +++ b/modules/pagoda/api_ranklist.go @@ -14,16 +14,21 @@ func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.PagodaRank } func (this *apiComp) RankList(session comm.IUserSession, req *pb.PagodaRankListReq) (code pb.ErrorCode, data proto.Message) { - + var ( + szRank []*pb.DBPagodaRank + err error + ) code = this.RankListCheck(session, req) if code != pb.ErrorCode_Success { return } - - szRank, err := this.module.modulerank.GetRankData() - if err != nil { - code = pb.ErrorCode_DBError + if req.FloorId == 0 && req.Friend == false { + szRank, err = this.module.modulerank.GetRankData() + if err != nil { + code = pb.ErrorCode_DBError + } } + session.SendMsg(string(this.module.GetType()), PagodaRankListResp, &pb.PagodaRankListResp{Ranks: szRank}) return } diff --git a/modules/pagoda/model_rank.go b/modules/pagoda/model_rank.go index 506c16392..fde2d3f6a 100644 --- a/modules/pagoda/model_rank.go +++ b/modules/pagoda/model_rank.go @@ -16,7 +16,7 @@ type ModelRank struct { } func (this *ModelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.TableName = comm.TablePagodaRank + this.TableName = comm.TablePagodaRecord err = this.MCompModel.Init(service, module, comp, options) this.modulePagoda = module.(*Pagoda) return @@ -49,7 +49,7 @@ func (this *ModelRank) ChangeUserRank(uid string, value map[string]interface{}) func (this *ModelRank) GetRankData() (data []*pb.DBPagodaRank, err error) { data = make([]*pb.DBPagodaRank, 0) - err = this.Redis.LRange(comm.TablePagodaRank, 0, -1, &data) + err = this.Redis.LRange(comm.TablePagodaRankList, 0, -1, &data) return } @@ -63,7 +63,7 @@ func (this *ModelRank) getPagodaRankList(uid string) []*pb.DBPagodaRank { } // 插入新的排行数据 -func (this *ModelRank) updatePagodaRankList(session comm.IUserSession, data *pb.DBSeasonPagoda, Leadpos int32, line []*pb.LineUp) { +func (this *ModelRank) addPagodaRankList(session comm.IUserSession, data *pb.DBSeasonPagoda, Leadpos int32, line []*pb.LineUp) { userinfo := this.modulePagoda.ModuleUser.GetUser(session.GetUserId()) new := &pb.DBPagodaRank{ Id: primitive.NewObjectID().Hex(), diff --git a/modules/pagoda/model_seasonpagoda.go b/modules/pagoda/model_seasonpagoda.go index dd6c885a8..59b5af336 100644 --- a/modules/pagoda/model_seasonpagoda.go +++ b/modules/pagoda/model_seasonpagoda.go @@ -61,7 +61,7 @@ func (this *ModelSeasonPagoda) addNewSeasonPagoda(uId string, data *pb.DBSeasonP // 赛季结束 清理所有塔数据 func (this *ModelSeasonPagoda) DleAllSeasonData() { this.DB.DeleteMany(core.SqlTable(this.TableName), bson.M{}) - err := this.Redis.Ltrim(comm.TablePagodaRank, 0, -1) + err := this.Redis.Ltrim(comm.TablePagodaRecord, 0, -1) if err != nil { log.Errorf("delete failed") } diff --git a/modules/rtask/api_finish.go b/modules/rtask/api_finish.go new file mode 100644 index 000000000..22291e156 --- /dev/null +++ b/modules/rtask/api_finish.go @@ -0,0 +1,24 @@ +package rtask + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +func (this *apiComp) BattleFinishCheck(session comm.IUserSession, req *pb.RtaskBattleFinishReq) (code pb.ErrorCode) { + if req.Result == 0 { + code = pb.ErrorCode_ReqParameterError + } + return +} + +func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattleFinishReq) (code pb.ErrorCode, data proto.Message) { + if code = this.BattleFinishCheck(session, req); code != pb.ErrorCode_Success { + return + } + + + return +} diff --git a/modules/rtask/config.go b/modules/rtask/config.go index d49f25278..91f3cf730 100644 --- a/modules/rtask/config.go +++ b/modules/rtask/config.go @@ -12,6 +12,7 @@ const ( gameRtaskChoose = "game_rdtaskchoose.json" gameRtaskCondi = "game_rdtaskcondi.json" gameRtaskSide = "game_rdtaskside.json" + gameRtaskBattle = "game_rdtaskbattle.json" ) type configureComp struct { @@ -25,6 +26,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp gameRtaskChoose: cfg.NewGameRdtaskChoose, gameRtaskCondi: cfg.NewGameRdtaskCondi, gameRtaskSide: cfg.NewGameRdtaskSide, + gameRtaskBattle: cfg.NewGameRdtaskBattle, }) return } @@ -93,6 +95,22 @@ func (this *configureComp) getRtaskSide() (data *cfg.GameRdtaskSide, err error) return } +func (this *configureComp) getRtaskBattle() (data *cfg.GameRdtaskBattle, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(gameRtaskBattle); err != nil { + return + } else { + if data, ok = v.(*cfg.GameRdtaskBattle); !ok { + err = fmt.Errorf("%T is *cfg.GameRdtaskBattle", v) + return + } + } + return +} + // 获取选项配置 func (this *configureComp) getRtaskChooseCfg(id int32) *cfg.GameRdtaskChooseData { cfg, err := this.getRtaskChoose() @@ -145,3 +163,17 @@ func (this *configureComp) getRtaskById(taskId int32) (data *cfg.GameRdtaskData) } return nil } + +// 战斗配置 +func (this *configureComp) getRtaskBattleById(id int32) (data *cfg.GameRdtaskBattleData) { + cfg, err := this.getRtaskBattle() + if err != nil { + return + } + if cfg != nil { + if data, ok := cfg.GetDataMap()[id]; ok { + return data + } + } + return nil +} diff --git a/modules/timer/forum.go b/modules/timer/forum.go index 6b7754ddb..83969e08d 100644 --- a/modules/timer/forum.go +++ b/modules/timer/forum.go @@ -18,7 +18,7 @@ type forumComp struct { //组件初始化接口 func (this *forumComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.TableName = comm.TablePagodaRank + this.TableName = comm.TablePagodaRecord this.MCompModel.Init(service, module, comp, options) this.service = service return diff --git a/modules/timer/pagodarank.go b/modules/timer/pagodarank.go index 77eae521a..09286c477 100644 --- a/modules/timer/pagodarank.go +++ b/modules/timer/pagodarank.go @@ -22,7 +22,7 @@ type PagodaRank struct { //组件初始化接口 func (this *PagodaRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.TableName = comm.TablePagodaRank + this.TableName = comm.TablePagodaRecord this.MCompModel.Init(service, module, comp, options) this.service = service return @@ -37,7 +37,7 @@ func (this *PagodaRank) Start() (err error) { // 处理排行榜排序 func (this *PagodaRank) Timer() { data := make([]interface{}, 0) // options.Find().SetLimit(comm.MaxRankList) - if _data, err := this.DB.Find(comm.TablePagodaRank, bson.M{}, options.Find().SetSort(bson.M{"pagodaId": -1}).SetLimit(comm.MaxRankList)); err == nil { + if _data, err := this.DB.Find(comm.TablePagodaRecord, bson.M{}, options.Find().SetSort(bson.M{"pagodaId": -1}).SetLimit(comm.MaxRankList)); err == nil { for _data.Next(context.TODO()) { temp := &pb.DBPagodaRank{} if err = _data.Decode(temp); err == nil { @@ -46,9 +46,9 @@ func (this *PagodaRank) Timer() { } } if len(data) > 0 { - err := this.Redis.RPush(comm.TablePagodaRank, data...) + err := this.Redis.RPush(comm.TablePagodaRankList, data...) if err == nil { - err = this.Redis.Ltrim(comm.TablePagodaRank, -1*len(data), -1) //对一个列表进行修剪 + err = this.Redis.Ltrim(comm.TablePagodaRankList, -1*len(data), -1) //对一个列表进行修剪 if err != nil { log.Errorf("delete failed") } diff --git a/pb/pagoda_msg.pb.go b/pb/pagoda_msg.pb.go index b4d352725..c888204d0 100644 --- a/pb/pagoda_msg.pb.go +++ b/pb/pagoda_msg.pb.go @@ -437,8 +437,8 @@ type PagodaRankListReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FloorId int32 `protobuf:"varint,1,opt,name=floorId,proto3" json:"floorId"` // 层数 - Type int32 `protobuf:"varint,2,opt,name=type,proto3" json:"type"` // 塔类型 + FloorId int32 `protobuf:"varint,1,opt,name=floorId,proto3" json:"floorId"` // 层数 0 标识总榜 + Friend bool `protobuf:"varint,2,opt,name=friend,proto3" json:"friend"` // true 好友榜 } func (x *PagodaRankListReq) Reset() { @@ -480,11 +480,11 @@ func (x *PagodaRankListReq) GetFloorId() int32 { return 0 } -func (x *PagodaRankListReq) GetType() int32 { +func (x *PagodaRankListReq) GetFriend() bool { if x != nil { - return x.Type + return x.Friend } - return 0 + return false } type PagodaRankListResp struct { @@ -575,15 +575,16 @@ var file_pagoda_pagoda_msg_proto_rawDesc = []byte{ 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x22, 0x41, 0x0a, 0x11, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, + 0x22, 0x45, 0x0a, 0x11, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x49, 0x64, 0x12, - 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x39, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x61, 0x6e, - 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, 0x6e, - 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, - 0x6f, 0x64, 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, + 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, + 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, + 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, + 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/pb/rtask_msg.pb.go b/pb/rtask_msg.pb.go index e608224ae..4950963d0 100644 --- a/pb/rtask_msg.pb.go +++ b/pb/rtask_msg.pb.go @@ -504,6 +504,133 @@ func (x *RtaskGetRewardResp) GetRtaskSubId() int32 { return 0 } +// 战斗完成 +type RtaskBattleFinishReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID + ChooseId int32 `protobuf:"varint,2,opt,name=chooseId,proto3" json:"chooseId"` //选项配置ID + RtaskSubId int32 `protobuf:"varint,3,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID + Result int32 `protobuf:"varint,4,opt,name=result,proto3" json:"result"` +} + +func (x *RtaskBattleFinishReq) Reset() { + *x = RtaskBattleFinishReq{} + if protoimpl.UnsafeEnabled { + mi := &file_rtask_rtask_msg_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RtaskBattleFinishReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RtaskBattleFinishReq) ProtoMessage() {} + +func (x *RtaskBattleFinishReq) ProtoReflect() protoreflect.Message { + mi := &file_rtask_rtask_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 RtaskBattleFinishReq.ProtoReflect.Descriptor instead. +func (*RtaskBattleFinishReq) Descriptor() ([]byte, []int) { + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{9} +} + +func (x *RtaskBattleFinishReq) GetRtaskId() int32 { + if x != nil { + return x.RtaskId + } + return 0 +} + +func (x *RtaskBattleFinishReq) GetChooseId() int32 { + if x != nil { + return x.ChooseId + } + return 0 +} + +func (x *RtaskBattleFinishReq) GetRtaskSubId() int32 { + if x != nil { + return x.RtaskSubId + } + return 0 +} + +func (x *RtaskBattleFinishReq) GetResult() int32 { + if x != nil { + return x.Result + } + return 0 +} + +type RtaskBattleFinishResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Bid int32 `protobuf:"varint,1,opt,name=bid,proto3" json:"bid"` //战斗配置ID + RtaskId int32 `protobuf:"varint,2,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID +} + +func (x *RtaskBattleFinishResp) Reset() { + *x = RtaskBattleFinishResp{} + if protoimpl.UnsafeEnabled { + mi := &file_rtask_rtask_msg_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RtaskBattleFinishResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RtaskBattleFinishResp) ProtoMessage() {} + +func (x *RtaskBattleFinishResp) ProtoReflect() protoreflect.Message { + mi := &file_rtask_rtask_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 RtaskBattleFinishResp.ProtoReflect.Descriptor instead. +func (*RtaskBattleFinishResp) Descriptor() ([]byte, []int) { + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{10} +} + +func (x *RtaskBattleFinishResp) GetBid() int32 { + if x != nil { + return x.Bid + } + return 0 +} + +func (x *RtaskBattleFinishResp) GetRtaskId() int32 { + if x != nil { + return x.RtaskId + } + return 0 +} + // 测试使用 type RtaskTestReq struct { state protoimpl.MessageState @@ -518,7 +645,7 @@ type RtaskTestReq struct { func (x *RtaskTestReq) Reset() { *x = RtaskTestReq{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[9] + mi := &file_rtask_rtask_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -531,7 +658,7 @@ func (x *RtaskTestReq) String() string { func (*RtaskTestReq) ProtoMessage() {} func (x *RtaskTestReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[9] + mi := &file_rtask_rtask_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -544,7 +671,7 @@ func (x *RtaskTestReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskTestReq.ProtoReflect.Descriptor instead. func (*RtaskTestReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{9} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{11} } func (x *RtaskTestReq) GetRtaskType() int32 { @@ -579,7 +706,7 @@ type RtaskTestResp struct { func (x *RtaskTestResp) Reset() { *x = RtaskTestResp{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[10] + mi := &file_rtask_rtask_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -592,7 +719,7 @@ func (x *RtaskTestResp) String() string { func (*RtaskTestResp) ProtoMessage() {} func (x *RtaskTestResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[10] + mi := &file_rtask_rtask_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -605,7 +732,7 @@ func (x *RtaskTestResp) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskTestResp.ProtoReflect.Descriptor instead. func (*RtaskTestResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{10} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{12} } func (x *RtaskTestResp) GetFlag() bool { @@ -658,16 +785,29 @@ var file_rtask_rtask_msg_proto_rawDesc = []byte{ 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, - 0x49, 0x64, 0x22, 0x5e, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, - 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, - 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, - 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, - 0x49, 0x64, 0x22, 0x23, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x49, 0x64, 0x22, 0x84, 0x01, 0x0a, 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, + 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, + 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, + 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x43, 0x0a, 0x15, 0x52, 0x74, 0x61, + 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x62, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x5e, + 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, + 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x23, + 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, + 0x6c, 0x61, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -682,19 +822,21 @@ func file_rtask_rtask_msg_proto_rawDescGZIP() []byte { return file_rtask_rtask_msg_proto_rawDescData } -var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11) +var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13) var file_rtask_rtask_msg_proto_goTypes = []interface{}{ - (*RtaskApplyReq)(nil), // 0: RtaskApplyReq - (*RtaskApplyResp)(nil), // 1: RtaskApplyResp - (*RtasklistReq)(nil), // 2: RtasklistReq - (*RtasklistResp)(nil), // 3: RtasklistResp - (*RtaskChooseReq)(nil), // 4: RtaskChooseReq - (*RtaskChooseResp)(nil), // 5: RtaskChooseResp - (*RtaskFinishPush)(nil), // 6: RtaskFinishPush - (*RtaskGetRewardReq)(nil), // 7: RtaskGetRewardReq - (*RtaskGetRewardResp)(nil), // 8: RtaskGetRewardResp - (*RtaskTestReq)(nil), // 9: RtaskTestReq - (*RtaskTestResp)(nil), // 10: RtaskTestResp + (*RtaskApplyReq)(nil), // 0: RtaskApplyReq + (*RtaskApplyResp)(nil), // 1: RtaskApplyResp + (*RtasklistReq)(nil), // 2: RtasklistReq + (*RtasklistResp)(nil), // 3: RtasklistResp + (*RtaskChooseReq)(nil), // 4: RtaskChooseReq + (*RtaskChooseResp)(nil), // 5: RtaskChooseResp + (*RtaskFinishPush)(nil), // 6: RtaskFinishPush + (*RtaskGetRewardReq)(nil), // 7: RtaskGetRewardReq + (*RtaskGetRewardResp)(nil), // 8: RtaskGetRewardResp + (*RtaskBattleFinishReq)(nil), // 9: RtaskBattleFinishReq + (*RtaskBattleFinishResp)(nil), // 10: RtaskBattleFinishResp + (*RtaskTestReq)(nil), // 11: RtaskTestReq + (*RtaskTestResp)(nil), // 12: RtaskTestResp } var file_rtask_rtask_msg_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type @@ -819,7 +961,7 @@ func file_rtask_rtask_msg_proto_init() { } } file_rtask_rtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskTestReq); i { + switch v := v.(*RtaskBattleFinishReq); i { case 0: return &v.state case 1: @@ -831,6 +973,30 @@ func file_rtask_rtask_msg_proto_init() { } } file_rtask_rtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RtaskBattleFinishResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_rtask_rtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RtaskTestReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_rtask_rtask_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskTestResp); i { case 0: return &v.state @@ -849,7 +1015,7 @@ func file_rtask_rtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_rtask_rtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 11, + NumMessages: 13, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index a5e244654..14355461e 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -627,8 +627,5 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.Robot, err = NewGameRobot(buf) ; err != nil { return nil, err } - if buf, err = loader("game_jumpview") ; err != nil { - return nil, err - } return tables, nil } diff --git a/sys/configure/structs/game.rdtaskChooseData.go b/sys/configure/structs/game.rdtaskChooseData.go index be47c9581..c262c0112 100644 --- a/sys/configure/structs/game.rdtaskChooseData.go +++ b/sys/configure/structs/game.rdtaskChooseData.go @@ -14,6 +14,7 @@ type GameRdtaskChooseData struct { Id int32 Num int32 PreTid int32 + GotoLevel string NeedItem []int32 } @@ -27,6 +28,7 @@ func (_v *GameRdtaskChooseData)Deserialize(_buf map[string]interface{}) (err err { 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["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["preTid"].(float64); !_ok_ { err = errors.New("preTid error"); return }; _v.PreTid = int32(_tempNum_) } + { var _ok_ bool; if _v.GotoLevel, _ok_ = _buf["gotoLevel"].(string); !_ok_ { err = errors.New("gotoLevel error"); return } } { var _arr_ []interface{} var _ok_ bool