diff --git a/Assets/uDesktopMascot/Scripts/Common/ApplicationSettingData.cs b/Assets/uDesktopMascot/Scripts/Common/ApplicationSettingData.cs index dd961f97..42553358 100644 --- a/Assets/uDesktopMascot/Scripts/Common/ApplicationSettingData.cs +++ b/Assets/uDesktopMascot/Scripts/Common/ApplicationSettingData.cs @@ -112,6 +112,11 @@ public float RotationZ if (_rotationZ < 0) _rotationZ += 360.0f; } } + + /// + /// キャラクターのShaderにLilToonを使用するかどうか + /// + public bool UseLilToon { get; set; } = false; } /// diff --git a/Assets/uDesktopMascot/Scripts/Manager/SystemManager.cs b/Assets/uDesktopMascot/Scripts/Manager/SystemManager.cs index ab026a5b..d2e95d5e 100644 --- a/Assets/uDesktopMascot/Scripts/Manager/SystemManager.cs +++ b/Assets/uDesktopMascot/Scripts/Manager/SystemManager.cs @@ -240,6 +240,7 @@ public void DisposeWebServer() /// private void OnDestroy() { + ApplicationSettings.Instance.SaveSettings(); _cancellationTokenSource?.Cancel(); _cancellationTokenSource?.Dispose(); _webServiceHost?.Dispose(); diff --git a/Assets/uDesktopMascot/Scripts/Utility/LoadCharacterModel.cs b/Assets/uDesktopMascot/Scripts/Utility/LoadCharacterModel.cs index 69413825..2bdec5cb 100644 --- a/Assets/uDesktopMascot/Scripts/Utility/LoadCharacterModel.cs +++ b/Assets/uDesktopMascot/Scripts/Utility/LoadCharacterModel.cs @@ -76,14 +76,17 @@ public static async UniTask LoadModel(CancellationToken cancellation } } - // シェーダーをlilToonに置き換える - bool shaderReplaceSuccess = ReplaceShadersWithLilToon(model); - - if (!shaderReplaceSuccess) + if (characterSettings.UseLilToon) { - Log.Warning("シェーダーの置き換えに失敗したため、デフォルトのシェーダーを使用します。"); - } + // シェーダーをlilToonに置き換える + bool shaderReplaceSuccess = ReplaceShadersWithLilToon(model); + if (!shaderReplaceSuccess) + { + Log.Warning("シェーダーの置き換えに失敗したため、デフォルトのシェーダーを使用します。"); + } + } + return model; }