Merge remote-branch 'remote/main'

noridev · Sep 3, 2024 · c068519 · c068519
2 parents 2d472c1 + 92621c7
commit c068519
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/Editor/NDMF/Passes.GenerateAnimationsPass.cs b/Editor/NDMF/Passes.GenerateAnimationsPass.cs
@@ -50,12 +50,21 @@ renderer.sharedMaterial is Material mat &&
                         }
                         else
                         {
-                            // Fix for defaultMinLight and defaultMaxLight.
-                            defaultMinLight = parameters.MinLightValue * parameters.DefaultMinLightValue;
-                            defaultMaxLight = parameters.MaxLightValue * parameters.DefaultMaxLightValue;
-
                             defaultMonochromeLighting = parameters.InitialMonochromeControlValue;
                             defaultMonochromeAdditiveLighting = parameters.MonochromeAdditiveLightingValue;
+
+                            if (parameters.IsSeparateLightControl)
+                            {
+                                defaultMinLight = (parameters.MaxLightValue - parameters.MinLightValue) *
+                                    parameters.DefaultMinLightValue + parameters.MinLightValue;
+                                defaultMaxLight = (parameters.MaxLightValue - parameters.MinLightValue) *
+                                    parameters.DefaultMaxLightValue + parameters.MinLightValue;
+                            }
+                            else
+                            {
+                                defaultMinLight = parameters.MinLightValue;
+                                defaultMaxLight = parameters.MaxLightValue;
+                            }
                         }
 
                         var param = new ControlAnimationParameters(relativePath, type, min, max, defaultMinLight, defaultMaxLight, defaultMonochromeLighting, defaultMonochromeAdditiveLighting);

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "moe.noridev.light-limit-changer",
   "version": "1.0.3",
-  "baseVersion": "1.13.2",
+  "baseVersion": "1.14.0",
   "unity": "2019.4",
   "displayName": "NoriDev - LightLimitChanger",
   "description": "Light Limit ChangerはModular-Avatar前提のVRChatアバター向けの明るさ変更ジェネレーターです。―――――――――――――――――― Light Limit Changer is a brightness change generator for VRChat avatars based on Modular-Avatar. ―――――――――――――――――― by Azukimochi25. Edit by NoriDev.",