diff --git a/Assets/Scenes/Oasis/OasisScene.scene b/Assets/Scenes/Oasis/OasisScene.scene index a9ea1c2..9d57fcc 100644 --- a/Assets/Scenes/Oasis/OasisScene.scene +++ b/Assets/Scenes/Oasis/OasisScene.scene @@ -14562,7 +14562,7 @@ MonoBehaviour: m_GameObject: {fileID: 981884107} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a62f35552be2a4a4e8e2683b7aea565b, type: 3} + m_Script: {fileID: 11500000, guid: a8f562490b8d41b47a6b21e2f514d782, type: 3} m_Name: m_EditorClassIdentifier: transform: {fileID: 597869063} diff --git a/Assets/Scenes/Test.cs b/Assets/Scenes/Test.cs index d30aef5..df7a5f1 100644 --- a/Assets/Scenes/Test.cs +++ b/Assets/Scenes/Test.cs @@ -47,4 +47,9 @@ public class Test : MonoBehaviour asset.UpdateSSSettings(); } } + + public static void TestBatchMode() + { + Debug.Log("TestBatchMode"); + } } diff --git a/Assets/Settings/Mobile/Mobile_High.asset b/Assets/Settings/Mobile/Mobile_High.asset index b11d182..569cca4 100644 --- a/Assets/Settings/Mobile/Mobile_High.asset +++ b/Assets/Settings/Mobile/Mobile_High.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -28,7 +28,7 @@ MonoBehaviour: m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 m_MSAA: 1 - m_RenderScale: 0.3335938 + m_RenderScale: 0.58823526 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 1 m_FsrSharpness: 1 @@ -114,5 +114,5 @@ MonoBehaviour: m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 - superResolution: 16 + superResolution: 0 vrsRate: 0 diff --git a/Assets/Settings/Mobile/Mobile_High_Renderer.asset b/Assets/Settings/Mobile/Mobile_High_Renderer.asset index 4e1dec9..69004fa 100644 --- a/Assets/Settings/Mobile/Mobile_High_Renderer.asset +++ b/Assets/Settings/Mobile/Mobile_High_Renderer.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!114 &-8576419846133267094 MonoBehaviour: m_ObjectHideFlags: 0 @@ -27,20 +27,20 @@ MonoBehaviour: m_Name: GSR m_EditorClassIdentifier: m_Active: 0 - quality: 0 + quality: 4 v1settings: EnableEdgeDirection: 1 Mode: 1 - Sharp: 2 - MipMapBias: 0 - GSRV1Material: {fileID: 0} + Sharp: 1.68 + MipMapBias: -0.35 + GSRV1Material: {fileID: 2100000, guid: d57e64d5723127243b429034bed82c7d, type: 2} v2settings: - UseCompute2Pass: 0 - GSRV2Material: {fileID: 0} - GSRV2ComputeShader: {fileID: 0} + UseCompute2Pass: 1 + GSRV2Material: {fileID: 2100000, guid: faa906817c0647f42a0cec70faeb91c1, type: 2} + GSRV2ComputeShader: {fileID: 7200000, guid: 9a4e6ff1f9a33fa4ea1e9744e313e2fd, type: 3} FiveSample: 0 Exposure_co_rcp: 1 - MipMapBias: 0 + MipMapBias: -1.26 --- !u!114 &-2390300670611609275 MonoBehaviour: m_ObjectHideFlags: 0 @@ -318,11 +318,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b1643a5e9ea49724e8a7bc2c6f3713e1, type: 3} m_Name: XESS m_EditorClassIdentifier: - m_Active: 1 + m_Active: 0 xess1ConfigParam: OutputWidth: 2560 OutputHeight: 1440 - Quality: 103 + Quality: 102 UseHiResMotionVectors: 0 UseJitteredMotionVectors: 0 UseMotionVectorsInNDC: 1 @@ -331,13 +331,13 @@ MonoBehaviour: UseAutoExposure: 0 EnableProfiling: 0 InvertedDepth: 1 - VelocityScaleX: 1 - VelocityScaleY: 1 - JitterScaleX: 1 - JitterScaleY: 1 + VelocityScaleX: -2 + VelocityScaleY: 2 + JitterScaleX: -1 + JitterScaleY: -1 ExposureScale: 1 - MipMapBias: -2.13 - antiGhosting: 0.385 + MipMapBias: 0 + antiGhosting: 0.1 --- !u!114 &6334271670068977784 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/com.nvidia.streamline.core-0.0.1-alpha1/package/Plugins/x86_64/sl.imgui.dll.meta b/Packages/com.nvidia.streamline.core-0.0.1-alpha1/package/Plugins/x86_64/sl.imgui.dll.meta deleted file mode 100644 index 59215a1..0000000 --- a/Packages/com.nvidia.streamline.core-0.0.1-alpha1/package/Plugins/x86_64/sl.imgui.dll.meta +++ /dev/null @@ -1,52 +0,0 @@ -fileFormatVersion: 2 -guid: 22ceb1f007652b742aa348858ed7603a -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 1 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: x86_64 - DefaultValueInitialized: true - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.nvidia.streamline.core-0.0.1-alpha1/package/Runtime/StreamlineDLSSCore.cs.meta b/Packages/com.nvidia.streamline.core-0.0.1-alpha1/package/Runtime/StreamlineDLSSCore.cs.meta new file mode 100644 index 0000000..2d47b9a --- /dev/null +++ b/Packages/com.nvidia.streamline.core-0.0.1-alpha1/package/Runtime/StreamlineDLSSCore.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9cdd6fe798a1c8c4a81fdcce6ea29bdf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs index 330ae20..525fd66 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs @@ -164,8 +164,8 @@ namespace X.Rendering.Feature dlssContext.executeData.subrectOffsetY = 0; dlssContext.executeData.subrectWidth = inputWidth; dlssContext.executeData.subrectHeight = inputHeight; - dlssContext.executeData.jitterOffsetX = jitter.x; - dlssContext.executeData.jitterOffsetY = jitter.y; + dlssContext.executeData.jitterOffsetX = -jitter.x; + dlssContext.executeData.jitterOffsetY = -jitter.y; dlssContext.executeData.preExposure = preExposure; dlssContext.executeData.invertYAxis = 1u; dlssContext.executeData.invertXAxis = 0u; diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs index 7732eda..b6552d1 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs @@ -179,7 +179,7 @@ namespace X.Rendering.Feature xessexecPtr->OutputTexture = destination.rt.GetNativeTexturePtr(); xessexecPtr->DepthTexture = renderingData.cameraData.renderer.cameraDepthTargetHandle.rt.GetNativeTexturePtr(); xessexecPtr->Jitterx = jitter.x; - xessexecPtr->Jittery = jitter.y; + xessexecPtr->Jittery = -jitter.y; cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.DoXESS1, xess1ExecParamPtr); diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b61e7ef..f9fe65b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,14 +1,14 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.17", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.cinemachine": { "version": "2.10.1", @@ -17,28 +17,28 @@ "dependencies": { "com.unity.test-framework": "1.1.31" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.collab-proxy": { "version": "2.5.2", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.ide.rider": { "version": "3.0.31", @@ -47,7 +47,7 @@ "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.ide.visualstudio": { "version": "2.0.22", @@ -56,14 +56,14 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.ide.vscode": { "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.inputsystem": { "version": "1.11.0", @@ -72,7 +72,7 @@ "dependencies": { "com.unity.modules.uielements": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.learn.iet-framework": { "version": "3.1.3", @@ -82,14 +82,14 @@ "com.unity.editorcoroutines": "1.0.0", "com.unity.settings-manager": "1.0.3" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.mathematics": { "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.memoryprofiler": { "version": "1.1.1", @@ -98,7 +98,7 @@ "dependencies": { "com.unity.editorcoroutines": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.recorder": { "version": "4.0.3", @@ -107,7 +107,7 @@ "dependencies": { "com.unity.timeline": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.render-pipelines.core": { "version": "14.0.11", @@ -145,14 +145,14 @@ "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.settings-manager": { "version": "2.0.1", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.shadergraph": { "version": "14.0.11", @@ -172,7 +172,7 @@ "com.unity.mathematics": "1.2.1", "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.test-framework": { "version": "1.1.33", @@ -183,7 +183,7 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.textmeshpro": { "version": "3.0.7", @@ -192,7 +192,7 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.timeline": { "version": "1.7.6", @@ -204,7 +204,7 @@ "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.ugui": { "version": "1.0.0", @@ -237,7 +237,10 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": {} + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } }, "com.unity.modules.audio": { "version": "1.0.0", diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 597cef8..bea66e2 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!114 &1 MonoBehaviour: m_ObjectHideFlags: 61 @@ -21,7 +21,7 @@ MonoBehaviour: m_Registries: - m_Id: main m_Name: - m_Url: https://packages.unity.cn + m_Url: https://packages.tuanjie.cn m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 @@ -31,6 +31,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -834 - m_OriginalInstanceId: -836 + m_UserModificationsInstanceId: -854 + m_OriginalInstanceId: -856 m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 71b159c..feff13a 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,3 @@ -m_EditorVersion: 2022.3.51f1c1 -m_EditorVersionWithRevision: 2022.3.51f1c1 (e9648b0586b8) +m_EditorVersion: 2022.3.48t2 +m_EditorVersionWithRevision: 2022.3.48t2 (635b9f68393f) +m_TuanjieEditorVersion: 1.3.5 diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 3250b06..8ad2e55 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!114 &1 MonoBehaviour: m_ObjectHideFlags: 61 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index cb6830c..8364223 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!114 &1 MonoBehaviour: m_ObjectHideFlags: 52 @@ -19,7 +19,7 @@ MonoBehaviour: width: 2560 height: 1349 m_ShowMode: 4 - m_Title: Game + m_Title: Inspector m_RootView: {fileID: 10} m_MinSize: {x: 875, y: 321} m_MaxSize: {x: 10000, y: 10000} @@ -43,8 +43,8 @@ MonoBehaviour: y: 0 width: 1472 height: 770 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 14} @@ -96,8 +96,8 @@ MonoBehaviour: y: 0 width: 784 height: 529 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -153,7 +153,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 165 + controlID: 162 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -328,7 +328,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 39 + controlID: 64 draggingID: 0 --- !u!114 &14 MonoBehaviour: @@ -758,6 +758,8 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 + m_EnableGDRP: 1 + m_BackfaceCulling: 0 m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} @@ -810,7 +812,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Packages/com.unity.render-pipelines.universal/Runtime + - Assets/Settings/Mobile m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -818,30 +820,30 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Packages/com.unity.render-pipelines.universal/Runtime + - Assets/Settings/Mobile m_LastFoldersGridSize: 16 m_LastProjectPath: E:\unity_native_render m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 40} - m_SelectedIDs: 62b80000 - m_LastClickedID: 47202 - m_ExpandedIDs: 00000000fab400001cb8000000ca9a3bffffff7f + scrollPos: {x: 0, y: 0} + m_SelectedIDs: c2ba0000 + m_LastClickedID: 47810 + m_ExpandedIDs: 00000000c0b70000c2b70000c4b70000f2ba0000e2bb0000f0bb000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Runtime + m_OriginalName: Runtime m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 47858 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 9} m_SearchString: @@ -855,7 +857,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000fab40000 + m_ExpandedIDs: 00000000c0b70000c2b70000c4b70000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -886,18 +888,18 @@ MonoBehaviour: m_ExpandedInstanceIDs: c6230000000000005aca0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Runtime - m_OriginalName: Runtime + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 47202 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 9} m_CreateAssetUtility: @@ -907,7 +909,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 451} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 @@ -952,7 +954,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 860 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: @@ -995,9 +997,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 88b80000 + m_SelectedIDs: 6a030000 m_LastClickedID: 0 - m_ExpandedIDs: 5efaffff + m_ExpandedIDs: 7498ffff46faffff9e6f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: