diff --git a/src/components/BootstrapBlazor.Live2DDisplay/BootstrapBlazor.Live2DDisplay.csproj b/src/components/BootstrapBlazor.Live2DDisplay/BootstrapBlazor.Live2DDisplay.csproj index eaa00905..5e05c3dd 100644 --- a/src/components/BootstrapBlazor.Live2DDisplay/BootstrapBlazor.Live2DDisplay.csproj +++ b/src/components/BootstrapBlazor.Live2DDisplay/BootstrapBlazor.Live2DDisplay.csproj @@ -1,5 +1,9 @@ + + 11.0.0-rc.2.1 + + Bootstrap Blazor WebAssembly wasm UI Components Icon Bootstrap UI components extensions of Live2DDisplay diff --git a/src/components/BootstrapBlazor.Live2DDisplay/Components/Live2DDisplay/Live2DDisplay.razor.cs b/src/components/BootstrapBlazor.Live2DDisplay/Components/Live2DDisplay/Live2DDisplay.razor.cs index ae3240e4..53a8de8b 100644 --- a/src/components/BootstrapBlazor.Live2DDisplay/Components/Live2DDisplay/Live2DDisplay.razor.cs +++ b/src/components/BootstrapBlazor.Live2DDisplay/Components/Live2DDisplay/Live2DDisplay.razor.cs @@ -7,6 +7,14 @@ namespace BootstrapBlazor.Components; /// public partial class Live2DDisplay { + private const string StylePath = "_content/BootstrapBlazor.Live2DDisplay/live2d.bundle.css"; + +#if NET9_0_OR_GREATER + private string StyleUrl => Assets[StylePath]; +#else + private static string StyleUrl => StylePath; +#endif + private bool _isInit; private string? _source; @@ -137,7 +145,7 @@ protected override async Task OnParametersSetAsync() /// protected override async Task InvokeInitAsync() { - await InvokeVoidAsync("init", new { Id, Source, Scale, X = XOffset, Y = YOffset, IsDraggable, AddHitAreaFrames, BackgroundAlpha, BackgroundColor }); + await InvokeVoidAsync("init", new { Id, Source, Scale, X = XOffset, Y = YOffset, IsDraggable, AddHitAreaFrames, BackgroundAlpha, BackgroundColor }, StyleUrl); _isInit = true; _source = Source; _scale = Scale; diff --git a/src/components/BootstrapBlazor.Live2DDisplay/Components/Live2DDisplay/Live2DDisplay.razor.js b/src/components/BootstrapBlazor.Live2DDisplay/Components/Live2DDisplay/Live2DDisplay.razor.js index e59ec8c7..82895ebc 100644 --- a/src/components/BootstrapBlazor.Live2DDisplay/Components/Live2DDisplay/Live2DDisplay.razor.js +++ b/src/components/BootstrapBlazor.Live2DDisplay/Components/Live2DDisplay/Live2DDisplay.razor.js @@ -2,8 +2,8 @@ import Data from '../../../BootstrapBlazor/modules/data.js' import EventHandler from '../../../BootstrapBlazor/modules/event-handler.js' -export async function init(op) { - await addLink("_content/BootstrapBlazor.Live2DDisplay/live2d.bundle.css") +export async function init(op, styleUrl) { + await addLink(styleUrl) await addScript("_content/BootstrapBlazor.Live2DDisplay/live2dcubismcore.min.js") await addScript("_content/BootstrapBlazor.Live2DDisplay/live2d.min.js") await addScript("_content/BootstrapBlazor.Live2DDisplay/pixi.min.js")