Skip to content

Commit 4956ff1

Browse files
hardcpphardcpp
committed
5.0.3 source code
1 parent e93cd73 commit 4956ff1

File tree

63 files changed

+899
-349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+899
-349
lines changed

‎BeatSaberPlus.sln‎

Lines changed: 73 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio Version 17
43
VisualStudioVersion = 17.1.32407.343
5-
MinimumVisualStudioVersion = 10.0.40219.1
64
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlus", "BeatSaberPlus\BeatSaberPlus.csproj", "{84972BAC-4FAF-4DA8-92ED-E3A735AF0E92}"
75
EndProject
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PrivateModules", "PrivateModules", "{5BE117BB-81EE-4B1E-B3B7-888F97368CF3}"
7+
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlus_ChatIntegrations", "Modules\BeatSaberPlus_ChatIntegrations\BeatSaberPlus_ChatIntegrations.csproj", "{90ACB2CE-005E-4FB1-9E4C-AF227E165440}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlus_SongChartVisualizer", "Modules\BeatSaberPlus_SongChartVisualizer\BeatSaberPlus_SongChartVisualizer.csproj", "{07E42F20-AE5B-4BDA-8260-970191C61EB3}"
@@ -31,6 +31,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlus_MenuMusic", "
3131
{84972BAC-4FAF-4DA8-92ED-E3A735AF0E92} = {84972BAC-4FAF-4DA8-92ED-E3A735AF0E92}
3232
EndProjectSection
3333
EndProject
34+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlus_CustomEdition", "PrivateModules\BeatSaberPlus_CustomEdition\BeatSaberPlus_CustomEdition.csproj", "{93F246B8-DA82-4581-B485-9AF2AC2DBF7B}"
35+
ProjectSection(ProjectDependencies) = postProject
36+
{84972BAC-4FAF-4DA8-92ED-E3A735AF0E92} = {84972BAC-4FAF-4DA8-92ED-E3A735AF0E92}
37+
EndProjectSection
38+
EndProject
39+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{4A92F157-D042-40C5-8B33-387CFD9BB809}"
40+
EndProject
41+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlus_VoiceAttack", "Plugins\BeatSaberPlus_VoiceAttack\BeatSaberPlus_VoiceAttack.csproj", "{C661FC90-C439-46CB-8876-3FFB0B1D0E3A}"
42+
EndProject
3443
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{438B64F8-5A95-46D9-BEA7-A5D8E939A6B6}"
3544
EndProject
3645
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlus_ModuleTemplate", "Samples\BeatSaberPlus_ModuleTemplate\BeatSaberPlus_ModuleTemplate.csproj", "{9F8AE720-7BB7-4AE2-8737-78618F85FB8C}"
@@ -50,6 +59,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlus_SongOverlay",
5059
{84972BAC-4FAF-4DA8-92ED-E3A735AF0E92} = {84972BAC-4FAF-4DA8-92ED-E3A735AF0E92}
5160
EndProjectSection
5261
EndProject
62+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlus_ChatIntegrationsActions", "PrivateModules\BeatSaberPlus_ChatIntegrationsActions\BeatSaberPlus_ChatIntegrationsActions.csproj", "{5C0D6BAA-0876-40B4-9333-3A4645CCD193}"
63+
EndProject
64+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{1C4EE81D-CE76-4A55-BD2A-2CABF42B28B9}"
65+
EndProject
66+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlusYoutube", "PrivateModules\BeatSaberPlusYoutube\BeatSaberPlusYoutube.csproj", "{15BAB2B0-1CED-4F42-A96E-7E94686082F1}"
67+
EndProject
68+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatSaberPlus_Multiplayer", "PrivateModules\BeatSaberPlus_Multiplayer\BeatSaberPlus_Multiplayer.csproj", "{F8B48A78-FB30-4CB2-8507-ED88878F5D3D}"
69+
EndProject
5370
Global
5471
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5572
Debug|Any CPU = Debug|Any CPU
@@ -114,6 +131,22 @@ Global
114131
{BFE64437-FBB4-4002-863B-42DAFB451F86}.Release|Any CPU.Build.0 = Release|Any CPU
115132
{BFE64437-FBB4-4002-863B-42DAFB451F86}.Release|x64.ActiveCfg = Release|Any CPU
116133
{BFE64437-FBB4-4002-863B-42DAFB451F86}.Release|x64.Build.0 = Release|Any CPU
134+
{93F246B8-DA82-4581-B485-9AF2AC2DBF7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
135+
{93F246B8-DA82-4581-B485-9AF2AC2DBF7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
136+
{93F246B8-DA82-4581-B485-9AF2AC2DBF7B}.Debug|x64.ActiveCfg = Debug|Any CPU
137+
{93F246B8-DA82-4581-B485-9AF2AC2DBF7B}.Debug|x64.Build.0 = Debug|Any CPU
138+
{93F246B8-DA82-4581-B485-9AF2AC2DBF7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
139+
{93F246B8-DA82-4581-B485-9AF2AC2DBF7B}.Release|Any CPU.Build.0 = Release|Any CPU
140+
{93F246B8-DA82-4581-B485-9AF2AC2DBF7B}.Release|x64.ActiveCfg = Release|Any CPU
141+
{93F246B8-DA82-4581-B485-9AF2AC2DBF7B}.Release|x64.Build.0 = Release|Any CPU
142+
{C661FC90-C439-46CB-8876-3FFB0B1D0E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143+
{C661FC90-C439-46CB-8876-3FFB0B1D0E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
144+
{C661FC90-C439-46CB-8876-3FFB0B1D0E3A}.Debug|x64.ActiveCfg = Debug|Any CPU
145+
{C661FC90-C439-46CB-8876-3FFB0B1D0E3A}.Debug|x64.Build.0 = Debug|Any CPU
146+
{C661FC90-C439-46CB-8876-3FFB0B1D0E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
147+
{C661FC90-C439-46CB-8876-3FFB0B1D0E3A}.Release|Any CPU.Build.0 = Release|Any CPU
148+
{C661FC90-C439-46CB-8876-3FFB0B1D0E3A}.Release|x64.ActiveCfg = Release|Any CPU
149+
{C661FC90-C439-46CB-8876-3FFB0B1D0E3A}.Release|x64.Build.0 = Release|Any CPU
117150
{9F8AE720-7BB7-4AE2-8737-78618F85FB8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118151
{9F8AE720-7BB7-4AE2-8737-78618F85FB8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
119152
{9F8AE720-7BB7-4AE2-8737-78618F85FB8C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -146,6 +179,38 @@ Global
146179
{193F6510-339A-472A-B5E2-9739A3567384}.Release|Any CPU.Build.0 = Release|Any CPU
147180
{193F6510-339A-472A-B5E2-9739A3567384}.Release|x64.ActiveCfg = Release|Any CPU
148181
{193F6510-339A-472A-B5E2-9739A3567384}.Release|x64.Build.0 = Release|Any CPU
182+
{5C0D6BAA-0876-40B4-9333-3A4645CCD193}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
183+
{5C0D6BAA-0876-40B4-9333-3A4645CCD193}.Debug|Any CPU.Build.0 = Debug|Any CPU
184+
{5C0D6BAA-0876-40B4-9333-3A4645CCD193}.Debug|x64.ActiveCfg = Debug|Any CPU
185+
{5C0D6BAA-0876-40B4-9333-3A4645CCD193}.Debug|x64.Build.0 = Debug|Any CPU
186+
{5C0D6BAA-0876-40B4-9333-3A4645CCD193}.Release|Any CPU.ActiveCfg = Release|Any CPU
187+
{5C0D6BAA-0876-40B4-9333-3A4645CCD193}.Release|Any CPU.Build.0 = Release|Any CPU
188+
{5C0D6BAA-0876-40B4-9333-3A4645CCD193}.Release|x64.ActiveCfg = Release|Any CPU
189+
{5C0D6BAA-0876-40B4-9333-3A4645CCD193}.Release|x64.Build.0 = Release|Any CPU
190+
{1C4EE81D-CE76-4A55-BD2A-2CABF42B28B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
191+
{1C4EE81D-CE76-4A55-BD2A-2CABF42B28B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
192+
{1C4EE81D-CE76-4A55-BD2A-2CABF42B28B9}.Debug|x64.ActiveCfg = Debug|Any CPU
193+
{1C4EE81D-CE76-4A55-BD2A-2CABF42B28B9}.Debug|x64.Build.0 = Debug|Any CPU
194+
{1C4EE81D-CE76-4A55-BD2A-2CABF42B28B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
195+
{1C4EE81D-CE76-4A55-BD2A-2CABF42B28B9}.Release|Any CPU.Build.0 = Release|Any CPU
196+
{1C4EE81D-CE76-4A55-BD2A-2CABF42B28B9}.Release|x64.ActiveCfg = Release|Any CPU
197+
{1C4EE81D-CE76-4A55-BD2A-2CABF42B28B9}.Release|x64.Build.0 = Release|Any CPU
198+
{15BAB2B0-1CED-4F42-A96E-7E94686082F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
199+
{15BAB2B0-1CED-4F42-A96E-7E94686082F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
200+
{15BAB2B0-1CED-4F42-A96E-7E94686082F1}.Debug|x64.ActiveCfg = Debug|Any CPU
201+
{15BAB2B0-1CED-4F42-A96E-7E94686082F1}.Debug|x64.Build.0 = Debug|Any CPU
202+
{15BAB2B0-1CED-4F42-A96E-7E94686082F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
203+
{15BAB2B0-1CED-4F42-A96E-7E94686082F1}.Release|Any CPU.Build.0 = Release|Any CPU
204+
{15BAB2B0-1CED-4F42-A96E-7E94686082F1}.Release|x64.ActiveCfg = Release|Any CPU
205+
{15BAB2B0-1CED-4F42-A96E-7E94686082F1}.Release|x64.Build.0 = Release|Any CPU
206+
{F8B48A78-FB30-4CB2-8507-ED88878F5D3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
207+
{F8B48A78-FB30-4CB2-8507-ED88878F5D3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
208+
{F8B48A78-FB30-4CB2-8507-ED88878F5D3D}.Debug|x64.ActiveCfg = Debug|Any CPU
209+
{F8B48A78-FB30-4CB2-8507-ED88878F5D3D}.Debug|x64.Build.0 = Debug|Any CPU
210+
{F8B48A78-FB30-4CB2-8507-ED88878F5D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
211+
{F8B48A78-FB30-4CB2-8507-ED88878F5D3D}.Release|Any CPU.Build.0 = Release|Any CPU
212+
{F8B48A78-FB30-4CB2-8507-ED88878F5D3D}.Release|x64.ActiveCfg = Release|Any CPU
213+
{F8B48A78-FB30-4CB2-8507-ED88878F5D3D}.Release|x64.Build.0 = Release|Any CPU
149214
EndGlobalSection
150215
GlobalSection(SolutionProperties) = preSolution
151216
HideSolutionNode = FALSE
@@ -157,10 +222,15 @@ Global
157222
{DDBC9483-C077-4485-A720-D7DA3A76CA34} = {B5DB9381-A080-4EE6-B5D4-01C4E0251F49}
158223
{D529EDCC-39F3-47B7-8CD9-B740F8BC6495} = {B5DB9381-A080-4EE6-B5D4-01C4E0251F49}
159224
{BFE64437-FBB4-4002-863B-42DAFB451F86} = {B5DB9381-A080-4EE6-B5D4-01C4E0251F49}
225+
{93F246B8-DA82-4581-B485-9AF2AC2DBF7B} = {5BE117BB-81EE-4B1E-B3B7-888F97368CF3}
226+
{C661FC90-C439-46CB-8876-3FFB0B1D0E3A} = {4A92F157-D042-40C5-8B33-387CFD9BB809}
160227
{9F8AE720-7BB7-4AE2-8737-78618F85FB8C} = {438B64F8-5A95-46D9-BEA7-A5D8E939A6B6}
161228
{2DE1608F-407F-4B11-BE8A-D4CCDCD910A1} = {B5DB9381-A080-4EE6-B5D4-01C4E0251F49}
162229
{C1F6F190-4A2D-4C28-917B-9D2704E098F9} = {B5DB9381-A080-4EE6-B5D4-01C4E0251F49}
163230
{193F6510-339A-472A-B5E2-9739A3567384} = {B5DB9381-A080-4EE6-B5D4-01C4E0251F49}
231+
{5C0D6BAA-0876-40B4-9333-3A4645CCD193} = {5BE117BB-81EE-4B1E-B3B7-888F97368CF3}
232+
{15BAB2B0-1CED-4F42-A96E-7E94686082F1} = {5BE117BB-81EE-4B1E-B3B7-888F97368CF3}
233+
{F8B48A78-FB30-4CB2-8507-ED88878F5D3D} = {5BE117BB-81EE-4B1E-B3B7-888F97368CF3}
164234
EndGlobalSection
165235
GlobalSection(ExtensibilityGlobals) = postSolution
166236
SolutionGuid = {E7AEA519-703A-47D9-8C34-ADA6DEAF8953}

‎BeatSaberPlus/BeatSaberPlus.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@
325325
<Compile Include="CP_SDK\Unity\EnhancedImageParticleMaterialProvider.cs" />
326326
<Compile Include="CP_SDK\Unity\EnhancedImageParticleSystemProvider.cs" />
327327
<Compile Include="CP_SDK\Unity\Extensions\ColorU.cs" />
328+
<Compile Include="CP_SDK\Unity\Extensions\StringU.cs" />
328329
<Compile Include="CP_SDK\Unity\FontManager.cs" />
329330
<Compile Include="CP_SDK\Unity\MTThreadInvoker.cs" />
330331
<Compile Include="CP_SDK\Unity\OpenType\CollectionHeader.cs" />
@@ -338,6 +339,7 @@
338339
<Compile Include="CP_SDK\Unity\OpenType\OpenTypeTable.cs" />
339340
<Compile Include="CP_SDK\Unity\OpenType\OpenTypeTag.cs" />
340341
<Compile Include="CP_SDK\Unity\OpenType\TableRecord.cs" />
342+
<Compile Include="CP_SDK\Unity\PersistentSingleton.cs" />
341343
<Compile Include="Plugin.cs" />
342344
<Compile Include="CP_SDK\Animation\AnimationControllerManager.cs" />
343345
<Compile Include="CP_SDK\Animation\AnimationControllerInstance.cs" />
@@ -466,6 +468,7 @@
466468
<Compile Include="SDK\UI\Button.cs" />
467469
<Compile Include="SDK\UI\ColorSetting.cs" />
468470
<Compile Include="SDK\UI\DataSource\SimpleTextList.cs" />
471+
<Compile Include="SDK\UI\DataSource\SongListCustom.cs" />
469472
<Compile Include="SDK\UI\DataSource\SongList.cs" />
470473
<Compile Include="SDK\UI\DropDownListSetting.cs" />
471474
<Compile Include="SDK\UI\IncrementSetting.cs" />

‎BeatSaberPlus/CP_SDK/Animation/AnimationControllerManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace CP_SDK.Animation
66
/// <summary>
77
/// Animation controller manager
88
/// </summary>
9-
public class AnimationControllerManager : PersistentSingleton<AnimationControllerManager>
9+
public class AnimationControllerManager : Unity.PersistentSingleton<AnimationControllerManager>
1010
{
1111
/// <summary>
1212
/// Registered dictionary

‎BeatSaberPlus/CP_SDK/Chat/ChatImageProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public class ChatImageProvider
8282
/// </summary>
8383
internal static void Init()
8484
{
85-
m_CacheFolder = $"UserData/{ChatPlexSDK.ProductName}/Cache/Chat/";
85+
m_CacheFolder = Path.Combine(ChatPlexSDK.BasePath, $"UserData/{ChatPlexSDK.ProductName}/Cache/Chat/");
8686
m_WebClient = new Network.WebClient();
8787
m_WebClient.Timeout = 10;
8888

‎BeatSaberPlus/CP_SDK/Chat/Interfaces/IChatChannel.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,10 @@ public interface IChatChannel
44
{
55
string Name { get; }
66
string Id { get; }
7+
bool IsTemp { get; }
8+
string Prefix { get; }
9+
bool CanSendMessages { get; }
10+
bool Live { get; }
11+
int ViewerCount { get; }
712
}
813
}

‎BeatSaberPlus/CP_SDK/Chat/Interfaces/IChatService.cs‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public interface IChatService
4343
/// <summary>
4444
/// Callback that occurs when a chat channel receives VideoPlayback info
4545
/// </summary>
46-
event Action<IChatService, IChatChannel, bool, int> OnRoomVideoPlaybackUpdated;
46+
event Action<IChatService, IChatChannel, bool, int> OnLiveStatusUpdated;
4747
/// <summary>
4848
/// Fired once all known resources have been cached for this channel
4949
/// </summary>
@@ -140,5 +140,47 @@ public interface IChatService
140140
/// <param name="p_Channel">The chat channel to send the message to</param>
141141
/// <param name="p_Message">The text message to be sent</param>
142142
void SendTextMessage(IChatChannel p_Channel, string p_Message);
143+
144+
////////////////////////////////////////////////////////////////////////////
145+
////////////////////////////////////////////////////////////////////////////
146+
147+
/// <summary>
148+
/// Is connected
149+
/// </summary>
150+
/// <returns></returns>
151+
bool IsConnectedAndLive();
152+
/// <summary>
153+
/// Get primary channel name
154+
/// </summary>
155+
/// <returns></returns>
156+
string PrimaryChannelName();
157+
158+
////////////////////////////////////////////////////////////////////////////
159+
////////////////////////////////////////////////////////////////////////////
160+
161+
/// <summary>
162+
/// Join temp channel with group identifier
163+
/// </summary>
164+
/// <param name="p_GroupIdentifier">Group identifier</param>
165+
/// <param name="p_ChannelName">Name of the channel</param>
166+
/// <param name="p_Prefix">Messages prefix</param>
167+
/// <param name="p_CanSendMessage">Can send message</param>
168+
void JoinTempChannel(string p_GroupIdentifier, string p_ChannelName, string p_Prefix, bool p_CanSendMessage);
169+
/// <summary>
170+
/// Leave temp channel
171+
/// </summary>
172+
/// <param name="p_ChannelName">Name of the channel</param>
173+
void LeaveTempChannel(string p_ChannelName);
174+
/// <summary>
175+
/// Is in temp channel
176+
/// </summary>
177+
/// <param name="p_ChannelName">Channel name</param>
178+
/// <returns></returns>
179+
bool IsInTempChannel(string p_ChannelName);
180+
/// <summary>
181+
/// Leave all temp channel by group identifier
182+
/// </summary>
183+
/// <param name="p_GroupIdentifier"></param>
184+
void LeaveAllTempChannel(string p_GroupIdentifier);
143185
}
144186
}

‎BeatSaberPlus/CP_SDK/Chat/Models/Twitch/TwitchChannel.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ public class TwitchChannel : IChatChannel
66
{
77
public string Id { get; internal set; }
88
public string Name { get; internal set; }
9-
public TwitchRoomstate Roomstate { get; internal set; }
9+
public bool IsTemp { get; internal set; } = false;
10+
public string Prefix { get; internal set; }
1011
public bool CanSendMessages { get; internal set; } = true;
12+
public bool Live { get; internal set; } = false;
13+
public int ViewerCount { get; internal set; } = 0;
14+
public TwitchRoomstate Roomstate { get; internal set; }
1115
}
1216
}

‎BeatSaberPlus/CP_SDK/Chat/Service.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ private static void ChatCoreMutiplixer_OnChannelResourceDataCached(IChatService
265265
var l_ProgressA = m_LoadingEmotes > 0 ? (float)m_LoadedEmotes / (float)m_LoadingEmotes : 0f;
266266

267267
OnLoadingProgressChanged?.Invoke(l_ProgressA, m_LoadingEmotes);
268-
Unity.MTMainThreadInvoker.Enqueue(() => UI.LoadingProgressBar.instance.ShowLoadingProgressBar($"Loading {m_LoadingEmotes} emotes...", l_ProgressA));
268+
Unity.MTMainThreadInvoker.Enqueue(() => UI.LoadingProgressBar.Instance.ShowLoadingProgressBar($"Loading {m_LoadingEmotes} emotes...", l_ProgressA));
269269

270270
foreach (var l_Current in p_Resources)
271271
{
@@ -277,7 +277,7 @@ private static void ChatCoreMutiplixer_OnChannelResourceDataCached(IChatService
277277
var l_ProgressB = (float)l_CurrentLoaded / (float)m_LoadingEmotes;
278278

279279
OnLoadingProgressChanged?.Invoke(l_ProgressB, m_LoadingEmotes);
280-
Unity.MTMainThreadInvoker.Enqueue(() => UI.LoadingProgressBar.instance.SetProgress($"Loading {m_LoadingEmotes} emotes...", l_ProgressB));
280+
Unity.MTMainThreadInvoker.Enqueue(() => UI.LoadingProgressBar.Instance.SetProgress($"Loading {m_LoadingEmotes} emotes...", l_ProgressB));
281281

282282
if (l_CurrentLoaded == m_LoadingEmotes)
283283
{
@@ -286,8 +286,8 @@ private static void ChatCoreMutiplixer_OnChannelResourceDataCached(IChatService
286286

287287
Unity.MTMainThreadInvoker.Enqueue(() =>
288288
{
289-
UI.LoadingProgressBar.instance.SetProgress($"Loading {m_LoadingEmotes} emotes...", 1f);
290-
UI.LoadingProgressBar.instance.HideTimed(3f);
289+
UI.LoadingProgressBar.Instance.SetProgress($"Loading {m_LoadingEmotes} emotes...", 1f);
290+
UI.LoadingProgressBar.Instance.HideTimed(3f);
291291
});
292292

293293
Multiplexer.InternalBroadcastSystemMessage($"Loaded {m_LoadingEmotes} animated emotes.");
@@ -304,8 +304,8 @@ private static void ChatCoreMutiplixer_OnChannelResourceDataCached(IChatService
304304

305305
Unity.MTMainThreadInvoker.Enqueue(() =>
306306
{
307-
UI.LoadingProgressBar.instance.SetProgress($"Loading {m_LoadingEmotes} emotes...", 1f);
308-
UI.LoadingProgressBar.instance.HideTimed(3f);
307+
UI.LoadingProgressBar.Instance.SetProgress($"Loading {m_LoadingEmotes} emotes...", 1f);
308+
UI.LoadingProgressBar.Instance.HideTimed(3f);
309309
});
310310

311311
Multiplexer.InternalBroadcastSystemMessage($"Loaded {m_LoadingEmotes} animated emotes.");

0 commit comments

Comments
 (0)