From ae6a81da053e8cd001f089fd02cc6402afab5701 Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Fri, 20 Dec 2024 16:55:00 +0900 Subject: [PATCH] chore: Reverted the unaffected parts of the 1.8.4 changes to verify bugs --- Assets/lilToon/CHANGELOG.md | 4 ++++ Assets/lilToon/CHANGELOG_JP.md | 4 ++++ Assets/lilToon/Editor/lilConstants.cs | 2 +- Assets/lilToon/Editor/lilOptimizer.cs | 8 -------- Assets/lilToon/Editor/lilToonSetting.cs | 6 ------ Assets/lilToon/package.json | 4 ++-- version.json | 2 +- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/Assets/lilToon/CHANGELOG.md b/Assets/lilToon/CHANGELOG.md index 38b656e7..ab083e71 100644 --- a/Assets/lilToon/CHANGELOG.md +++ b/Assets/lilToon/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.8.5] - 2024-12-20 +### Changed +- Reverted the unaffected parts of the 1.8.4 changes to verify bugs + ## [1.8.4] - 2024-12-12 ### Added - Shader optimization can now be skipped in NDMF's `Apply on Play` diff --git a/Assets/lilToon/CHANGELOG_JP.md b/Assets/lilToon/CHANGELOG_JP.md index 0dfa8c77..523f0450 100644 --- a/Assets/lilToon/CHANGELOG_JP.md +++ b/Assets/lilToon/CHANGELOG_JP.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.8.5] - 2024-12-20 +### 変更 +- 不具合検証のため1.8.4の変更箇所のうち影響のない部分を差し戻し + ## [1.8.4] - 2024-12-12 ### 追加 - NDMFの`Apply on Play`でシェーダー最適化をスキップできるように diff --git a/Assets/lilToon/Editor/lilConstants.cs b/Assets/lilToon/Editor/lilConstants.cs index c5ad07ee..d59f8db1 100644 --- a/Assets/lilToon/Editor/lilConstants.cs +++ b/Assets/lilToon/Editor/lilConstants.cs @@ -6,7 +6,7 @@ namespace lilToon { public class lilConstants { - public const string currentVersionName = "1.8.4"; + public const string currentVersionName = "1.8.5"; public const int currentVersionValue = 44; internal const string boothURL = "https://lilxyzw.booth.pm/"; diff --git a/Assets/lilToon/Editor/lilOptimizer.cs b/Assets/lilToon/Editor/lilOptimizer.cs index 554a8083..f2efe116 100644 --- a/Assets/lilToon/Editor/lilOptimizer.cs +++ b/Assets/lilToon/Editor/lilOptimizer.cs @@ -192,13 +192,9 @@ private static void RewriteInputHLSL(Dictionary dicT, Dictionar { string optHLSL = RewriteInputHLSLText(dicT, dicD, dicF, dicC); string pathOpt = AssetDatabase.GUIDToAssetPath("571051a232e4af44a98389bda858df27"); - var fi = new FileInfo(pathOpt); - var timeC = fi.CreationTime; - var timeW = fi.LastWriteTime; var sw = new StreamWriter(pathOpt, false); sw.Write(optHLSL); sw.Close(); - new FileInfo(pathOpt){CreationTime = timeC, LastWriteTime = timeW}; } private static string RewriteInputHLSLText(Dictionary dicT, Dictionary dicD, Dictionary dicF, Dictionary dicC) @@ -319,15 +315,11 @@ internal static void ResetInputHLSL() string pathBase = AssetDatabase.GUIDToAssetPath("8ff7f7d9c86e1154fb3aac5a8a8681bb"); string pathOpt = AssetDatabase.GUIDToAssetPath("571051a232e4af44a98389bda858df27"); if(string.IsNullOrEmpty(pathBase) || string.IsNullOrEmpty(pathOpt) || !File.Exists(pathBase) || !File.Exists(pathOpt)) return; - var fi = new FileInfo(pathOpt); - var timeC = fi.CreationTime; - var timeW = fi.LastWriteTime; var sw = new StreamWriter(pathOpt, false); var sr = new StreamReader(pathBase); sw.Write(sr.ReadToEnd()); sw.Close(); sr.Close(); - new FileInfo(pathOpt){CreationTime = timeC, LastWriteTime = timeW}; } private static string GetIndent(int indent) diff --git a/Assets/lilToon/Editor/lilToonSetting.cs b/Assets/lilToon/Editor/lilToonSetting.cs index 56b6428f..daf8496c 100644 --- a/Assets/lilToon/Editor/lilToonSetting.cs +++ b/Assets/lilToon/Editor/lilToonSetting.cs @@ -512,13 +512,7 @@ internal static void ApplyShaderSetting(lilToonSetting shaderSetting, string rep string baseShaderPath = baseShaderFolderPath + Path.AltDirectorySeparatorChar + Path.GetFileNameWithoutExtension(shaderPath) + ".lilinternal"; if(!File.Exists(baseShaderPath)) continue; - - // Change without updating FileInfo - var fi = new FileInfo(shaderPath); - var timeC = fi.CreationTime; - var timeW = fi.LastWriteTime; File.WriteAllText(shaderPath, lilShaderContainer.UnpackContainer(baseShaderPath, null, doOptimize)); - new FileInfo(shaderPath){CreationTime = timeC, LastWriteTime = timeW}; } foreach(var shaderPath in shaderPathes) { diff --git a/Assets/lilToon/package.json b/Assets/lilToon/package.json index ba45afeb..7a94b666 100644 --- a/Assets/lilToon/package.json +++ b/Assets/lilToon/package.json @@ -1,6 +1,6 @@ { "name": "jp.lilxyzw.liltoon", - "version": "1.8.4", + "version": "1.8.5", "displayName": "lilToon", "description": "Feature-rich toon shader.", "unity": "2018.3", @@ -9,7 +9,7 @@ "licensesUrl": "https://github.com/lilxyzw/lilToon/blob/master/Assets/lilToon/LICENSE", "license": "MIT", "keywords": ["Toon", "Shader", "Material"], - "url" : "https://github.com/lilxyzw/lilToon/releases/download/1.8.4/jp.lilxyzw.liltoon-1.8.4.zip?", + "url" : "https://github.com/lilxyzw/lilToon/releases/download/1.8.5/jp.lilxyzw.liltoon-1.8.5.zip?", "repo" : "https://lilxyzw.github.io/vpm-repos/vpm.json", "legacyFolders" : { "Assets\\lilToon" : "05d1d116436047941ad97d1b9064ee05" diff --git a/version.json b/version.json index 1f2a5f34..c9aec4b8 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"latest_vertion_name": "1.8.4", "latest_vertion_value": 44} \ No newline at end of file +{"latest_vertion_name": "1.8.5", "latest_vertion_value": 44} \ No newline at end of file