diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go index c006ca287..1431ae40a 100644 --- a/modules/sociaty/api_cross_mine.go +++ b/modules/sociaty/api_cross_mine.go @@ -16,9 +16,7 @@ func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.SociatyMineReq } func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (code pb.ErrorCode, data proto.Message) { - if code = this.module.ModuleSys.IsAccess(comm.Guild, session.GetUserId()); code != pb.ErrorCode_Success { - return - } + uid := session.GetUserId() userEx, err := this.module.ModuleUser.GetUserExpand(uid) if err != nil { diff --git a/modules/sys/api_activate.go b/modules/sys/api_activate.go index f649a9f38..352004605 100644 --- a/modules/sys/api_activate.go +++ b/modules/sys/api_activate.go @@ -8,11 +8,11 @@ import ( "google.golang.org/protobuf/proto" ) -func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.SysFuncActivateReq) (code pb.ErrorCode) { +func (this *apiComp) FuncActivateCheck(session comm.IUserSession, req *pb.SysFuncActivateReq) (code pb.ErrorCode) { return } -func (this *apiComp) Activate(session comm.IUserSession, req *pb.SysFuncActivateReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActivateReq) (code pb.ErrorCode, data proto.Message) { rsp := &pb.SysFuncActivateResp{} diff --git a/modules/sys/config.go b/modules/sys/config.go index 7722b8fe7..c1660eb73 100644 --- a/modules/sys/config.go +++ b/modules/sys/config.go @@ -26,9 +26,8 @@ func (this *configureComp) getOpencondCfg() (data *cfg.GameOpencond, err error) v interface{} ok bool ) - if v, err = this.GetConfigure(gameOpencond); err != nil { - return - } else { + if v, err = this.GetConfigure(gameOpencond); err == nil { + if data, ok = v.(*cfg.GameOpencond); !ok { err = fmt.Errorf("%T no is *cfg.GameOpencond", v) return @@ -38,21 +37,17 @@ func (this *configureComp) getOpencondCfg() (data *cfg.GameOpencond, err error) } func (this *configureComp) getFuncCfg(funcName string) (data *cfg.GameOpencondData) { - if cfg, err := this.getOpencondCfg(); err != nil { - return nil - } else { + if cfg, err := this.getOpencondCfg(); err == nil { data = cfg.GetDataMap()[funcName] } - return + return nil } func (this *configureComp) getOpencondList() (list []*cfg.GameOpencondData) { - if cfg, err := this.getOpencondCfg(); err != nil { - return nil - } else { + if cfg, err := this.getOpencondCfg(); err == nil { list = cfg.GetDataList() } - return + return nil } // 通过cid 找数据 diff --git a/modules/user/api_sign.go b/modules/user/api_sign.go index d047a0577..9ab18b6d2 100644 --- a/modules/user/api_sign.go +++ b/modules/user/api_sign.go @@ -16,9 +16,6 @@ func (this *apiComp) SignCheck(session comm.IUserSession, req *pb.UserSignReq) ( //登录 func (this *apiComp) Sign(session comm.IUserSession, req *pb.UserSignReq) (code pb.ErrorCode, data proto.Message) { - if code = this.module.ModuleSys.IsAccess(comm.Sign, session.GetUserId()); code != pb.ErrorCode_Success { - return - } if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil { session.SendMsg(string(this.module.GetType()), "sign", &pb.UserSignResp{ Data: sign, diff --git a/modules/user/model_sign.go b/modules/user/model_sign.go index 42d15a043..d6d441517 100644 --- a/modules/user/model_sign.go +++ b/modules/user/model_sign.go @@ -81,9 +81,7 @@ func (this *ModelSign) UserSign(session comm.IUserSession) { lastSignTime int64 // 上次签到时间 ) update = make(map[string]interface{}, 0) - if code := this.module.ModuleSys.IsAccess(comm.Sign, session.GetUserId()); code != pb.ErrorCode_Success { - return - } + if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil { // 获取当前是第几天 lastSignTime = sign.SignTime @@ -100,9 +98,7 @@ func (this *ModelSign) UserSign(session comm.IUserSession) { } sign.Puzzle = make([]int32, 31) } else { - if sign.Puzzle[iDay] != 0 { - return } @@ -121,7 +117,6 @@ func (this *ModelSign) UserSign(session comm.IUserSession) { this.module.modelSign.Change(session.GetUserId(), update) _data := this.module.configure.GetSignConf(sign.Day, sign.Group) if _data != nil { // 发奖 - this.module.DispenseRes(session, _data.Loopgift, true) // 签到奖励 // 额外奖励 if conf := this.module.configure.GetSignExtarConf(sign.SignCount, sign.Group); conf != nil {