大修

2026-03-14 02:30:26 -04:00
parent cf86f0ee51
commit aee62cd637
2041 changed files with 246771 additions and 129128 deletions
--- a/Packages/XuanXuanRenderUtility/Editor/ShaderGUIHelper.cs
+++ b/Packages/XuanXuanRenderUtility/Editor/ShaderGUIHelper.cs
@@ -191,7 +191,7 @@ namespace NBShaderEditor
            // MaterialEditor.BeginProperty(position, prop);
           
            EditorGUI.BeginChangeCheck();
-            bool hdr = (prop.flags & MaterialProperty.PropFlags.HDR) != 0;
+            bool hdr = (prop.propertyFlags & UnityEngine.Rendering.ShaderPropertyFlags.HDR) != 0;
            if (IsPropertyAnimated(propertyName,"r","g","b","a"))
            {
                GUI.backgroundColor = animatedBackgroundColor;
--- a/Packages/XuanXuanRenderUtility/Editor/ShaderGUIResetTool.cs
+++ b/Packages/XuanXuanRenderUtility/Editor/ShaderGUIResetTool.cs
@@ -245,19 +245,19 @@ namespace NBShaderEditor
        public void SetPropertyToDefaultValue(ShaderPropertyPack pack,VectorValeType vectorValeType = VectorValeType.Undefine)
        {
            MaterialProperty property = pack.property;
-            MaterialProperty.PropType propertyType = property.type;
-            if (pack.property.type == MaterialProperty.PropType.Texture && vectorValeType != VectorValeType.Undefine)
+            UnityEngine.Rendering.ShaderPropertyType propertyType = property.propertyType;
+            if (pack.property.propertyType == UnityEngine.Rendering.ShaderPropertyType.Texture && vectorValeType != VectorValeType.Undefine)
            {
-                propertyType = MaterialProperty.PropType.Vector;//Tilling or Offset
+                propertyType = UnityEngine.Rendering.ShaderPropertyType.Vector;//Tilling or Offset
            }
            switch (propertyType)
            {
-                case MaterialProperty.PropType.Color:
+                case UnityEngine.Rendering.ShaderPropertyType.Color:
                    Vector4 colorValue = _shader.GetPropertyDefaultVectorValue(pack.index);
                    property.colorValue = new Color(colorValue.x, colorValue.y, colorValue.z, colorValue.x);
                    break;

-                case MaterialProperty.PropType.Vector:
+                case UnityEngine.Rendering.ShaderPropertyType.Vector:
                    Vector4 defaultVecValue;
                    Vector4 vecValue;
                    if (vectorValeType == VectorValeType.Tilling || vectorValeType == VectorValeType.Offset)
@@ -292,12 +292,12 @@ namespace NBShaderEditor
                    }
                    break;

-                case MaterialProperty.PropType.Float or MaterialProperty.PropType.Range:
+                case UnityEngine.Rendering.ShaderPropertyType.Float or UnityEngine.Rendering.ShaderPropertyType.Range:
                    float value = _shader.GetPropertyDefaultFloatValue(pack.index);
                    property.floatValue = value;
                    break;

-                case MaterialProperty.PropType.Texture:
+                case UnityEngine.Rendering.ShaderPropertyType.Texture:
                    if (property.textureValue == null)
                    {
                        break;
@@ -319,19 +319,19 @@ namespace NBShaderEditor
        public bool IsPropertyModified(ShaderPropertyPack pack,VectorValeType vectorValeType = VectorValeType.Undefine)
        {
            MaterialProperty property = pack.property;
-            MaterialProperty.PropType propertyType = property.type;
-            if (pack.property.type == MaterialProperty.PropType.Texture && vectorValeType != VectorValeType.Undefine)
+            UnityEngine.Rendering.ShaderPropertyType propertyType = property.propertyType;
+            if (pack.property.propertyType == UnityEngine.Rendering.ShaderPropertyType.Texture && vectorValeType != VectorValeType.Undefine)
            {
-                propertyType = MaterialProperty.PropType.Vector;//Tilling or Offset
+                propertyType = UnityEngine.Rendering.ShaderPropertyType.Vector;//Tilling or Offset
            }
            switch (propertyType)
            {
-                case MaterialProperty.PropType.Color:
+                case UnityEngine.Rendering.ShaderPropertyType.Color:
                    Vector4 colorValue = _shader.GetPropertyDefaultVectorValue(pack.index);
                    Color color = new Color(colorValue.x, colorValue.y, colorValue.z, colorValue.w);
                    return property.colorValue == color ? false : true;

-                case MaterialProperty.PropType.Vector:
+                case UnityEngine.Rendering.ShaderPropertyType.Vector:

                    Vector4 defaultVecValue;
                    Vector4 vecValue;
@@ -373,10 +373,10 @@ namespace NBShaderEditor
                    }
                    return isVecModified;

-                case MaterialProperty.PropType.Float or MaterialProperty.PropType.Range:
+                case UnityEngine.Rendering.ShaderPropertyType.Float or UnityEngine.Rendering.ShaderPropertyType.Range:
                    return Mathf.Approximately(property.floatValue, _shader.GetPropertyDefaultFloatValue(pack.index)) ? false : true;

-                case MaterialProperty.PropType.Texture:
+                case UnityEngine.Rendering.ShaderPropertyType.Texture:
                    if (property.textureValue == null)
                    {
                        return false;
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,21 +1,23 @@
 {
  "dependencies": {
-    "com.unity.burst": "1.8.21",
-    "com.unity.collab-proxy": "2.8.2",
-    "com.unity.collections": "1.5.1",
-    "com.unity.device-simulator.devices": "1.0.0",
-    "com.unity.feature.2d": "2.0.1",
-    "com.unity.ide.rider": "3.0.36",
-    "com.unity.ide.visualstudio": "2.0.22",
+    "com.unity.burst": "1.8.27",
+    "com.unity.collab-proxy": "2.11.3",
+    "com.unity.collections": "2.6.2",
+    "com.unity.device-simulator.devices": "1.0.1",
+    "com.unity.feature.2d": "2.0.2",
+    "com.unity.ide.rider": "3.0.39",
+    "com.unity.ide.visualstudio": "2.0.26",
    "com.unity.ide.vscode": "1.2.5",
-    "com.unity.inputsystem": "1.14.0",
+    "com.unity.inputsystem": "1.18.0",
    "com.unity.memoryprofiler": "1.1.9",
-    "com.unity.render-pipelines.universal": "14.0.12",
-    "com.unity.test-framework": "1.1.33",
-    "com.unity.textmeshpro": "3.0.7",
-    "com.unity.timeline": "1.7.7",
-    "com.unity.ugui": "1.0.0",
-    "com.unity.visualscripting": "1.9.4",
+    "com.unity.multiplayer.center": "1.0.1",
+    "com.unity.render-pipelines.universal": "17.3.0",
+    "com.unity.test-framework": "1.6.0",
+    "com.unity.timeline": "1.8.10",
+    "com.unity.ugui": "2.0.0",
+    "com.unity.visualscripting": "1.9.9",
+    "com.unity.modules.accessibility": "1.0.0",
+    "com.unity.modules.adaptiveperformance": "1.0.0",
    "com.unity.modules.ai": "1.0.0",
    "com.unity.modules.androidjni": "1.0.0",
    "com.unity.modules.animation": "1.0.0",
@@ -42,6 +44,7 @@
    "com.unity.modules.unitywebrequestaudio": "1.0.0",
    "com.unity.modules.unitywebrequesttexture": "1.0.0",
    "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "com.unity.modules.vectorgraphics": "1.0.0",
    "com.unity.modules.vehicles": "1.0.0",
    "com.unity.modules.video": "1.0.0",
    "com.unity.modules.vr": "1.0.0",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,45 +1,48 @@
 {
  "dependencies": {
    "com.unity.2d.animation": {
-      "version": "9.2.0",
+      "version": "13.0.4",
      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.2d.common": "8.1.0",
+        "com.unity.2d.common": "12.0.2",
        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.collections": "1.1.0",
+        "com.unity.collections": "2.4.3",
        "com.unity.modules.animation": "1.0.0",
        "com.unity.modules.uielements": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.2d.aseprite": {
-      "version": "1.1.9",
+      "version": "3.0.1",
      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.2d.common": "6.0.6",
+        "com.unity.2d.common": "12.0.1",
        "com.unity.2d.sprite": "1.0.0",
+        "com.unity.2d.tilemap": "1.0.0",
        "com.unity.mathematics": "1.2.6",
        "com.unity.modules.animation": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.2d.common": {
-      "version": "8.1.0",
+      "version": "12.0.2",
      "depth": 2,
      "source": "registry",
      "dependencies": {
-        "com.unity.burst": "1.7.3",
+        "com.unity.burst": "1.8.4",
        "com.unity.2d.sprite": "1.0.0",
+        "com.unity.collections": "2.4.3",
        "com.unity.mathematics": "1.1.0",
        "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.uielements": "1.0.0"
+        "com.unity.modules.uielements": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.2d.pixel-perfect": {
-      "version": "5.1.0",
+      "version": "5.1.1",
      "depth": 1,
      "source": "registry",
      "dependencies": {
@@ -48,13 +51,13 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.2d.psdimporter": {
-      "version": "8.1.0",
+      "version": "12.0.1",
      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.2d.common": "8.1.0",
+        "com.unity.2d.common": "12.0.1",
        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.2d.animation": "9.2.0"
+        "com.unity.2d.tilemap": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
@@ -65,11 +68,11 @@
      "dependencies": {}
    },
    "com.unity.2d.spriteshape": {
-      "version": "9.1.0",
+      "version": "13.0.0",
      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.2d.common": "8.1.0",
+        "com.unity.2d.common": "12.0.0",
        "com.unity.mathematics": "1.1.0",
        "com.unity.modules.physics2d": "1.0.0"
      },
@@ -85,19 +88,28 @@
      }
    },
    "com.unity.2d.tilemap.extras": {
-      "version": "3.1.3",
+      "version": "6.0.1",
      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.ugui": "1.0.0",
        "com.unity.2d.tilemap": "1.0.0",
        "com.unity.modules.tilemap": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
+    "com.unity.2d.tooling": {
+      "version": "1.0.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.2d.common": "12.0.2",
+        "com.unity.modules.uielements": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
    "com.unity.burst": {
-      "version": "1.8.21",
+      "version": "1.8.27",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -107,61 +119,63 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.collab-proxy": {
-      "version": "2.8.2",
+      "version": "2.11.3",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.collections": {
-      "version": "1.5.1",
+      "version": "2.6.2",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.burst": "1.6.6",
-        "com.unity.test-framework": "1.1.31",
-        "com.unity.nuget.mono-cecil": "1.11.4"
+        "com.unity.burst": "1.8.23",
+        "com.unity.mathematics": "1.3.2",
+        "com.unity.test-framework": "1.4.6",
+        "com.unity.nuget.mono-cecil": "1.11.5",
+        "com.unity.test-framework.performance": "3.0.3"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.device-simulator.devices": {
-      "version": "1.0.0",
+      "version": "1.0.1",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.editorcoroutines": {
-      "version": "1.0.0",
+      "version": "1.0.1",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.ext.nunit": {
-      "version": "1.0.6",
+      "version": "2.0.5",
      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "source": "builtin",
+      "dependencies": {}
    },
    "com.unity.feature.2d": {
-      "version": "2.0.1",
+      "version": "2.0.2",
      "depth": 0,
      "source": "builtin",
      "dependencies": {
-        "com.unity.2d.animation": "9.2.0",
-        "com.unity.2d.pixel-perfect": "5.1.0",
-        "com.unity.2d.psdimporter": "8.1.0",
+        "com.unity.2d.animation": "13.0.4",
+        "com.unity.2d.pixel-perfect": "5.1.1",
+        "com.unity.2d.psdimporter": "12.0.1",
        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.2d.spriteshape": "9.1.0",
+        "com.unity.2d.spriteshape": "13.0.0",
        "com.unity.2d.tilemap": "1.0.0",
-        "com.unity.2d.tilemap.extras": "3.1.3",
-        "com.unity.2d.aseprite": "1.1.9"
+        "com.unity.2d.tilemap.extras": "6.0.1",
+        "com.unity.2d.aseprite": "3.0.1",
+        "com.unity.2d.tooling": "1.0.2"
      }
    },
    "com.unity.ide.rider": {
-      "version": "3.0.36",
+      "version": "3.0.39",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -170,11 +184,11 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.ide.visualstudio": {
-      "version": "2.0.22",
+      "version": "2.0.26",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.test-framework": "1.1.9"
+        "com.unity.test-framework": "1.1.33"
      },
      "url": "https://packages.unity.com"
    },
@@ -186,7 +200,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.inputsystem": {
-      "version": "1.14.0",
+      "version": "1.18.0",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -195,7 +209,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.mathematics": {
-      "version": "1.2.6",
+      "version": "1.3.3",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
@@ -214,89 +228,98 @@
      },
      "url": "https://packages.unity.com"
    },
+    "com.unity.multiplayer.center": {
+      "version": "1.0.1",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.uielements": "1.0.0"
+      }
+    },
    "com.unity.nuget.mono-cecil": {
-      "version": "1.11.4",
+      "version": "1.11.6",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.profiling.core": {
-      "version": "1.0.2",
+      "version": "1.0.3",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.render-pipelines.core": {
-      "version": "14.0.12",
+      "version": "17.3.0",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.ugui": "1.0.0",
+        "com.unity.burst": "1.8.14",
+        "com.unity.mathematics": "1.3.2",
+        "com.unity.ugui": "2.0.0",
+        "com.unity.collections": "2.4.3",
        "com.unity.modules.physics": "1.0.0",
        "com.unity.modules.terrain": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0"
      }
    },
    "com.unity.render-pipelines.universal": {
-      "version": "14.0.12",
+      "version": "17.3.0",
      "depth": 0,
      "source": "builtin",
      "dependencies": {
-        "com.unity.mathematics": "1.2.1",
-        "com.unity.burst": "1.8.9",
-        "com.unity.render-pipelines.core": "14.0.12",
-        "com.unity.shadergraph": "14.0.12",
-        "com.unity.render-pipelines.universal-config": "14.0.9"
+        "com.unity.render-pipelines.core": "17.3.0",
+        "com.unity.shadergraph": "17.3.0",
+        "com.unity.render-pipelines.universal-config": "17.0.3"
      }
    },
    "com.unity.render-pipelines.universal-config": {
-      "version": "14.0.10",
+      "version": "17.0.3",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.10"
+        "com.unity.render-pipelines.core": "17.0.3"
      }
    },
    "com.unity.searcher": {
-      "version": "4.9.2",
+      "version": "4.9.4",
      "depth": 2,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.shadergraph": {
-      "version": "14.0.12",
+      "version": "17.3.0",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.12",
-        "com.unity.searcher": "4.9.2"
+        "com.unity.render-pipelines.core": "17.3.0",
+        "com.unity.searcher": "4.9.3"
      }
    },
    "com.unity.test-framework": {
-      "version": "1.1.33",
+      "version": "1.6.0",
      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.ext.nunit": "2.0.3",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
+    },
+    "com.unity.test-framework.performance": {
+      "version": "3.2.0",
+      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.ext.nunit": "1.0.6",
-        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.test-framework": "1.1.33",
        "com.unity.modules.jsonserialize": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
-    "com.unity.textmeshpro": {
-      "version": "3.0.7",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
    "com.unity.timeline": {
-      "version": "1.7.7",
+      "version": "1.8.10",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -308,7 +331,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.ugui": {
-      "version": "1.0.0",
+      "version": "2.0.0",
      "depth": 0,
      "source": "builtin",
      "dependencies": {
@@ -317,7 +340,7 @@
      }
    },
    "com.unity.visualscripting": {
-      "version": "1.9.4",
+      "version": "1.9.9",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -344,6 +367,20 @@
      "source": "embedded",
      "dependencies": {}
    },
+    "com.unity.modules.accessibility": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.adaptiveperformance": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.subsystems": "1.0.0"
+      }
+    },
    "com.unity.modules.ai": {
      "version": "1.0.0",
      "depth": 0,
@@ -391,6 +428,12 @@
        "com.unity.modules.animation": "1.0.0"
      }
    },
+    "com.unity.modules.hierarchycore": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {}
+    },
    "com.unity.modules.imageconversion": {
      "version": "1.0.0",
      "depth": 0,
@@ -479,7 +522,9 @@
      "dependencies": {
        "com.unity.modules.ui": "1.0.0",
        "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.hierarchycore": "1.0.0",
+        "com.unity.modules.physics": "1.0.0"
      }
    },
    "com.unity.modules.umbra": {
@@ -543,6 +588,16 @@
        "com.unity.modules.imageconversion": "1.0.0"
      }
    },
+    "com.unity.modules.vectorgraphics": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.uielements": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0"
+      }
+    },
    "com.unity.modules.vehicles": {
      "version": "1.0.0",
      "depth": 0,