Commit fa6b1c21 authored by TOM_RUS's avatar TOM_RUS
Browse files

WOW-26903patch8.0.1_Beta

parent 1bc54d8b
......@@ -437,10 +437,28 @@ local Club =
{ Name = "ranges", Type = "table", InnerType = "ClubMessageRange", Nilable = false },
},
},
{
Name = "GetMessagesBefore",
Type = "Function",
Documentation = { "Get downloaded messages before (and including) the specified messageId limited by count. These are filtered by ignored players" },
Arguments =
{
{ Name = "clubId", Type = "string", Nilable = false },
{ Name = "streamId", Type = "string", Nilable = false },
{ Name = "newest", Type = "ClubMessageIdentifier", Nilable = false },
{ Name = "count", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "messages", Type = "table", InnerType = "ClubMessageInfo", Nilable = false },
},
},
{
Name = "GetMessagesInRange",
Type = "Function",
Documentation = { "Get all downloaded messages in the given range." },
Documentation = { "Get downloaded messages in the given range. These are filtered by ignored players" },
Arguments =
{
......@@ -586,18 +604,6 @@ local Club =
{ Name = "clubId", Type = "string", Nilable = false },
},
},
{
Name = "RequestMoreMessagesAfter",
Type = "Function",
Documentation = { "Call this when the user scrolls near the bottom of the message view, and more need to be displayed." },
Arguments =
{
{ Name = "clubId", Type = "string", Nilable = false },
{ Name = "streamId", Type = "string", Nilable = false },
{ Name = "messageId", Type = "ClubMessageIdentifier", Nilable = false },
},
},
{
Name = "RequestMoreMessagesBefore",
Type = "Function",
......@@ -608,6 +614,12 @@ local Club =
{ Name = "clubId", Type = "string", Nilable = false },
{ Name = "streamId", Type = "string", Nilable = false },
{ Name = "messageId", Type = "ClubMessageIdentifier", Nilable = true },
{ Name = "count", Type = "number", Nilable = true },
},
Returns =
{
{ Name = "alreadyHasMessages", Type = "bool", Nilable = false },
},
},
{
......@@ -934,6 +946,8 @@ local Club =
Payload =
{
{ Name = "clubId", Type = "string", Nilable = false },
{ Name = "clubName", Type = "string", Nilable = true },
{ Name = "clubRemovedReason", Type = "ClubRemovedReason", Nilable = false },
},
},
{
......@@ -1190,16 +1204,17 @@ local Club =
{
Name = "ClubMemberPresence",
Type = "Enumeration",
NumValues = 5,
NumValues = 6,
MinValue = 0,
MaxValue = 4,
MaxValue = 5,
Fields =
{
{ Name = "Unknown", Type = "ClubMemberPresence", EnumValue = 0 },
{ Name = "Online", Type = "ClubMemberPresence", EnumValue = 1 },
{ Name = "Offline", Type = "ClubMemberPresence", EnumValue = 2 },
{ Name = "Away", Type = "ClubMemberPresence", EnumValue = 3 },
{ Name = "Busy", Type = "ClubMemberPresence", EnumValue = 4 },
{ Name = "OnlineMobile", Type = "ClubMemberPresence", EnumValue = 2 },
{ Name = "Offline", Type = "ClubMemberPresence", EnumValue = 3 },
{ Name = "Away", Type = "ClubMemberPresence", EnumValue = 4 },
{ Name = "Busy", Type = "ClubMemberPresence", EnumValue = 5 },
},
},
{
......@@ -1215,6 +1230,20 @@ local Club =
{ Name = "AlreadyMember", Type = "ClubInvitationCandidateStatus", EnumValue = 2 },
},
},
{
Name = "ClubRemovedReason",
Type = "Enumeration",
NumValues = 4,
MinValue = 0,
MaxValue = 3,
Fields =
{
{ Name = "None", Type = "ClubRemovedReason", EnumValue = 0 },
{ Name = "Banned", Type = "ClubRemovedReason", EnumValue = 1 },
{ Name = "Removed", Type = "ClubRemovedReason", EnumValue = 2 },
{ Name = "ClubDestroyed", Type = "ClubRemovedReason", EnumValue = 3 },
},
},
{
Name = "ClubStreamType",
Type = "Enumeration",
......
......@@ -2,6 +2,7 @@ local IslandsInfo =
{
Name = "IslandsInfo",
Type = "System",
Namespace = "C_IslandsInfo",
Functions =
{
......
......@@ -19,6 +19,15 @@ local IslandsQueueUI =
{ Name = "lfgIslandDifficultyIds", Type = "table", InnerType = "number", Nilable = false },
},
},
{
Name = "GetIslandsMaxGroupSize",
Type = "Function",
Returns =
{
{ Name = "maxGroupSize", Type = "number", Nilable = false },
},
},
{
Name = "GetIslandsWeeklyQuestID",
Type = "Function",
......
......@@ -453,15 +453,15 @@ local Item =
MaxValue = 8,
Fields =
{
{ Name = "ItemQualityPoor", Type = "ItemQuality", EnumValue = 0 },
{ Name = "ItemQualityStandard", Type = "ItemQuality", EnumValue = 1 },
{ Name = "ItemQualityGood", Type = "ItemQuality", EnumValue = 2 },
{ Name = "ItemQualitySuperior", Type = "ItemQuality", EnumValue = 3 },
{ Name = "ItemQualityEpic", Type = "ItemQuality", EnumValue = 4 },
{ Name = "ItemQualityLegendary", Type = "ItemQuality", EnumValue = 5 },
{ Name = "ItemQualityArtifact", Type = "ItemQuality", EnumValue = 6 },
{ Name = "ItemQualityHeirloom", Type = "ItemQuality", EnumValue = 7 },
{ Name = "ItemQualityWoWToken", Type = "ItemQuality", EnumValue = 8 },
{ Name = "Poor", Type = "ItemQuality", EnumValue = 0 },
{ Name = "Standard", Type = "ItemQuality", EnumValue = 1 },
{ Name = "Good", Type = "ItemQuality", EnumValue = 2 },
{ Name = "Superior", Type = "ItemQuality", EnumValue = 3 },
{ Name = "Epic", Type = "ItemQuality", EnumValue = 4 },
{ Name = "Legendary", Type = "ItemQuality", EnumValue = 5 },
{ Name = "Artifact", Type = "ItemQuality", EnumValue = 6 },
{ Name = "Heirloom", Type = "ItemQuality", EnumValue = 7 },
{ Name = "WoWToken", Type = "ItemQuality", EnumValue = 8 },
},
},
},
......
......@@ -44,7 +44,8 @@ local PvpInfo =
{
{ Name = "honor", Type = "number", Nilable = false },
{ Name = "experience", Type = "number", Nilable = false },
{ Name = "rewards", Type = "table", InnerType = "BattlefieldReward", Nilable = true },
{ Name = "itemRewards", Type = "table", InnerType = "BattlefieldItemReward", Nilable = true },
{ Name = "currencyRewards", Type = "table", InnerType = "BattlefieldCurrencyReward", Nilable = true },
},
},
{
......@@ -55,7 +56,8 @@ local PvpInfo =
{
{ Name = "honor", Type = "number", Nilable = false },
{ Name = "experience", Type = "number", Nilable = false },
{ Name = "rewards", Type = "table", InnerType = "BattlefieldReward", Nilable = true },
{ Name = "itemRewards", Type = "table", InnerType = "BattlefieldItemReward", Nilable = true },
{ Name = "currencyRewards", Type = "table", InnerType = "BattlefieldCurrencyReward", Nilable = true },
},
},
{
......@@ -81,7 +83,8 @@ local PvpInfo =
{
{ Name = "honor", Type = "number", Nilable = false },
{ Name = "experience", Type = "number", Nilable = false },
{ Name = "rewards", Type = "table", InnerType = "BattlefieldReward", Nilable = true },
{ Name = "itemRewards", Type = "table", InnerType = "BattlefieldItemReward", Nilable = true },
{ Name = "currencyRewards", Type = "table", InnerType = "BattlefieldCurrencyReward", Nilable = true },
{ Name = "hasWon", Type = "bool", Nilable = false },
},
},
......@@ -172,7 +175,8 @@ local PvpInfo =
{
{ Name = "honor", Type = "number", Nilable = false },
{ Name = "experience", Type = "number", Nilable = false },
{ Name = "rewards", Type = "table", InnerType = "BattlefieldReward", Nilable = true },
{ Name = "itemRewards", Type = "table", InnerType = "BattlefieldItemReward", Nilable = true },
{ Name = "currencyRewards", Type = "table", InnerType = "BattlefieldCurrencyReward", Nilable = true },
},
},
{
......@@ -192,7 +196,8 @@ local PvpInfo =
{
{ Name = "honor", Type = "number", Nilable = false },
{ Name = "experience", Type = "number", Nilable = false },
{ Name = "rewards", Type = "table", InnerType = "BattlefieldReward", Nilable = true },
{ Name = "itemRewards", Type = "table", InnerType = "BattlefieldItemReward", Nilable = true },
{ Name = "currencyRewards", Type = "table", InnerType = "BattlefieldCurrencyReward", Nilable = true },
},
},
{
......@@ -203,7 +208,8 @@ local PvpInfo =
{
{ Name = "honor", Type = "number", Nilable = false },
{ Name = "experience", Type = "number", Nilable = false },
{ Name = "rewards", Type = "table", InnerType = "BattlefieldReward", Nilable = true },
{ Name = "itemRewards", Type = "table", InnerType = "BattlefieldItemReward", Nilable = true },
{ Name = "currencyRewards", Type = "table", InnerType = "BattlefieldCurrencyReward", Nilable = true },
},
},
{
......@@ -514,7 +520,16 @@ local PvpInfo =
},
},
{
Name = "BattlefieldReward",
Name = "BattlefieldCurrencyReward",
Type = "Structure",
Fields =
{
{ Name = "id", Type = "number", Nilable = false },
{ Name = "quantity", Type = "number", Nilable = false },
},
},
{
Name = "BattlefieldItemReward",
Type = "Structure",
Fields =
{
......
......@@ -42,6 +42,15 @@ local ScrappingMachineUI =
{ Name = "spellID", Type = "number", Nilable = false },
},
},
{
Name = "GetScrappingMachineName",
Type = "Function",
Returns =
{
{ Name = "name", Type = "string", Nilable = false },
},
},
{
Name = "HasScrappableItems",
Type = "Function",
......
......@@ -59,11 +59,7 @@ local UIModelInfo =
Returns =
{
{ Name = "animation", Type = "number", Nilable = false },
{ Name = "animationVariation", Type = "number", Nilable = false },
{ Name = "animSpeed", Type = "number", Nilable = false },
{ Name = "alpha", Type = "number", Nilable = false },
{ Name = "scale", Type = "number", Nilable = false },
{ Name = "actorDisplayInfo", Type = "UIModelSceneActorDisplayInfo", Nilable = false },
},
},
{
......@@ -160,6 +156,20 @@ local UIModelInfo =
{ Name = "AzeriteRewardGlow", Type = "ModelSceneType", EnumValue = 15 },
},
},
{
Name = "UIModelSceneActorDisplayInfo",
Type = "Structure",
Fields =
{
{ Name = "animation", Type = "number", Nilable = false },
{ Name = "animationVariation", Type = "number", Nilable = false },
{ Name = "animSpeed", Type = "number", Nilable = false },
{ Name = "animationKitID", Type = "number", Nilable = true },
{ Name = "spellVisualKitID", Type = "number", Nilable = true },
{ Name = "alpha", Type = "number", Nilable = false },
{ Name = "scale", Type = "number", Nilable = false },
},
},
{
Name = "UIModelSceneActorInfo",
Type = "Structure",
......
......@@ -31,7 +31,7 @@ local ACHIEVEMENTUI_FONTHEIGHT; -- set in AchievementButton_OnLoad
local ACHIEVEMENTUI_MAX_LINES_COLLAPSED = 3; -- can show 3 lines of text when achievement is collapsed
ACHIEVEMENTUI_DEFAULTSUMMARYACHIEVEMENTS = {6, 503, 116, 545, 1017};
ACHIEVEMENTUI_SUMMARYCATEGORIES = {92, 96, 97, 95, 168, 169, 201, 155, 15117, 15165, 15246, 15237};
ACHIEVEMENTUI_SUMMARYCATEGORIES = {92, 96, 97, 95, 168, 169, 201, 155, 15117, 15246};
ACHIEVEMENTUI_DEFAULTGUILDSUMMARYACHIEVEMENTS = {5362, 4860, 4989, 4947};
ACHIEVEMENTUI_GUILDSUMMARYCATEGORIES = {15088, 15077, 15078, 15079, 15080, 15089};
......@@ -2229,6 +2229,10 @@ function AchievementFrameSummary_OnShow()
if ( achievementFunctions ~= COMPARISON_ACHIEVEMENT_FUNCTIONS and achievementFunctions ~= COMPARISON_STAT_FUNCTIONS ) then
if ( AchievementFrameSummary.guildView ~= IN_GUILD_VIEW ) then
AchievementFrameSummary_ToggleView();
elseif ( AchievementFrameSummary.guildView ) then
AchievementFrameSummary_UpdateSummaryCategories(ACHIEVEMENTUI_GUILDSUMMARYCATEGORIES);
else
AchievementFrameSummary_UpdateSummaryCategories(ACHIEVEMENTUI_SUMMARYCATEGORIES);
end
AchievementFrameSummary:SetWidth(530);
AchievementFrameSummary_Update();
......@@ -2246,6 +2250,21 @@ function AchievementFrameSummary_Update(isCompare)
AchievementFrameSummary_UpdateAchievements(GetLatestCompletedAchievements(IN_GUILD_VIEW));
end
function AchievementFrameSummary_UpdateSummaryCategories(categories)
for i = 1, 12 do
local statusBar = _G["AchievementFrameSummaryCategoriesCategory"..i];
if ( i <= #categories ) then
local categoryName = GetCategoryInfo(categories[i]);
statusBar.label:SetText(categoryName);
statusBar:Show();
statusBar:SetID(categories[i]);
AchievementFrameSummaryCategory_OnShow(statusBar); -- to calculate progress
else
statusBar:Hide();
end
end
end
function AchievementFrameSummary_ToggleView()
local tCategories;
if ( AchievementFrameSummary.guildView ) then
......@@ -2271,19 +2290,7 @@ function AchievementFrameSummary_ToggleView()
end
end
end
-- categories
for i = 1, 12 do
local statusBar = _G["AchievementFrameSummaryCategoriesCategory"..i];
if ( tCategories[i] ) then
local categoryName = GetCategoryInfo(tCategories[i]);
statusBar.label:SetText(categoryName);
statusBar:Show();
statusBar:SetID(tCategories[i]);
AchievementFrameSummaryCategory_OnShow(statusBar); -- to calculate progress
else
statusBar:Hide();
end
end
AchievementFrameSummary_UpdateSummaryCategories(tCategories);
end
function AchievementFrameSummary_UpdateAchievements(...)
......@@ -2491,8 +2498,6 @@ end
function AchievementFrameSummaryCategory_OnLoad (self)
self:SetMinMaxValues(0, 100);
self:SetValue(0);
local categoryName = GetCategoryInfo(self:GetID());
self.label:SetText(categoryName);
end
function AchievementFrame_GetCategoryTotalNumAchievements (id, showAll)
......
......@@ -2133,62 +2133,62 @@
<BarTexture name="$parentBar" file="Interface\PaperDollInfoFrame\UI-Character-Skills-Bar"/>
<BarColor r="0" g="1" b="0"/>
</StatusBar>
<StatusBar name="$parentCategory1" inherits="AchievementFrameSummaryCategoryTemplate" id="92">
<StatusBar name="$parentCategory1" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentStatusBar" relativePoint="BOTTOMLEFT" x="0" y="-13"/>
</Anchors>
</StatusBar>
<StatusBar name="$parentCategory2" inherits="AchievementFrameSummaryCategoryTemplate" id="96">
<StatusBar name="$parentCategory2" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentCategory1" relativePoint="TOPRIGHT" x="20" y="0"/>
</Anchors>
</StatusBar>
<StatusBar name="$parentCategory3" inherits="AchievementFrameSummaryCategoryTemplate" id="97">
<StatusBar name="$parentCategory3" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentCategory1" relativePoint="BOTTOMLEFT" x="0" y="-10"/>
</Anchors>
</StatusBar>
<StatusBar name="$parentCategory4" inherits="AchievementFrameSummaryCategoryTemplate" id="95">
<StatusBar name="$parentCategory4" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentCategory3" relativePoint="TOPRIGHT" x="20" y="0"/>
</Anchors>
</StatusBar>
<StatusBar name="$parentCategory5" inherits="AchievementFrameSummaryCategoryTemplate" id="168">
<StatusBar name="$parentCategory5" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentCategory3" relativePoint="BOTTOMLEFT" x="0" y="-10"/>
</Anchors>
</StatusBar>
<StatusBar name="$parentCategory6" inherits="AchievementFrameSummaryCategoryTemplate" id="169">
<StatusBar name="$parentCategory6" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentCategory5" relativePoint="TOPRIGHT" x="20" y="0"/>
</Anchors>
</StatusBar>
<StatusBar name="$parentCategory7" inherits="AchievementFrameSummaryCategoryTemplate" id="201">
<StatusBar name="$parentCategory7" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentCategory5" relativePoint="BOTTOMLEFT" x="0" y="-10"/>
</Anchors>
</StatusBar>
<StatusBar name="$parentCategory8" inherits="AchievementFrameSummaryCategoryTemplate" id="15165">
<StatusBar name="$parentCategory8" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentCategory7" relativePoint="TOPRIGHT" x="20" y="0"/>
</Anchors>
</StatusBar>
<StatusBar name="$parentCategory9" inherits="AchievementFrameSummaryCategoryTemplate" id="155">
<StatusBar name="$parentCategory9" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentCategory7" relativePoint="BOTTOMLEFT" x="0" y="-10"/>
</Anchors>
</StatusBar>
<StatusBar name="$parentCategory10" inherits="AchievementFrameSummaryCategoryTemplate" id="15117">
<StatusBar name="$parentCategory10" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentCategory9" relativePoint="TOPRIGHT" x="20" y="0"/>
</Anchors>
</StatusBar>
<StatusBar name="$parentCategory11" inherits="AchievementFrameSummaryCategoryTemplate" id="15246">
<StatusBar name="$parentCategory11" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentCategory9" relativePoint="BOTTOMLEFT" x="0" y="-10"/>
</Anchors>
</StatusBar>
<StatusBar name="$parentCategory12" inherits="AchievementFrameSummaryCategoryTemplate" id="15237">
<StatusBar name="$parentCategory12" inherits="AchievementFrameSummaryCategoryTemplate">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentCategory11" relativePoint="TOPRIGHT" x="20" y="0"/>
</Anchors>
......
......@@ -243,10 +243,10 @@ function BattlefieldMapMixin:AddStandardDataProviders()
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_FLIGHT_POINT");
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_PET_TAMER");
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_GOSSIP");
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_VIGNETTE", 100);
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_AREA_POI");
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_DEBUG");
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_MAP_LINK");
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_AREA_POI");
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_VIGNETTE", 200);
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_ENCOUNTER");
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_SCENARIO");
pinFrameLevelsManager:AddFrameLevel("PIN_FRAME_LEVEL_VEHICLE_BELOW_GROUP_MEMBER");
......
......@@ -227,6 +227,7 @@ do
-- If the user clicks this before seeing the tutorial, assume they know how to activate voice channels.
-- This only applies to headset buttons in the channels frame.
SetCVarBitfield("closedInfoFrames", LE_FRAME_TUTORIAL_CHAT_CHANNELS, true);
ChannelFrame:HideTutorial();
end
function ChannelButtonMixin:Update()
......
......@@ -65,6 +65,8 @@ function ChannelFrameMixin:OnShow()
HideUIPanel(CommunitiesFrame);
end
ChatFrameChannelButton:HideTutorial();
local channel = self:GetList():GetSelectedChannelButton();
if channel and channel:ChannelIsCommunity() then
C_Club.SetClubPresenceSubscription(channel.clubId);
......@@ -215,6 +217,10 @@ function ChannelFrameMixin:CheckShowTutorial()
end
end
function ChannelFrameMixin:HideTutorial()
self.Tutorial:Hide();
end
function ChannelFrameMixin:ShouldShowTutorial()
return UnitLevel("player") >= 10 and not GetCVarBitfield("closedInfoFrames", LE_FRAME_TUTORIAL_CHAT_CHANNELS);
end
......@@ -438,7 +444,9 @@ function ChannelFrameMixin:CheckChannelAnnounceState(channelID, state)
end
local previousState = self.channelStates[channelID];
if (previousState and previousState == "joined") and state == "active" then
if state == "joined" then
self:ShowChannelManagementTip(channelID);
elseif state == "active" then
self:ShowChannelAnnounce(channelID);
end
......@@ -476,6 +484,17 @@ function ChannelFrameMixin:ShowChannelAnnounce(channelID)
end
end
function ChannelFrameMixin:ShowChannelManagementTip(channelID)
local channel = C_VoiceChat.GetChannel(channelID);
if channel and GetPartyCategoryFromChannelType(channel.channelType) ~= nil then
local atlas = CreateAtlasMarkup("voicechat-channellist-icon-headphone-off");
local useNotBound = true;
local useParentheses = true;
local announceText = VOICE_CHAT_CHANNEL_MANAGEMENT_TIP:format(atlas, GetBindingKeyForAction("TOGGLECHATTAB", useNotBound, useParentheses));
ChatFrame_DisplaySystemMessageInPrimary(announceText);
end
end
function ChannelFrameMixin:OnVoiceChannelActivated(voiceChannelID)
self:SetVoiceChannelActiveState(voiceChannelID, true);
self:CheckChannelAnnounceState(voiceChannelID, "active");
......@@ -551,10 +570,17 @@ function ChannelFrameMixin:OnCommunityFavoriteChanged(clubId)
end
function ChannelFrameMixin:OnMemberActiveStateChanged(memberID, channelID, isActive)
if not C_VoiceChat.IsMemberLocalPlayer(memberID, channelID) then
if C_VoiceChat.IsMemberLocalPlayer(memberID, channelID) then
if not isActive then
ChatFrame_DisplaySystemMessageInPrimary(VOICE_CHAT_CHANNEL_ANNOUNCE_PLAYER_LEFT);
end
else
local memberName = C_VoiceChat.GetMemberName(memberID, channelID);
if isActive then
ChatFrame_DisplaySystemMessageInPrimary(VOICE_CHAT_CHANNEL_ANNOUNCE_MEMBER_ACTIVE:format(memberName));
PlaySound(SOUNDKIT.UI_VOICECHAT_MEMBERJOINCHANNEL);
else
ChatFrame_DisplaySystemMessageInPrimary(VOICE_CHAT_CHANNEL_ANNOUNCE_MEMBER_LEFT:format(memberName));
PlaySound(SOUNDKIT.UI_VOICECHAT_MEMBERLEAVECHANNEL);
end
end
......
......@@ -93,6 +93,11 @@
<Anchors>
<Anchor point="TOPRIGHT" x="6" y="6"/>
</Anchors>
<Scripts>
<OnClick inherit="append">
SetCVarBitfield("closedInfoFrames", LE_FRAME_TUTORIAL_CHAT_CHANNELS, true);
</OnClick>
</Scripts>
</Button>
<Frame parentKey="Arrow" inherits="GlowBoxArrowTemplate">
<Anchors>
......@@ -110,7 +115,6 @@
</OnLoad>
<OnShow>
self:SetHeight(self.Text:GetHeight() + 32);
SetCVarBitfield("closedInfoFrames", LE_FRAME_TUTORIAL_CHAT_CHANNELS, true);
</OnShow>
</Scripts>
</Frame>
......
......@@ -223,31 +223,34 @@ end
function ExpansionTrialDialogMixin:OnEvent(event, ...)
if event == "CLASS_TRIAL_TIMER_START" then
if CanUpgradeExpansion() then
self.expansionTrialUpgrade = false;
self:SetupDialogType(false);
self:Show();
end
elseif event == "UPDATE_EXPANSION_LEVEL" then
local upgradingFromExpansionTrial = select(5, ...);
if upgradingFromExpansionTrial then
self.expansionTrialUpgrade = true;
self:SetupDialogType(true);
self:Show();
end
end
end
function ExpansionTrialDialogMixin:OnShow()
SetStoreUIShown(false);