Skip to content

GitLab

Commit 1c4a49ef authored by TOM_RUS's avatar TOM_RUS
Browse files
Options

WOW-30495patch8.2.0_PTR

parent 467edfb1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 966 additions and 549 deletions
Interface/AddOns/Blizzard_APIDocumentation/AzeriteEssenceDocumentation.lua
View file @ 1c4a49ef
...@@ -146,6 +146,15 @@ local AzeriteEssence = ...@@ -146,6 +146,15 @@ local AzeriteEssence =
{ Name = "essenceID", Type = "number", Nilable = false }, { Name = "essenceID", Type = "number", Nilable = false },
}, },
}, },
{
Name = "HasNeverActivatedAnyEssences",
Type = "Function",
Returns =
{
{ Name = "hasNeverActivatedAnyEssences", Type = "bool", Nilable = false },
},
},
{ {
Name = "HasPendingActivationEssence", Name = "HasPendingActivationEssence",
Type = "Function", Type = "Function",
......
Interface/AddOns/Blizzard_APIDocumentation/FriendListDocumentation.lua
View file @ 1c4a49ef
...@@ -393,6 +393,7 @@ local FriendList = ...@@ -393,6 +393,7 @@ local FriendList =
Payload = Payload =
{ {
{ Name = "friendId", Type = "number", Nilable = false }, { Name = "friendId", Type = "number", Nilable = false },
{ Name = "isCompanionApp", Type = "bool", Nilable = false, Default = false },
}, },
}, },
{ {
...@@ -402,6 +403,7 @@ local FriendList = ...@@ -402,6 +403,7 @@ local FriendList =
Payload = Payload =
{ {
{ Name = "friendId", Type = "number", Nilable = false }, { Name = "friendId", Type = "number", Nilable = false },
{ Name = "isCompanionApp", Type = "bool", Nilable = false, Default = false },
}, },
}, },
{ {
......
Interface/AddOns/Blizzard_APIDocumentation/PvpInfoDocumentation.lua
View file @ 1c4a49ef
...@@ -6,6 +6,24 @@ local PvpInfo = ...@@ -6,6 +6,24 @@ local PvpInfo =
Functions = Functions =
{ {
{
Name = "CanDisplayDeaths",
Type = "Function",
Returns =
{
{ Name = "canDisplay", Type = "bool", Nilable = false },
},
},
{
Name = "CanDisplayHonorableKills",
Type = "Function",
Returns =
{
{ Name = "canDisplay", Type = "bool", Nilable = false },
},
},
{ {
Name = "CanToggleWarMode", Name = "CanToggleWarMode",
Type = "Function", Type = "Function",
...@@ -496,6 +514,24 @@ local PvpInfo = ...@@ -496,6 +514,24 @@ local PvpInfo =
{ Name = "isInBrawl", Type = "bool", Nilable = false }, { Name = "isInBrawl", Type = "bool", Nilable = false },
}, },
}, },
{
Name = "IsMatchConsideredArena",
Type = "Function",
Returns =
{
{ Name = "asArena", Type = "bool", Nilable = false },
},
},
{
Name = "IsMatchFactional",
Type = "Function",
Returns =
{
{ Name = "isFactional", Type = "bool", Nilable = false },
},
},
{ {
Name = "IsPVPMap", Name = "IsPVPMap",
Type = "Function", Type = "Function",
......
Interface/AddOns/Blizzard_APIDocumentation/UIWidgetManagerDocumentation.lua
View file @ 1c4a49ef
...@@ -495,6 +495,32 @@ local UIWidgetManager = ...@@ -495,6 +495,32 @@ local UIWidgetManager =
{ Name = "NeitherStateIsGood", Type = "ZoneControlMode", EnumValue = 3 }, { Name = "NeitherStateIsGood", Type = "ZoneControlMode", EnumValue = 3 },
}, },
}, },
{
Name = "ZoneControlLeadingEdgeType",
Type = "Enumeration",
NumValues = 2,
MinValue = 0,
MaxValue = 1,
Fields =
{
{ Name = "NoLeadingEdge", Type = "ZoneControlLeadingEdgeType", EnumValue = 0 },
{ Name = "UseLeadingEdge", Type = "ZoneControlLeadingEdgeType", EnumValue = 1 },
},
},
{
Name = "ZoneControlDangerFlashType",
Type = "Enumeration",
NumValues = 4,
MinValue = 0,
MaxValue = 3,
Fields =
{
{ Name = "ShowOnGoodStates", Type = "ZoneControlDangerFlashType", EnumValue = 0 },
{ Name = "ShowOnBadStates", Type = "ZoneControlDangerFlashType", EnumValue = 1 },
{ Name = "ShowOnBoth", Type = "ZoneControlDangerFlashType", EnumValue = 2 },
{ Name = "ShowOnNeither", Type = "ZoneControlDangerFlashType", EnumValue = 3 },
},
},
{ {
Name = "ZoneControlState", Name = "ZoneControlState",
Type = "Enumeration", Type = "Enumeration",
...@@ -932,6 +958,8 @@ local UIWidgetManager = ...@@ -932,6 +958,8 @@ local UIWidgetManager =
{ {
{ Name = "shownState", Type = "WidgetShownState", Nilable = false }, { Name = "shownState", Type = "WidgetShownState", Nilable = false },
{ Name = "mode", Type = "ZoneControlMode", Nilable = false }, { Name = "mode", Type = "ZoneControlMode", Nilable = false },
{ Name = "leadingEdgeType", Type = "ZoneControlLeadingEdgeType", Nilable = false },
{ Name = "dangerFlashType", Type = "ZoneControlDangerFlashType", Nilable = false },
{ Name = "zoneEntries", Type = "table", InnerType = "ZoneEntry", Nilable = false }, { Name = "zoneEntries", Type = "table", InnerType = "ZoneEntry", Nilable = false },
{ Name = "widgetSizeSetting", Type = "number", Nilable = false }, { Name = "widgetSizeSetting", Type = "number", Nilable = false },
{ Name = "textureKitID", Type = "number", Nilable = false }, { Name = "textureKitID", Type = "number", Nilable = false },
......
Interface/AddOns/Blizzard_ArtifactUI/Blizzard_ArtifactPerks.lua
View file @ 1c4a49ef
...@@ -792,7 +792,7 @@ local function QueueReveal(self, powerButton, distance, tier) ...@@ -792,7 +792,7 @@ local function QueueReveal(self, powerButton, distance, tier)
if linkedPowerButton.hasSpentAny then if linkedPowerButton.hasSpentAny then
QueueReveal(self, linkedPowerButton, distance, tier); QueueReveal(self, linkedPowerButton, distance, tier);
else else
local distanceToLink = powerButton:CalculateDistanceTo(linkedPowerButton); local distanceToLink = CalculateDistanceBetweenRegions(powerButton, linkedPowerButton);
local totalDistance = distance + distanceToLink; local totalDistance = distance + distanceToLink;
QueueReveal(self, linkedPowerButton, totalDistance, tier); QueueReveal(self, linkedPowerButton, totalDistance, tier);
......
Interface/AddOns/Blizzard_ArtifactUI/Blizzard_ArtifactPowerButton.lua
View file @ 1c4a49ef
...@@ -506,13 +506,6 @@ function ArtifactPowerButtonMixin:UpdateIcon() ...@@ -506,13 +506,6 @@ function ArtifactPowerButtonMixin:UpdateIcon()
end end
end end
function ArtifactPowerButtonMixin:CalculateDistanceTo(otherPowerButton)
local cx, cy = self:GetCenter();
local ocx, ocy = otherPowerButton:GetCenter();
local dx, dy = ocx - cx, ocy - cy;
return math.sqrt(dx * dx + dy * dy);
end
function ArtifactPowerButtonMixin:SetupButton(powerID, anchorRegion, textureKit) function ArtifactPowerButtonMixin:SetupButton(powerID, anchorRegion, textureKit)
local powerInfo = C_ArtifactUI.GetPowerInfo(powerID); local powerInfo = C_ArtifactUI.GetPowerInfo(powerID);
......
Interface/AddOns/Blizzard_AzeriteEssenceUI/Blizzard_AzeriteEssenceUI.xml
View file @ 1c4a49ef
...@@ -16,6 +16,17 @@ ...@@ -16,6 +16,17 @@
</ModelScene> </ModelScene>
<Frame parentKey="SwirlContainer" inherits="PowerSwirlAnimationTemplate"/> <Frame parentKey="SwirlContainer" inherits="PowerSwirlAnimationTemplate"/>
</Frames> </Frames>
<Animations>
<AnimationGroup parentKey="RevealAnim">
<Alpha parentKey="Start" duration=".001" order="1" fromAlpha="0" toAlpha="0"/>
<Alpha duration="0.75" order="2" fromAlpha="0" toAlpha="1"/>
<Scripts>
<OnFinished>
self:GetParent():GetParent():OnMilestoneRevealAnimationFinished();
</OnFinished>
</Scripts>
</AnimationGroup>
</Animations>
<Scripts> <Scripts>
<OnLoad method="OnLoad"/> <OnLoad method="OnLoad"/>
<OnEvent method="OnEvent"/> <OnEvent method="OnEvent"/>
...@@ -65,8 +76,8 @@ ...@@ -65,8 +76,8 @@
</Anchors> </Anchors>
<Animations> <Animations>
<AnimationGroup parentKey="Anim" looping="REPEAT"> <AnimationGroup parentKey="Anim" looping="REPEAT">
<Alpha fromAlpha="0" toAlpha="0.4" duration="0.8" smoothing="IN_OUT" order="1"/> <Alpha fromAlpha="0" toAlpha="0.8" duration="0.8" smoothing="IN_OUT" order="1"/>
<Alpha fromAlpha="0.4" toAlpha="0" duration="0.8" smoothing="IN_OUT" order="2"/> <Alpha fromAlpha="0.8" toAlpha="0" duration="0.8" smoothing="IN_OUT" order="2"/>
</AnimationGroup> </AnimationGroup>
</Animations> </Animations>
</Texture> </Texture>
...@@ -94,12 +105,12 @@ ...@@ -94,12 +105,12 @@
</Layers> </Layers>
<Animations> <Animations>
<AnimationGroup parentKey="GlowAnim" setToFinalAlpha="true" looping="REPEAT"> <AnimationGroup parentKey="GlowAnim" setToFinalAlpha="true" looping="REPEAT">
<Alpha childKey="Rune" smoothing="IN_OUT" duration="1.2" order="1" fromAlpha="0.6" toAlpha="1"/> <Alpha childKey="Rune" smoothing="IN_OUT" duration="0.8" order="1" fromAlpha="0.2" toAlpha="1"/>
<Alpha childKey="Rune" smoothing="IN_OUT" duration="1.2" order="2" fromAlpha="1" toAlpha="0.6"/> <Alpha childKey="Rune" smoothing="IN_OUT" duration="0.8" order="2" fromAlpha="1" toAlpha="0.2"/>
</AnimationGroup> </AnimationGroup>
<AnimationGroup parentKey="ForgeGlowAnim" setToFinalAlpha="true" looping="REPEAT"> <AnimationGroup parentKey="ForgeGlowAnim" setToFinalAlpha="true" looping="REPEAT">
<Alpha childKey="Rune" smoothing="IN_OUT" duration="0.8" order="1" fromAlpha="0.4" toAlpha="1"/> <Alpha childKey="Rune" smoothing="IN_OUT" duration="0.6" order="1" fromAlpha="0.2" toAlpha="1"/>
<Alpha childKey="Rune" smoothing="IN_OUT" duration="0.8" order="2" fromAlpha="1" toAlpha="0.4"/> <Alpha childKey="Rune" smoothing="IN_OUT" duration="0.6" order="2" fromAlpha="1" toAlpha="0.2"/>
</AnimationGroup> </AnimationGroup>
</Animations> </Animations>
</Frame> </Frame>
...@@ -186,8 +197,8 @@ ...@@ -186,8 +197,8 @@
</Anchors> </Anchors>
<Animations> <Animations>
<AnimationGroup parentKey="Anim" looping="REPEAT"> <AnimationGroup parentKey="Anim" looping="REPEAT">
<Alpha fromAlpha="0" toAlpha="0.5" duration="0.8" smoothing="IN_OUT" order="1"/> <Alpha fromAlpha="0" toAlpha="0.8" duration="0.8" smoothing="IN_OUT" order="1"/>
<Alpha fromAlpha="0.5" toAlpha="0" duration="0.8" smoothing="IN_OUT" order="2"/> <Alpha fromAlpha="0.8" toAlpha="0" duration="0.8" smoothing="IN_OUT" order="2"/>
</AnimationGroup> </AnimationGroup>
</Animations> </Animations>
</Texture> </Texture>
...@@ -200,10 +211,10 @@ ...@@ -200,10 +211,10 @@
</Scripts> </Scripts>
</Frame> </Frame>
<Frame name="AzeriteMilestoneStaminaTemplate" parentArray="Milestones" inherits="AzeriteMilestoneBaseTemplate" mixin="AzeriteMilestoneStaminaMixin" virtual="true"> <Frame name="AzeriteMilestoneStaminaTemplate" inherits="AzeriteMilestoneBaseTemplate" mixin="AzeriteMilestoneStaminaMixin" virtual="true">
<Size x="19" y="24"/> <Size x="19" y="24"/>
<KeyValues> <KeyValues>
<KeyValue key="swirlScale" type="number" value="0.3"/> <KeyValue key="swirlScale" type="number" value="0.5"/>
</KeyValues> </KeyValues>
<Layers> <Layers>
<Layer level="BACKGROUND"> <Layer level="BACKGROUND">
...@@ -227,12 +238,12 @@ ...@@ -227,12 +238,12 @@
</Layers> </Layers>
<Animations> <Animations>
<AnimationGroup parentKey="GlowAnim" setToFinalAlpha="true" looping="REPEAT"> <AnimationGroup parentKey="GlowAnim" setToFinalAlpha="true" looping="REPEAT">
<Alpha childKey="Glow" smoothing="IN_OUT" duration="1.2" order="1" fromAlpha="0.3" toAlpha="0.7"/> <Alpha childKey="Glow" smoothing="IN_OUT" duration="0.8" order="1" fromAlpha="0.2" toAlpha="1"/>
<Alpha childKey="Glow" smoothing="IN_OUT" duration="1.2" order="2" fromAlpha="0.7" toAlpha="0.3"/> <Alpha childKey="Glow" smoothing="IN_OUT" duration="0.8" order="2" fromAlpha="1" toAlpha="0.2"/>
</AnimationGroup> </AnimationGroup>
<AnimationGroup parentKey="ForgeGlowAnim" setToFinalAlpha="true" looping="REPEAT"> <AnimationGroup parentKey="ForgeGlowAnim" setToFinalAlpha="true" looping="REPEAT">
<Alpha childKey="Glow" smoothing="IN_OUT" duration="0.8" order="1" fromAlpha="0.3" toAlpha="1"/> <Alpha childKey="Glow" smoothing="IN_OUT" duration="0.6" order="1" fromAlpha="0.2" toAlpha="1"/>
<Alpha childKey="Glow" smoothing="IN_OUT" duration="0.8" order="2" fromAlpha="1" toAlpha="0.3"/> <Alpha childKey="Glow" smoothing="IN_OUT" duration="0.6" order="2" fromAlpha="1" toAlpha="0.2"/>
</AnimationGroup> </AnimationGroup>
</Animations> </Animations>
</Frame> </Frame>
...@@ -482,7 +493,7 @@ ...@@ -482,7 +493,7 @@
</Anchors> </Anchors>
<Frames> <Frames>
<ModelScene parentKey="LearnEssenceModelScene" inherits="NonInteractableModelSceneMixinTemplate" frameStrata="HIGH" hidden="true"> <ModelScene parentKey="LearnEssenceModelScene" inherits="NonInteractableModelSceneMixinTemplate" frameStrata="HIGH" hidden="true">
<Size x="350" y="350"/> <Size x="650" y="650"/>
</ModelScene> </ModelScene>
<Slider parentKey="ScrollBar" inherits="HybridScrollBarTemplate"> <Slider parentKey="ScrollBar" inherits="HybridScrollBarTemplate">
<Anchors> <Anchors>
...@@ -571,7 +582,7 @@ ...@@ -571,7 +582,7 @@
</Texture> </Texture>
</Layer> </Layer>
<Layer level="ARTWORK" textureSubLevel="1"> <Layer level="ARTWORK" textureSubLevel="1">
<Texture parentKey="OrbGlass" atlas="heartofazeroth-orb-glass" alphaMode="ADD" alpha="0.3"> <Texture parentKey="OrbGlass" atlas="heartofazeroth-orb-glass" alphaMode="ADD" alpha="0.35">
<Size x="438" y="438"/> <Size x="438" y="438"/>
<Anchors> <Anchors>
<Anchor point="CENTER" relativeKey="$parent.OrbBackground"/> <Anchor point="CENTER" relativeKey="$parent.OrbBackground"/>
...@@ -623,24 +634,38 @@ ...@@ -623,24 +634,38 @@
<Layers> <Layers>
<Layer level="ARTWORK"> <Layer level="ARTWORK">
<Texture parentKey="Rune" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-rune4" useAtlasSize="true"> <Texture parentKey="Rune" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-rune4" useAtlasSize="true">
<KeyValues>
<KeyValue key="isRune" type="boolean" value="true"/>
</KeyValues>
<Anchors> <Anchors>
<Anchor point="CENTER"/> <Anchor point="CENTER"/>
</Anchors> </Anchors>
</Texture> </Texture>
<Texture parentKey="RuneFlipped" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-rune4-flipped" useAtlasSize="true"> <Texture parentKey="RuneFlipped" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-rune4" useAtlasSize="true">
<KeyValues>
<KeyValue key="isRune" type="boolean" value="true"/>
</KeyValues>
<Anchors> <Anchors>
<Anchor point="CENTER" relativeKey="$parent.Rune"/> <Anchor point="CENTER" relativeKey="$parent.Rune"/>
</Anchors> </Anchors>
<TexCoords left="1" right="0" top="0" bottom="1"/>
</Texture> </Texture>
<Texture parentKey="Rune2" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-rune4" useAtlasSize="true"> <Texture parentKey="Rune2" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-rune4" useAtlasSize="true">
<KeyValues>
<KeyValue key="isRune" type="boolean" value="true"/>
</KeyValues>
<Anchors> <Anchors>
<Anchor point="CENTER" relativeKey="$parent.Rune"/> <Anchor point="CENTER" relativeKey="$parent.Rune"/>
</Anchors> </Anchors>
</Texture> </Texture>
<Texture parentKey="RuneFlipped2" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-rune4-flipped" useAtlasSize="true"> <Texture parentKey="RuneFlipped2" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-rune4" useAtlasSize="true">
<KeyValues>
<KeyValue key="isRune" type="boolean" value="true"/>
</KeyValues>
<Anchors> <Anchors>
<Anchor point="CENTER" relativeKey="$parent.Rune"/> <Anchor point="CENTER" relativeKey="$parent.Rune"/>
</Anchors> </Anchors>
<TexCoords left="1" right="0" top="0" bottom="1"/>
</Texture> </Texture>
<Texture parentKey="RingLargeFlip" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-ring" useAtlasSize="true"> <Texture parentKey="RingLargeFlip" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-ring" useAtlasSize="true">
<Anchors> <Anchors>
...@@ -653,6 +678,9 @@ ...@@ -653,6 +678,9 @@
</Anchors> </Anchors>
</Texture> </Texture>
<Texture parentKey="RuneStatic" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-rune4" useAtlasSize="true"> <Texture parentKey="RuneStatic" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-rune4" useAtlasSize="true">
<KeyValues>
<KeyValue key="isRune" type="boolean" value="true"/>
</KeyValues>
<Anchors> <Anchors>
<Anchor point="CENTER" relativeKey="$parent.Rune"/> <Anchor point="CENTER" relativeKey="$parent.Rune"/>
</Anchors> </Anchors>
...@@ -691,19 +719,29 @@ ...@@ -691,19 +719,29 @@
</Texture> </Texture>
<Texture parentKey="Starfield" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-stars" useAtlasSize="true"> <Texture parentKey="Starfield" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-stars" useAtlasSize="true">
<Anchors> <Anchors>
<Anchor point="CENTER" relativeKey="$parent.RingLarge"/> <Anchor point="CENTER" relativeKey="$parent.OrbActivated"/>
</Anchors> </Anchors>
</Texture> </Texture>
</Layer> </Layer>
<Layer level="ARTWORK" textureSubLevel="2"> <Layer level="ARTWORK" textureSubLevel="2">
<Texture parentKey="Glowies" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-Glowies" useAtlasSize="true"> <Texture parentKey="Glowies" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-Glowies" useAtlasSize="true">
<Anchors> <Anchors>
<Anchor point="CENTER" relativeKey="$parent.RingLarge"/> <Anchor point="CENTER" relativeKey="$parent.OrbActivated"/>
</Anchors> </Anchors>
</Texture> </Texture>
<Texture parentKey="Glowies2" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-Glowies" useAtlasSize="true"> <Texture parentKey="Glowies2" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-Glowies" useAtlasSize="true">
<Anchors> <Anchors>
<Anchor point="CENTER" relativeKey="$parent.RingLarge"/> <Anchor point="CENTER" relativeKey="$parent.OrbActivated"/>
</Anchors>
</Texture>
<Texture parentKey="GlassShards" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-glassshards" useAtlasSize="true">
<Anchors>
<Anchor point="CENTER" relativeKey="$parent.OrbActivated"/>
</Anchors>
</Texture>
<Texture parentKey="GlassShards2" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-glassshards" useAtlasSize="true">
<Anchors>
<Anchor point="CENTER" relativeKey="$parent.OrbActivated"/>
</Anchors> </Anchors>
</Texture> </Texture>
</Layer> </Layer>
...@@ -711,7 +749,7 @@ ...@@ -711,7 +749,7 @@
<Texture parentKey="LensflareLine" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-LensflareLine"> <Texture parentKey="LensflareLine" parentArray="Textures" alpha="0" alphaMode="ADD" atlas="heartofazeroth-animation-LensflareLine">
<Size x="5000" y="387"/> <Size x="5000" y="387"/>
<Anchors> <Anchors>
<Anchor point="CENTER" relativeKey="$parent.RingLarge"/> <Anchor point="CENTER" relativeKey="$parent.OrbActivated"/>
</Anchors> </Anchors>
</Texture> </Texture>
</Layer> </Layer>
...@@ -752,13 +790,17 @@ ...@@ -752,13 +790,17 @@
<Alpha childKey="Rune2" startDelay="0.802" duration="0" order="1" fromAlpha="0" toAlpha="0.5"/> <Alpha childKey="Rune2" startDelay="0.802" duration="0" order="1" fromAlpha="0" toAlpha="0.5"/>
<Scale childKey="RingLargeFlip" startDelay="0.802" duration="0.067" order="1" fromScaleX="1" fromScaleY="1" toScaleX="10" toScaleY="0.926"/> <Scale childKey="RingLargeFlip" startDelay="0.802" duration="0.067" order="1" fromScaleX="1" fromScaleY="1" toScaleX="10" toScaleY="0.926"/>
<Scale childKey="RingLargeFlip2" startDelay="0.802" duration="0.067" order="1" fromScaleX="1" fromScaleY="1" toScaleX="10" toScaleY="0.926"/> <Scale childKey="RingLargeFlip2" startDelay="0.802" duration="0.067" order="1" fromScaleX="1" fromScaleY="1" toScaleX="10" toScaleY="0.926"/>
<Alpha childKey="Glowies" startDelay="0.802" duration="1.3" order="1" fromAlpha="1" toAlpha="0"/>
<Alpha childKey="Glowies2" startDelay="0.802" duration="1.3" order="1" fromAlpha="1" toAlpha="0"/> <Alpha childKey="Glowies2" startDelay="0.802" duration="1.3" order="1" fromAlpha="1" toAlpha="0"/>
<Alpha childKey="GlassShards" startDelay="0.802" duration="1.3" order="1" fromAlpha="1" toAlpha="0"/>
<Alpha childKey="GlassShards2" startDelay="0.802" duration="1.3" order="1" fromAlpha="1" toAlpha="0"/>
<Scale childKey="Rune" startDelay="0.802" duration="0.067" order="1" fromScaleX="0.01" fromScaleY="1.64" toScaleX="1.25" toScaleY="1.25"/> <Scale childKey="Rune" startDelay="0.802" duration="0.067" order="1" fromScaleX="0.01" fromScaleY="1.64" toScaleX="1.25" toScaleY="1.25"/>
<Scale childKey="Rune2" startDelay="0.802" duration="0.067" order="1" fromScaleX="0.01" fromScaleY="1.64" toScaleX="1.25" toScaleY="1.25"/> <Scale childKey="Rune2" startDelay="0.802" duration="0.067" order="1" fromScaleX="0.01" fromScaleY="1.64" toScaleX="1.25" toScaleY="1.25"/>
<Alpha childKey="Glowies" startDelay="0.802" duration="1.3" order="1" fromAlpha="1" toAlpha="0"/>
<Scale childKey="RuneStatic" startDelay="0.802" duration="1.772" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.8" toScaleY="0.8"/> <Scale childKey="RuneStatic" startDelay="0.802" duration="1.772" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.8" toScaleY="0.8"/>
<Scale childKey="Glowies" startDelay="0.802" duration="2" order="1" fromScaleX="0.45" fromScaleY="0.45" toScaleX="0.65" toScaleY="0.65"/> <Scale childKey="Glowies" startDelay="0.802" duration="2" order="1" fromScaleX="0.3" fromScaleY="0.3" toScaleX="0.5" toScaleY="0.5"/>
<Scale childKey="Glowies2" startDelay="0.802" duration="2" order="1" fromScaleX="0.45" fromScaleY="0.45" toScaleX="0.65" toScaleY="0.65"/> <Scale childKey="Glowies2" startDelay="0.802" duration="2" order="1" fromScaleX="0.3" fromScaleY="0.3" toScaleX="0.5" toScaleY="0.5"/>
<Scale childKey="GlassShards" startDelay="0.802" duration="2" order="1" fromScaleX="0.45" fromScaleY="0.45" toScaleX="0.6" toScaleY="0.6"/>
<Scale childKey="GlassShards2" startDelay="0.802" duration="2" order="1" fromScaleX="0.45" fromScaleY="0.45" toScaleX="0.6" toScaleY="0.6"/>
<Scale childKey="RingSmall" startDelay="0.869" duration="0.505" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.94" toScaleY="0.94"/> <Scale childKey="RingSmall" startDelay="0.869" duration="0.505" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.94" toScaleY="0.94"/>
<Scale childKey="RingLarge" startDelay="0.869" duration="0.505" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.926" toScaleY="0.926"/> <Scale childKey="RingLarge" startDelay="0.869" duration="0.505" order="1" fromScaleX="1" fromScaleY="1" toScaleX="0.926" toScaleY="0.926"/>
<Alpha childKey="Sunburst" startDelay="0.869" duration="0.505" order="1" fromAlpha="1" toAlpha="0.6"/> <Alpha childKey="Sunburst" startDelay="0.869" duration="0.505" order="1" fromAlpha="1" toAlpha="0.6"/>
......
Interface/AddOns/Blizzard_Communities/ClubFinder.lua
View file @ 1c4a49ef
...@@ -11,13 +11,17 @@ function ClubsRecruitmentDialogMixin:OnLoad() ...@@ -11,13 +11,17 @@ function ClubsRecruitmentDialogMixin:OnLoad()
UIDropDownMenu_Initialize(self.ClubFocusDropdown, ClubFocusClubDropdownInitialize); UIDropDownMenu_Initialize(self.ClubFocusDropdown, ClubFocusClubDropdownInitialize);
end end
function ClubsRecruitmentDialogMixin:OnShow()
self:GetParent():RegisterDialogShown(self);
end
function ClubsRecruitmentDialogMixin:PostClub() function ClubsRecruitmentDialogMixin:PostClub()
local communityFrame = self:GetParent(); local communityFrame = self:GetParent();
local clubInfo = C_Club.GetClubInfo(communityFrame:GetSelectedClubId()); local clubInfo = C_Club.GetClubInfo(communityFrame:GetSelectedClubId());
local specsInList = self.LookingForDropdown:GetSpecsList(); local specsInList = self.LookingForDropdown:GetSpecsList();
local minItemLevel = self.MinIlvlOnly.EditBox:GetNumber(); local minItemLevel = self.MinIlvlOnly.EditBox:GetNumber();
local description = self.RecruitmentMessageFrame.EditBox:GetText():gsub("\n",""); local description = self.RecruitmentMessageFrame.RecruitmentMessageInput.EditBox:GetText():gsub("\n","");
local minimumLevel = 0; local minimumLevel = 0;
if (self.MaxLevelOnly.Button:GetChecked()) then if (self.MaxLevelOnly.Button:GetChecked()) then
...@@ -34,7 +38,7 @@ end ...@@ -34,7 +38,7 @@ end
ClubFinderRequestToJoinMixin = {}; ClubFinderRequestToJoinMixin = {};
function ClubFinderRequestToJoinMixin:ApplyToClub() function ClubFinderRequestToJoinMixin:ApplyToClub()
local editbox = self.MessageFrame.EditBox; local editbox = self.MessageFrame.MessageScroll.EditBox;
local selectedSpecs = { }; local selectedSpecs = { };
for i, spec in ipairs(self.Specs) do for i, spec in ipairs(self.Specs) do
if(spec.CheckBox:GetChecked()) then if(spec.CheckBox:GetChecked()) then
...@@ -43,6 +47,14 @@ function ClubFinderRequestToJoinMixin:ApplyToClub() ...@@ -43,6 +47,14 @@ function ClubFinderRequestToJoinMixin:ApplyToClub()
end end
C_ClubFinder.RequestMembershipToClub(self.info.clubFinderGUID, editbox:GetText():gsub("\n",""), selectedSpecs); C_ClubFinder.RequestMembershipToClub(self.info.clubFinderGUID, editbox:GetText():gsub("\n",""), selectedSpecs);
local requestType;
if (self:GetParent().isGuildType) then
requestType = Enum.ClubFinderRequestType.Guild;
else
requestType = Enum.ClubFinderRequestType.Community;
end
C_ClubFinder.PlayerRequestPendingClubsList(requestType);
self.card.RequestJoin:Hide();