diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index c8b59c83b..7df1f7a4b 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -23,8 +23,7 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (err cost []*cfg.Gameatn // 消耗材料 ) - code = this.RiseCheck(session, req) - if errdata != nil { + if errdata = this.RiseCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) @@ -38,7 +37,10 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (err } if conf, err := this.module.configure.GetSmithyStoveConf(stove.Lv); err == nil { if stove.Temperature >= conf.MaxTemperature { // 已经达到最大的温度值了 - code = pb.ErrorCode_SmithyMaxTemperature + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SmithyMaxTemperature, + Title: pb.ErrorCode_SmithyMaxTemperature.ToString(), + } return } raise := this.module.ModuleTools.GetGlobalConf().RaiseTemperature @@ -50,7 +52,10 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (err }) if stove.Temperature+req.Count*raise_temperatureNum >= (conf.MaxTemperature + raise_temperatureNum) { - code = pb.ErrorCode_SmithyMaxTemperature + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SmithyMaxTemperature, + Title: pb.ErrorCode_SmithyMaxTemperature.ToString(), + } return } if errdata = this.module.ConsumeRes(session, cost, true); errdata != nil { diff --git a/modules/sys/api_activate.go b/modules/sys/api_activate.go index 40bed01b6..918c04bc8 100644 --- a/modules/sys/api_activate.go +++ b/modules/sys/api_activate.go @@ -17,7 +17,10 @@ func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActi opencfg := this.module.configure.getOpencondCfgByCid(req.Cid) if opencfg != nil { if id := this.module.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足 - code = pb.ErrorCode_OpenCondErr + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_OpenCondErr, + Title: pb.ErrorCode_OpenCondErr.ToString(), + } return } } @@ -25,7 +28,10 @@ func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActi list, _ := this.module.modelSys.GetOpenCondList(session.GetUserId()) for k, v := range list.Cond { if k == req.Cid && v != 0 { - code = pb.ErrorCode_OpenCondActivate + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_OpenCondActivate, + Title: pb.ErrorCode_OpenCondActivate.ToString(), + } return } } @@ -35,7 +41,10 @@ func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActi }) rsp.Cid = req.Cid if err := session.SendMsg(string(this.module.GetType()), "funcactivate", rsp); err != nil { - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + } } //手动激活通知模块 diff --git a/modules/sys/api_getlist.go b/modules/sys/api_getlist.go index 2b91eb2ab..a639d3c04 100644 --- a/modules/sys/api_getlist.go +++ b/modules/sys/api_getlist.go @@ -54,8 +54,6 @@ func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetLi } } - if err := session.SendMsg(string(this.module.GetType()), "funcgetlist", rsp); err != nil { - code = pb.ErrorCode_SystemError - } + session.SendMsg(string(this.module.GetType()), "funcgetlist", rsp) return }