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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2023-03-31 21:11:40 +08:00
commit a8a900523b
3 changed files with 70 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/practice/api_expulsion.go
View File

@ -178,19 +178,22 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls
} }
} }
defer func() { defer func() {
if ok { //在线直接推送消息
this.module.PutUserSession(_session) this.module.PutUserSession(_session)
}
}() }()
if _session, ok = this.module.GetUserSession(pillar.Uid); ok { _session, ok = this.module.GetUserSession(pillar.Uid)
if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success { // if _session, ok = this.module.GetUserSession(pillar.Uid); ok {
return // if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success {
} // return
if code = this.module.DispenseRes(_session, append(ants1, ants2...), true); code != pb.ErrorCode_Success { // }
return // if code = this.module.DispenseRes(_session, append(ants1, ants2...), true); code != pb.ErrorCode_Success {
} // return
if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); code != pb.ErrorCode_Success { // }
return // if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); code != pb.ErrorCode_Success {
} // return
} else { // }
// } else {
if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success { if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success {
return return
} }
@ -217,7 +220,7 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls
CreateTime: uint64(configure.Now().Unix()), CreateTime: uint64(configure.Now().Unix()),
Items: res, Items: res,
}, pillar.Uid) }, pillar.Uid)
} // }
froom.Knapsack[pillar.Teacher] = 0 froom.Knapsack[pillar.Teacher] = 0
froom.Knapsack[pillar.Prop] = 0 froom.Knapsack[pillar.Prop] = 0

8
modules/worldtask/api_finish.go
View File

@ -203,9 +203,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
) )
return return
} }
//判断是否配置了通知module
if len(curTaskConf.Module) == 0 {
// 发奖 // 发奖
if code = this.module.DispenseRes(session, curTaskConf.Reword, true); code != pb.ErrorCode_Success { if code = this.module.DispenseRes(session, curTaskConf.Reword, true); code != pb.ErrorCode_Success {
this.module.Error("资源发放", this.module.Error("资源发放",
@ -216,7 +213,8 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
log.Field{Key: "code", Value: code}, log.Field{Key: "code", Value: code},
) )
} }
} else {
//判断是否配置了通知module
for _, m := range curTaskConf.Module { for _, m := range curTaskConf.Module {
i, err := this.service.GetModule(core.M_Modules(m)) i, err := this.service.GetModule(core.M_Modules(m))
if err != nil { if err != nil {
@ -228,7 +226,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
ic.TaskComplete(session, req.TaskId) ic.TaskComplete(session, req.TaskId)
} }
} }
}
} }
//判断任务是否已完成 //判断任务是否已完成

6
modules/worldtask/model_worldtask.go
View File

@ -273,10 +273,8 @@ func (this *ModelWorldtask) taskFinish(session comm.IUserSession, groupId, taskI
return return
} }
//判断是否配置了通知module
if len(curTaskConf.Module) == 0 {
this.moduleWorldtask.DispenseRes(session, curTaskConf.Reword, true) this.moduleWorldtask.DispenseRes(session, curTaskConf.Reword, true)
} else { //判断是否配置了通知module
for _, m := range curTaskConf.Module { for _, m := range curTaskConf.Module {
i, err := this.service.GetModule(core.M_Modules(m)) i, err := this.service.GetModule(core.M_Modules(m))
if err != nil { if err != nil {
@ -288,5 +286,5 @@ func (this *ModelWorldtask) taskFinish(session comm.IUserSession, groupId, taskI
ic.TaskComplete(session, taskId) ic.TaskComplete(session, taskId)
} }
} }
}
} }