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 2024-01-10 10:14:59 +08:00
commit 9b300608f6
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/buried/api_info.go
View File

@ -38,6 +38,10 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.BuriedInfoReq) (err
for _, items := range buried.Items { for _, items := range buried.Items {
for _, v := range items.Condi { for _, v := range items.Condi {
if conf, err = this.module.configure.getburiedcondidata(v.Conid); err != nil { if conf, err = this.module.configure.getburiedcondidata(v.Conid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Message: err.Error(),
}
return return
} }
conditions = append(conditions, comm.GetBuriedConIProgress(conf, v)) conditions = append(conditions, comm.GetBuriedConIProgress(conf, v))

9
modules/modulebase.go
View File

@ -7,6 +7,7 @@ import (
"go_dreamfactory/lego/base" "go_dreamfactory/lego/base"
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/lego/core/cbase" "go_dreamfactory/lego/core/cbase"
"runtime"
"time" "time"
"go_dreamfactory/lego/sys/log" "go_dreamfactory/lego/sys/log"
@ -983,6 +984,14 @@ func (this *ModuleBase) FormatRes(res []*cfg.Gameatn) (ret []*cfg.Gameatn) {
//异步调用用户处理流 //异步调用用户处理流
func (this *ModuleBase) AsynHandleSession(session comm.IUserSession, handle func(session comm.IUserSession)) { func (this *ModuleBase) AsynHandleSession(session comm.IUserSession, handle func(session comm.IUserSession)) {
defer func() { //程序异常 收集异常信息传递给前端显示
if r := recover(); r != nil {
buf := make([]byte, 4096)
l := runtime.Stack(buf, false)
err := fmt.Errorf("%v: %s", r, buf[:l])
log.Errorf("[AsynHandleSession] err:%s", err.Error())
}
}()
handle(session) handle(session)
session.Push() session.Push()
this.PutUserSession(session) this.PutUserSession(session)