diff --git a/src/server/game/admin.go b/src/server/game/admin.go index b85c3e9c..7e86c07a 100644 --- a/src/server/game/admin.go +++ b/src/server/game/admin.go @@ -60,7 +60,7 @@ func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg return } - if detail.Type == msg.LOGIN_TYPE_ACCOUNT_LOGIN { + 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, @@ -68,7 +68,7 @@ func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg return } - if detail.Type == msg.LOGIN_TYPE_ACCOUNT_LOGIN { + if detail.Type == msg.LOGIN_TYPE_CODE_LOGIN { err := VerifyUserCode(detail.UserName, detail.Code) if err != nil { ResLogin = &msg.ResLogin{