diff --git a/src/server/game/admin.go b/src/server/game/admin.go index 6c79a927..919f47b0 100644 --- a/src/server/game/admin.go +++ b/src/server/game/admin.go @@ -40,22 +40,6 @@ func AdminProcess(Func string, args []interface{}) { } func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg.ResLogin) { - if accountInfo == nil { - ResLogin = &msg.ResLogin{ - ResultCode: MergeConst.Protocol_Error_Account_NoExsit, - DwUin: 0, - } - return - } - - if detail.Type == msg.LOGIN_TYPE_ACCOUNT_LOGIN && accountInfo.UserPassword != detail.UserPwd { - ResLogin = &msg.ResLogin{ - ResultCode: MergeConst.Protocol_Error_Account_OR_PWD_ERROR, - DwUin: 0, - } - return - } - if detail.Type == msg.LOGIN_TYPE_CODE_LOGIN { err := VerifyCode(detail.UserName, detail.Code) if err != nil { @@ -66,6 +50,20 @@ func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg return } } + if accountInfo == nil { + ResLogin = &msg.ResLogin{ + ResultCode: MergeConst.Protocol_Error_Account_NoExsit, + DwUin: 0, + } + return + } + if detail.Type == msg.LOGIN_TYPE_ACCOUNT_LOGIN && accountInfo.UserPassword != detail.UserPwd { + ResLogin = &msg.ResLogin{ + ResultCode: MergeConst.Protocol_Error_Account_OR_PWD_ERROR, + DwUin: 0, + } + return + } if detail.Type == msg.LOGIN_TYPE_DEVICE_LOGIN { if detail.Device != accountInfo.DeviceId { ResLogin = &msg.ResLogin{