diff --git a/Assets/lilToon/Editor/lilDirectoryManager.cs b/Assets/lilToon/Editor/lilDirectoryManager.cs index f370ca8c..89d8e811 100644 --- a/Assets/lilToon/Editor/lilDirectoryManager.cs +++ b/Assets/lilToon/Editor/lilDirectoryManager.cs @@ -29,7 +29,7 @@ internal class lilDirectoryManager public static string GetShaderFolderPath() { return GUIDToPath("ac0a8f602b5e72f458f4914bf08f0269"); } // "Assets/lilToon/Shader" public static string GetShaderPipelinePath() { return GUIDToPath("32299664512e2e042bbc351c1d46d383"); } // "Assets/lilToon/Shader/Includes/lil_pipeline.hlsl"; public static string GetShaderCommonPath() { return GUIDToPath("5520e766422958546bbe885a95d5a67e"); } // "Assets/lilToon/Shader/Includes/lil_common.hlsl"; - public static string GetEditorLanguageFileGUID() { return GUIDToPath("a63ad2f5296744a4bad011de744ba8ba"); } // "Assets/lilToon/Editor/Resources/lang.txt" + [System.Obsolete] public static string GetEditorLanguageFileGUID() { return GUIDToPath("a63ad2f5296744a4bad011de744ba8ba"); } // "Assets/lilToon/Editor/Resources/lang.txt" public static string GetGUIBoxInDarkPath() { return GUIDToPath("bb1313c9ea1425b41b74e98fd04bcbc8"); } // "Assets/lilToon/Editor/Resources/gui_box_inner_dark.guiskin" public static string GetGUIBoxInLightPath() { return GUIDToPath("f18d71f528511e748887f5e246abcc16"); } // "Assets/lilToon/Editor/Resources/gui_box_inner_light.guiskin" public static string GetGUIBoxInHalfDarkPath() { return GUIDToPath("a72199a4c9cc3714d8edfbc5d3b13823"); } // "Assets/lilToon/Editor/Resources/gui_box_inner_half_dark.guiskin" diff --git a/Assets/lilToon/Editor/lilLanguageManager.cs b/Assets/lilToon/Editor/lilLanguageManager.cs index 80e9eece..040b4a44 100644 --- a/Assets/lilToon/Editor/lilLanguageManager.cs +++ b/Assets/lilToon/Editor/lilLanguageManager.cs @@ -88,6 +88,7 @@ public static void LoadCustomLanguage(string langFileGUID) LoadLanguage(lilDirectoryManager.GUIDToPath(langFileGUID)); } + [Obsolete] public static void InitializeLanguage() { if(langSet.languageNum == -1) @@ -107,14 +108,18 @@ public static void InitializeLanguage() public static void UpdateLanguage() { + #pragma warning disable CS0612 string langPath = lilDirectoryManager.GetEditorLanguageFileGUID(); + #pragma warning restore CS0612 LoadLanguage(langPath); InitializeLabels(); } public static void SelectLang() { + #pragma warning disable CS0612 InitializeLanguage(); + #pragma warning restore CS0612 int numbuf = langSet.languageNum; langSet.languageNum = EditorGUILayout.Popup("Language", langSet.languageNum, langSet.languageNames.Split('\t')); if(numbuf != langSet.languageNum) UpdateLanguage(); diff --git a/Assets/lilToon/Editor/lilStartup.cs b/Assets/lilToon/Editor/lilStartup.cs index 4be571b3..45d72471 100644 --- a/Assets/lilToon/Editor/lilStartup.cs +++ b/Assets/lilToon/Editor/lilStartup.cs @@ -18,7 +18,9 @@ public static void lilStartupMethod() { //------------------------------------------------------------------------------------------------------------------------------ // Variables + #pragma warning disable CS0612 lilLanguageManager.InitializeLanguage(); + #pragma warning restore CS0612 AssetDatabase.importPackageStarted -= PackageVersionChecker; AssetDatabase.importPackageStarted += PackageVersionChecker; diff --git a/Assets/lilToon/Editor/lilToonEditorUtils.cs b/Assets/lilToon/Editor/lilToonEditorUtils.cs index 035b27da..5ecd2bbd 100644 --- a/Assets/lilToon/Editor/lilToonEditorUtils.cs +++ b/Assets/lilToon/Editor/lilToonEditorUtils.cs @@ -17,6 +17,7 @@ namespace lilToon { public static class lilToonEditorUtils { + #pragma warning disable CS0612 //------------------------------------------------------------------------------------------------------------------------------ // Constant private const string menuPathAssets = "Assets/lilToon/"; @@ -734,7 +735,8 @@ private static bool CheckImageExtension() assetPath.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase); } - public static string GetLoc(string value) { return lilLanguageManager.GetLoc(value); } + #pragma warning restore CS0612 + [Obsolete] public static string GetLoc(string value) { return lilLanguageManager.GetLoc(value); } } #if LILTOON_DISABLE_ASSET_MODIFICATION == false diff --git a/Assets/lilToon/Editor/lilToonPreset.cs b/Assets/lilToon/Editor/lilToonPreset.cs index eb00b425..7c056699 100644 --- a/Assets/lilToon/Editor/lilToonPreset.cs +++ b/Assets/lilToon/Editor/lilToonPreset.cs @@ -180,6 +180,7 @@ public class lilPresetWindow : EditorWindow private bool isShowFeatures = false; private bool isShowTextures = false; + #pragma warning disable CS0612 private void OnGUI() { if(!(Selection.activeObject is Material)){ @@ -390,6 +391,7 @@ private void OnGUI() EditorGUILayout.EndScrollView(); } + #pragma warning restore CS0612 private void CopyPropertiesToPreset(Material material) { @@ -528,7 +530,7 @@ private void ToggleAllTextures(Material material, bool val) } } - public static string GetLoc(string value) { return lilLanguageManager.GetLoc(value); } + [Obsolete] public static string GetLoc(string value) { return lilLanguageManager.GetLoc(value); } } #endregion }