diff --git a/cmd/v2/ui/protocol.go b/cmd/v2/ui/protocol.go index 37ee4d326..954a83dc8 100644 --- a/cmd/v2/ui/protocol.go +++ b/cmd/v2/ui/protocol.go @@ -44,6 +44,7 @@ var ( ff(comm.ModuleUser, user.UserSubTypeModifyFigure): &formview.UserModifyfigureView{}, ff(comm.ModuleUser, user.UserSubTYpeModifyBgp): &formview.UserModifybgpView{}, ff(comm.ModuleUser, user.UserSubTypeModifySign): &formview.UserSignView{}, + ff(comm.ModuleUser, user.UserSubTypeBattlerecord): &formview.UserBattlerecordView{}, // items ff(comm.ModuleItems, "getlist"): &formview.ItemListView{}, ff(comm.ModuleItems, "sellitem"): &formview.ItemsSellView{}, @@ -134,6 +135,7 @@ var ( ff(comm.ModuleUser, user.UserSubTypeModifyFigure), ff(comm.ModuleUser, user.UserSubTYpeModifyBgp), ff(comm.ModuleUser, user.UserSubTypeModifySign), + ff(comm.ModuleUser, user.UserSubTypeBattlerecord), }, "items": { ff(comm.ModuleItems, "getlist"), @@ -292,6 +294,13 @@ var ( SubType: user.UserSubTypeModifySign, Enabled: true, }, + ff(comm.ModuleUser, user.UserSubTypeBattlerecord): { + NavLabel: "战斗记录", + Desc: "玩家在心魔塔、狩猎、维京远征的战斗记录", + MainType: string(comm.ModuleUser), + SubType: user.UserSubTypeBattlerecord, + Enabled: true, + }, //items string(comm.ModuleItems): { NavLabel: "道具", diff --git a/cmd/v2/ui/views/user_battlerecord.go b/cmd/v2/ui/views/user_battlerecord.go new file mode 100644 index 000000000..b8942a079 --- /dev/null +++ b/cmd/v2/ui/views/user_battlerecord.go @@ -0,0 +1,30 @@ +package formview + +import ( + "go_dreamfactory/cmd/v2/model" + "go_dreamfactory/cmd/v2/service" + "go_dreamfactory/pb" + + "fyne.io/fyne/v2" + "github.com/sirupsen/logrus" +) + +// 玩家战斗记录 +type UserBattlerecordView struct { + BaseformView +} + +func (this *UserBattlerecordView) CreateView(t *model.TestCase) fyne.CanvasObject { + this.form.OnSubmit = func() { + if err := service.GetPttService().SendToClient( + t.MainType, + t.SubType, + &pb.UserBattlerecordReq{}, + ); err != nil { + logrus.Error(err) + return + } + + } + return this.form +} diff --git a/modules/rtask/config.go b/modules/rtask/config.go index 4e6599c45..193aa5c1c 100644 --- a/modules/rtask/config.go +++ b/modules/rtask/config.go @@ -153,10 +153,6 @@ func (this *configureComp) getRtaskTypeById(typeId int32) (data *cfg.GameRdtaskC } func (this *configureComp) getRtaskCondis(typeId int32) (list []*cfg.GameRdtaskCondiData) { - t := time.Now() - defer func() { - log.Debugf("getRtaskCondis,耗时:%v", time.Since(t)) - }() cfg, err := this.getRtaskCondiCfg() if err != nil { return diff --git a/modules/rtask/model_record.go b/modules/rtask/model_record.go index 610632a6d..c8db2859b 100644 --- a/modules/rtask/model_record.go +++ b/modules/rtask/model_record.go @@ -47,10 +47,10 @@ func (this *ModelRtaskRecord) getRecord(uid string) *pb.DBRtaskRecord { // 初始化任务条件数据 func (this *ModelRtaskRecord) initCondiData(uid string) error { - t := time.Now() - defer func() { - log.Debugf("初始化条件耗时:%v", time.Since(t)) - }() + // t := time.Now() + // defer func() { + // log.Debugf("初始化条件耗时:%v", time.Since(t)) + // }() dr := this.getRecord(uid) grc, err := this.moduleRtask.configure.getRtaskCondiCfg() if err != nil { diff --git a/modules/rtask/module.go b/modules/rtask/module.go index ee72c320f..9948448e1 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -10,7 +10,6 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" "sort" - "time" "github.com/pkg/errors" ) @@ -200,10 +199,10 @@ func (this *ModuleRtask) initRtaskVerifyHandle() { } func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.TaskType, params ...int32) (code pb.ErrorCode) { - t := time.Now() - defer func() { - log.Debugf("耗时:%v", time.Since(t)) - }() + // t := time.Now() + // defer func() { + // log.Debugf("任务发送耗时:%v", time.Since(t)) + // }() this.Debug("任务事件触发", log.Field{"uid", session.GetUserId()}, log.Field{"taskType", rtaskType}, log.Field{"params", params}) var ( err error diff --git a/modules/rtask/updateHandle.go b/modules/rtask/updateHandle.go index ebfa217b8..646b96883 100644 --- a/modules/rtask/updateHandle.go +++ b/modules/rtask/updateHandle.go @@ -3,7 +3,6 @@ package rtask import ( "go_dreamfactory/comm" - "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules/task" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" @@ -75,10 +74,10 @@ func (this *ModelRtaskRecord) overrideUpdate(uid string, cfg *cfg.GameRdtaskCond // 累计更新 - 招募等 func (this *ModelRtaskRecord) addUpdate(uid string, cfg *cfg.GameRdtaskCondiData, vals ...int32) (err error) { - t := time.Now() - defer func() { - log.Debugf("add update耗时:%v", time.Since(t)) - }() + // t := time.Now() + // defer func() { + // log.Debugf("add update耗时:%v", time.Since(t)) + // }() record := &pb.DBRtaskRecord{Uid: uid} err = this.Get(uid, record) if err != nil { diff --git a/modules/user/api_battlerecord.go b/modules/user/api_battlerecord.go index 4132390e6..9e30e44eb 100644 --- a/modules/user/api_battlerecord.go +++ b/modules/user/api_battlerecord.go @@ -8,16 +8,30 @@ import ( ) // 玩家战斗记录 - func (this *apiComp) BattlerecordCheck(session comm.IUserSession, req *pb.UserBattlerecordReq) (code pb.ErrorCode) { return } func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattlerecordReq) (code pb.ErrorCode, data proto.Message) { - - session.SendMsg(string(this.module.GetType()), UserSubTypeBattlerecord, &pb.UserBattlerecordResp{ + rsp := &pb.UserBattlerecordResp{ Uid: session.GetUserId(), - }) + } + + // 心魔塔 + iPagoda, err := this.service.GetModule(comm.ModulePagoda) + if err != nil { + code = pb.ErrorCode_SystemError + return + } + + if b, y := iPagoda.(comm.IPagoda); y { + dr := b.CheckUserBasePagodaInfo(session.GetUserId()) + if dr == nil { + rsp.PagodaRecord = dr + } + } + + session.SendMsg(string(this.module.GetType()), UserSubTypeBattlerecord, rsp) return } diff --git a/modules/user/api_login.go b/modules/user/api_login.go index 386e6a825..93c732d7b 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -30,7 +30,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod user *pb.DBUser ) - t := time.Now() + // t := time.Now() rsp := &pb.UserLoginResp{} defer func() { if user != nil && code == pb.ErrorCode_Success { @@ -41,7 +41,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod code = pb.ErrorCode_SystemError return } - log.Debugf("登录耗时:%v", time.Since(t)) + // log.Debugf("登录耗时:%v", time.Since(t)) } }()