авторитарный логин через лаунчер
This commit is contained in:
@@ -205,6 +205,19 @@ function Remove-MoonWellRuntimeGarbage {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# GlueXML is shipped by patch-ruRU-4.MPQ. Historical development copies in
|
||||||
|
# the client root override that archive and can restore the password form.
|
||||||
|
foreach ($relativePath in @(
|
||||||
|
'Interface\GlueXML\AccountLogin.lua',
|
||||||
|
'Interface\GlueXML\AccountLogin.xml'
|
||||||
|
)) {
|
||||||
|
$legacyOverride = Join-Path $Destination $relativePath
|
||||||
|
if (Test-Path -LiteralPath $legacyOverride -PathType Leaf) {
|
||||||
|
Remove-Item -LiteralPath $legacyOverride -Force
|
||||||
|
Write-Host "Removed obsolete loose GlueXML override: $legacyOverride"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Remove-EmptyMoonWellDirectories -Destination $Destination
|
Remove-EmptyMoonWellDirectories -Destination $Destination
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -112,6 +112,14 @@ end
|
|||||||
|
|
||||||
local function ApplyLaunchMode()
|
local function ApplyLaunchMode()
|
||||||
local developerMode = LoginState.launchMode == "developer"
|
local developerMode = LoginState.launchMode == "developer"
|
||||||
|
local launcherMode = LoginState.launchMode == "launcher"
|
||||||
|
|
||||||
|
if launcherMode then
|
||||||
|
AccountLoginUI:Hide()
|
||||||
|
else
|
||||||
|
AccountLoginUI:Show()
|
||||||
|
AccountLoginUI:SetAlpha(1)
|
||||||
|
end
|
||||||
|
|
||||||
if developerMode then
|
if developerMode then
|
||||||
UICache.accountEdit:Show()
|
UICache.accountEdit:Show()
|
||||||
@@ -417,6 +425,10 @@ function AccountLogin_OnLoad(self)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function AccountLogin_OnShow(self)
|
function AccountLogin_OnShow(self)
|
||||||
|
LoginState.luaBridgePending = type(MoonWellGetLaunchMode) ~= "function"
|
||||||
|
LoginState.launchMode = ResolveLaunchMode()
|
||||||
|
ApplyLaunchMode()
|
||||||
|
|
||||||
-- Submit launcher credentials before constructing the decorative login UI.
|
-- Submit launcher credentials before constructing the decorative login UI.
|
||||||
-- A cosmetic Lua error must never be able to block authentication.
|
-- A cosmetic Lua error must never be able to block authentication.
|
||||||
TryLauncherFallbackLogin()
|
TryLauncherFallbackLogin()
|
||||||
@@ -450,9 +462,6 @@ function AccountLogin_OnShow(self)
|
|||||||
elseif self.animatedTexture then
|
elseif self.animatedTexture then
|
||||||
self.animatedTexture:Hide()
|
self.animatedTexture:Hide()
|
||||||
end
|
end
|
||||||
AccountLoginUI:Show()
|
|
||||||
AccountLoginUI:SetAlpha(1)
|
|
||||||
|
|
||||||
if not self.newLogo then
|
if not self.newLogo then
|
||||||
self.newLogoFrame = CreateFrame("Frame", nil, self)
|
self.newLogoFrame = CreateFrame("Frame", nil, self)
|
||||||
self.newLogoFrame:SetWidth(Config.LOGO_SIZE)
|
self.newLogoFrame:SetWidth(Config.LOGO_SIZE)
|
||||||
@@ -486,8 +495,6 @@ function AccountLogin_OnShow(self)
|
|||||||
self.modelUpdateCount = 0
|
self.modelUpdateCount = 0
|
||||||
self.modelUpdateTimer = 0
|
self.modelUpdateTimer = 0
|
||||||
|
|
||||||
LoginState.luaBridgePending = type(MoonWellGetLaunchMode) ~= "function"
|
|
||||||
LoginState.launchMode = ResolveLaunchMode()
|
|
||||||
local accountName, password = "", ""
|
local accountName, password = "", ""
|
||||||
if LoginState.launchMode == "developer" then
|
if LoginState.launchMode == "developer" then
|
||||||
accountName, password = unpack(string_explode(GetSavedAccountName(), "#&|&#"))
|
accountName, password = unpack(string_explode(GetSavedAccountName(), "#&|&#"))
|
||||||
|
|||||||
@@ -207,7 +207,7 @@
|
|||||||
<!-- ====================================== -->
|
<!-- ====================================== -->
|
||||||
<!-- CAMPOS DE TEXTO: USUARIO Y CONTRASEÑA -->
|
<!-- CAMPOS DE TEXTO: USUARIO Y CONTRASEÑA -->
|
||||||
<!-- ====================================== -->
|
<!-- ====================================== -->
|
||||||
<EditBox name="AccountLoginAccountEdit" inherits="GlueDark_EditBoxTemplate" letters="320">
|
<EditBox name="AccountLoginAccountEdit" inherits="GlueDark_EditBoxTemplate" letters="320" hidden="true">
|
||||||
<Size x="200" y="37"/>
|
<Size x="200" y="37"/>
|
||||||
<Anchors>
|
<Anchors>
|
||||||
<Anchor point="BOTTOM">
|
<Anchor point="BOTTOM">
|
||||||
@@ -258,7 +258,7 @@
|
|||||||
</Scripts>
|
</Scripts>
|
||||||
</EditBox>
|
</EditBox>
|
||||||
|
|
||||||
<EditBox name="AccountLoginPasswordEdit" inherits="GlueDark_EditBoxTemplate" letters="16" password="1">
|
<EditBox name="AccountLoginPasswordEdit" inherits="GlueDark_EditBoxTemplate" letters="16" password="1" hidden="true">
|
||||||
<Size x="200" y="37"/>
|
<Size x="200" y="37"/>
|
||||||
<Anchors>
|
<Anchors>
|
||||||
<Anchor point="BOTTOM">
|
<Anchor point="BOTTOM">
|
||||||
@@ -311,7 +311,7 @@
|
|||||||
<!-- ====================================== -->
|
<!-- ====================================== -->
|
||||||
<!-- CHECKBOXES: GUARDAR CUENTA Y CONTRASEÑA -->
|
<!-- CHECKBOXES: GUARDAR CUENTA Y CONTRASEÑA -->
|
||||||
<!-- ====================================== -->
|
<!-- ====================================== -->
|
||||||
<Frame name="AccountLoginSaveOptionsFrame">
|
<Frame name="AccountLoginSaveOptionsFrame" hidden="true">
|
||||||
<Size x="200" y="60"/>
|
<Size x="200" y="60"/>
|
||||||
<Anchors>
|
<Anchors>
|
||||||
<Anchor point="TOP" relativeTo="AccountLoginPasswordEdit" relativePoint="BOTTOM">
|
<Anchor point="TOP" relativeTo="AccountLoginPasswordEdit" relativePoint="BOTTOM">
|
||||||
@@ -895,7 +895,7 @@
|
|||||||
<!-- ====================================== -->
|
<!-- ====================================== -->
|
||||||
<!-- BOTÓN DE LOGIN -->
|
<!-- BOTÓN DE LOGIN -->
|
||||||
<!-- ====================================== -->
|
<!-- ====================================== -->
|
||||||
<Button name="AccountLoginLoginButton" inherits="GlueButtonTemplateBlue" text="LOGIN">
|
<Button name="AccountLoginLoginButton" inherits="GlueButtonTemplateBlue" text="Авторизоваться">
|
||||||
<Size x="200" y="55"/>
|
<Size x="200" y="55"/>
|
||||||
<Anchors>
|
<Anchors>
|
||||||
<Anchor point="BOTTOM">
|
<Anchor point="BOTTOM">
|
||||||
|
|||||||
Vendored
+1
-1
Submodule vendor/warcraftxl updated: 1508beb6ec...30395282a0
Reference in New Issue
Block a user