liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

上传代码

Browse Source
This commit is contained in:
liwei1dao 2024-01-02 17:13:14 +08:00
parent 15d8039a5b
commit 0e56af52ca
23 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/herotask/api_Info.go
View File

@ -38,7 +38,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroTaskInfoReq) (e
condiIds = append(condiIds, k)
}
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil {
if progress, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil {
return
}

2
modules/herotask/api_receive.go
View File

@ -69,7 +69,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.HeroTaskReceiveR
}
}
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasks...); err != nil {
if progress, err = this.module.ModuleBuried.CheckCondition(session, tasks...); err != nil {
return
}

2
modules/integral/api_challenge.go
View File

@ -26,7 +26,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.IntegralChalle
if errdata != nil {
return // 参数校验失败直接返回
}
list, err := this.module.modelIntegral.getIntegralList(session.GetUserId())
list, err := this.module.modelIntegral.getIntegralList(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_PagodaNotFound, // 道具数量不足

2
modules/integral/api_challengeover.go
View File

@ -37,7 +37,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
return // 参数校验失败直接返回
}
list, err := this.module.modelIntegral.getIntegralList(session.GetUserId())
list, err := this.module.modelIntegral.getIntegralList(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_PagodaNotFound,

4
modules/integral/api_getlist.go
View File

@ -20,7 +20,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.IntegralGetListR
list *pb.DBIntegralBoss
err error
)
list, err = this.module.modelIntegral.getIntegralList(session.GetUserId())
list, err = this.module.modelIntegral.getIntegralList(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
@ -81,7 +81,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.IntegralGetListR
for _, v := range this.module.configure.GetIntegralCondition() {
szTaskid = append(szTaskid, v.TaskId) // 获取任务id
}
if data, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), szTaskid...); err == nil {
if data, err := this.module.ModuleBuried.CheckCondition(session, szTaskid...); err == nil {
for _, v := range data {
if v.State == pb.BuriedItemFinishState_buried_finish {

2
modules/kftask/api_Info.go
View File

@ -38,7 +38,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.KFTaskInfoReq) (err
condiIds = append(condiIds, k)
}
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil {
if progress, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil {
return
}

2
modules/kftask/api_receive.go
View File

@ -72,7 +72,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq
return
}
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Venturetask); err != nil {
if progress, err = this.module.ModuleBuried.CheckCondition(session, conf.Venturetask); err != nil {
return
}

2
modules/mainline/api_info.go
View File

@ -62,7 +62,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.MainlineInfoReq) (e
for k, _ := range tasks {
condiIds = append(condiIds, k)
}
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil {
if progress, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil {
return
}
session.SendMsg(string(this.module.GetType()), "info", &pb.MainlineInfoResp{

2
modules/mainline/api_shop.go
View File

@ -39,7 +39,7 @@ func (this *apiComp) Shop(session comm.IUserSession, req *pb.MainlineShopReq) (e
condiIds = append(condiIds, v.Unlock)
}
info.Unlock = make(map[int32]int32)
if data, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err == nil {
if data, err := this.module.ModuleBuried.CheckCondition(session, condiIds...); err == nil {
for pos, v := range data {
if int32(v.State) == 1 { // 记录解锁的数据
key := shopinfo[pos].Key

2
modules/mainline/api_taskchaptereward.go
View File

@ -53,7 +53,7 @@ func (this *apiComp) TaskChapteReward(session comm.IUserSession, req *pb.Mainlin
}
if taskids := this.module.configure.getgroupTasks(req.Chapteid); len(taskids) > 0 {
for _, v := range taskids {
if progress, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), v.Taskid); err == nil {
if progress, err := this.module.ModuleBuried.CheckCondition(session, v.Taskid); err == nil {
for _, v := range progress {
if v.State == pb.BuriedItemFinishState_buried_unfinish {
errdata = &pb.ErrorData{

2
modules/mainline/api_taskinfo.go
View File

@ -37,7 +37,7 @@ func (this *apiComp) TaskInfo(session comm.IUserSession, req *pb.MainlineTaskInf
condiIds = append(condiIds, k)
}
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil {
if progress, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil {
return
}

2
modules/moonlv/api_getlist.go
View File

@ -14,7 +14,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MoonlvGetLi
// 获取护月等级基本信息
func (this *apiComp) GetList(session comm.IUserSession, req *pb.MoonlvGetListReq) (errdata *pb.ErrorData) {
list, err := this.module.modelMoonlv.getMoonlvList(session.GetUserId())
list, err := this.module.modelMoonlv.getMoonlvList(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

4
modules/moonlv/api_lvaward.go
View File

@ -25,7 +25,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MoonlvAwardReq) (e
atno []*pb.UserAtno
)
update = make(map[string]interface{}, 0)
list, err := this.module.modelMoonlv.getMoonlvList(session.GetUserId())
list, err := this.module.modelMoonlv.getMoonlvList(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
@ -73,7 +73,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MoonlvAwardReq) (e
szTaskid = append(szTaskid, v.TaskId) // 获取任务id
}
}
if data, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), szTaskid...); err == nil {
if data, err := this.module.ModuleBuried.CheckCondition(session, szTaskid...); err == nil {
for _, v := range data {
tmp := &pb.MoonTask{
TaskId: v.Conid,

2
modules/stonehenge/api_taskinfo.go
View File

@ -45,7 +45,7 @@ func (this *apiComp) TaskInfo(session comm.IUserSession, req *pb.StonehengeTaskI
tasks = append(tasks, v.TaskId)
}
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasks...); err != nil {
if progress, err = this.module.ModuleBuried.CheckCondition(session, tasks...); err != nil {
return
}
session.SendMsg(string(this.module.GetType()), "taskinfo", &pb.StonehengeTaskInfoResp{Conlds: progress, Task: info.Task})

2
modules/stonehenge/api_taskreceive.go
View File

@ -51,7 +51,7 @@ func (this *apiComp) TaskReceive(session comm.IUserSession, req *pb.StonehengeTa
return
}
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.TaskId); err != nil {
if progress, err = this.module.ModuleBuried.CheckCondition(session, conf.TaskId); err != nil {
return
}

2
modules/warorder/api_completealltask.go
View File

@ -87,7 +87,7 @@ func (this *apiComp) CompleteAllTask(session comm.IUserSession, req *pb.Warorder
}
}
if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil {
if condis, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil {
return
}

2
modules/warorder/api_completetask.go
View File

@ -117,7 +117,7 @@ func (this *apiComp) CompleteTask(session comm.IUserSession, req *pb.WarorderCom
}
}
if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Parameter); err != nil {
if condis, err = this.module.ModuleBuried.CheckCondition(session, conf.Parameter); err != nil {
return
}

2
modules/weektask/api_Info.go
View File

@ -68,7 +68,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WeekTaskInfoReq) (e
tasks = append(tasks, v.TypeId)
}
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasks...); err != nil {
if progress, err = this.module.ModuleBuried.CheckCondition(session, tasks...); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_ExternalModule.ToString(),

2
modules/weektask/api_receive.go
View File

@ -90,7 +90,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WeekTaskReceiveR
tasks = append(tasks, v.TypeId)
}
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasks...); err != nil {
if progress, err = this.module.ModuleBuried.CheckCondition(session, tasks...); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_ExternalModule.ToString(),

2
modules/wtask/api_accept.go
View File

@ -70,7 +70,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) (
wtask.Accepts = append(wtask.Accepts, req.Tid)
update["activations"] = wtask.Activations
update["accepts"] = wtask.Accepts
if errdata = this.module.ModuleBuried.ActiveCondition(session.GetUserId(), conf.Completetask...); err != nil {
if errdata = this.module.ModuleBuried.ActiveCondition(session, conf.Completetask...); err != nil {
return
}

2
modules/wtask/api_completecondi.go
View File

@ -77,7 +77,7 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WTaskCompl
return
}
if len(conf.Completetask) > 0 {
if progress, err = this.module.ModuleBuried.FinishConditionAndCheck(session.GetUserId(), []int32{req.CondiId}, conf.Completetask...); err != nil {
if progress, err = this.module.ModuleBuried.FinishConditionAndCheck(session, []int32{req.CondiId}, conf.Completetask...); err != nil {
this.module.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,

2
modules/wtask/api_finish.go
View File

@ -64,7 +64,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (
}
if len(conf.Completetask) > 0 {
if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Completetask...); err != nil {
if condis, err = this.module.ModuleBuried.CheckCondition(session, conf.Completetask...); err != nil {
this.module.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,

8
modules/wtask/module.go
View File

@ -129,7 +129,7 @@ func (this *WTask) BuriedsNotify(session comm.IUserSession, condis []*pb.ConIPro
}
}
if needcheck { //校验有变化的任务 的完成条件
if condis, err = this.ModuleBuried.CheckCondition(session.GetUserId(), checkcondls...); err != nil {
if condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil {
this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
return
}
@ -420,7 +420,7 @@ func (this *WTask) InquireTaskProgress(session comm.IUserSession, tasks ...int32
}
}
if len(checkcondls) > 0 {
if condis, err = this.ModuleBuried.CheckCondition(session.GetUserId(), checkcondls...); err != nil {
if condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil {
this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
@ -610,7 +610,7 @@ func (this *WTask) pushtaskprogress(session comm.IUserSession, wtask *pb.DBWTask
}
}
if len(checkcondls) > 0 {
if condis, err = this.ModuleBuried.CheckCondition(session.GetUserId(), checkcondls...); err != nil {
if condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil {
this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
@ -769,7 +769,7 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa
}
if changeAccept {
if errdata = this.ModuleBuried.ActiveCondition(session.GetUserId(), condiIds...); err != nil {
if errdata = this.ModuleBuried.ActiveCondition(session, condiIds...); err != nil {
return
}
progress, errdata = this.pushtaskprogress(session, wtask, ispush)