diff --git a/Zframework b/Zframework index b0b59816..080c0bc5 160000 --- a/Zframework +++ b/Zframework @@ -1 +1 @@ -Subproject commit b0b5981698a01dd5188fb1de2f5115a7991f88e7 +Subproject commit 080c0bc5526812cb6d7366a979cef2aaa1f25b54 diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index ae0d033e..40abab22 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -140,12 +140,10 @@ return{ PlayerManager={ invalidCode="Invalid code", invalidEmail="Invalid email", - invalidAccessToken="Invalid access token", playerNotFound="Player not found", noPassword="No password", invalidEmailPass="Invalid email or password", emailExists="Email exists", - invalidRefreshToken="Invalid refresh token", emailSendError="Email send error", }, -- Strategies diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index dce023de..ef450436 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -139,12 +139,10 @@ return{ PlayerManager={ -- invalidCode="Invalid code", -- invalidEmail="Invalid email", - -- invalidAccessToken="Invalid access token", -- playerNotFound="Player not found", -- noPassword="No password", -- invalidEmailPass="Invalid email or password", -- emailExists="Email exists", - -- invalidRefreshToken="Invalid refresh token", -- emailSendError="Email send error", }, -- Strategies diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 78b9dec1..f7d14db4 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -130,12 +130,10 @@ return{ PlayerManager={ -- invalidCode="Invalid code", -- invalidEmail="Invalid email", - -- invalidAccessToken="Invalid access token", -- playerNotFound="Player not found", -- noPassword="No password", -- invalidEmailPass="Invalid email or password", -- emailExists="Email exists", - -- invalidRefreshToken="Invalid refresh token", -- emailSendError="Email send error", }, -- Strategies diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua index c9e65f94..560dab7d 100644 --- a/parts/language/lang_id.lua +++ b/parts/language/lang_id.lua @@ -141,12 +141,10 @@ return{ PlayerManager={ -- invalidCode="Invalid code", -- invalidEmail="Invalid email", - -- invalidAccessToken="Invalid access token", -- playerNotFound="Player not found", -- noPassword="No password", -- invalidEmailPass="Invalid email or password", -- emailExists="Email exists", - -- invalidRefreshToken="Invalid refresh token", -- emailSendError="Email send error", }, -- Strategies diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua index 0991ffe4..6c20e64c 100644 --- a/parts/language/lang_ja.lua +++ b/parts/language/lang_ja.lua @@ -141,12 +141,10 @@ return{ PlayerManager={ -- invalidCode="Invalid code", -- invalidEmail="Invalid email", - -- invalidAccessToken="Invalid access token", -- playerNotFound="Player not found", -- noPassword="No password", -- invalidEmailPass="Invalid email or password", -- emailExists="Email exists", - -- invalidRefreshToken="Invalid refresh token", -- emailSendError="Email send error", }, -- Strategies diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 71151984..3855b43c 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -128,12 +128,10 @@ return{ PlayerManager={ -- invalidCode="Invalid code", -- invalidEmail="Invalid email", - -- invalidAccessToken="Invalid access token", -- playerNotFound="Player not found", -- noPassword="No password", -- invalidEmailPass="Invalid email or password", -- emailExists="Email exists", - -- invalidRefreshToken="Invalid refresh token", -- emailSendError="Email send error", }, -- Strategies diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 822a8c61..a848d4fc 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -140,12 +140,10 @@ return{ PlayerManager={ invalidCode="无效验证码", invalidEmail="无效邮箱", - invalidAccessToken="访问令牌无效", playerNotFound="找不到玩家", noPassword="无密码", invalidEmailPass="邮箱或密码无效", emailExists="邮箱存在", - invalidRefreshToken="刷新令牌无效", emailSendError="邮箱发送错误", }, -- Strategies diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 949a591e..8025aa37 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -140,12 +140,10 @@ return{ PlayerManager={ invalidCode="無效驗證碼", invalidEmail="無效郵箱", - invalidAccessToken="訪問權杖無效", playerNotFound="找不到玩家", noPassword="無密碼", invalidEmailPass="郵箱或密碼無效", emailExists="郵箱存在", - invalidRefreshToken="重繪權杖無效", emailSendError="郵箱發送錯誤", }, -- Strategies diff --git a/parts/net.lua b/parts/net.lua index f6b65832..855354ac 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -50,8 +50,14 @@ function NET.freshRoomAllReady() end -------------------------- +local ignoreError={ + ["Techrater.PlayerStream.notAvailable"]=true, + ["Techrater.PlayerManager.invalidAccessToken"]=true, + ["Techrater.PlayerManager.invalidRefreshToken"]=true, +} local availableErrorTextType={info=1,warn=1,error=1} local function parseError(pathStr) + if ignoreError[pathStr] then return end LOG(pathStr) if type(pathStr)~='string' then MES.new('error',"<"..tostring(pathStr)..">",5)