diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index de9852ec..cbef4406 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -56,7 +56,7 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "2.0.2", + "version": "3.0.2", "depth": 1, "source": "registry", "dependencies": {}, @@ -163,7 +163,7 @@ "dependencies": { "com.unity.burst": "1.4.11", "com.unity.mathematics": "1.2.5", - "com.unity.nuget.newtonsoft-json": "2.0.2" + "com.unity.nuget.newtonsoft-json": "3.0.2" } }, "de.thryrallo.vrc.avatar-performance-tools": { @@ -181,6 +181,18 @@ "com.unity.postprocessing": "3.1.1" } }, + "jp.lilxyzw.liltoon": { + "version": "file:jp.lilxyzw.liltoon", + "depth": 0, + "source": "embedded", + "dependencies": {} + }, + "jp.suzuryg.face-emo": { + "version": "file:jp.suzuryg.face-emo", + "depth": 0, + "source": "embedded", + "dependencies": {} + }, "lyuma.av3emulator": { "version": "file:lyuma.av3emulator", "depth": 0, diff --git a/Packages/vpm-manifest.json b/Packages/vpm-manifest.json index 71bee4a6..f4e4b229 100644 --- a/Packages/vpm-manifest.json +++ b/Packages/vpm-manifest.json @@ -8,6 +8,15 @@ }, "nadena.dev.ndmf": { "version": "0.3.0" + }, + "lyuma.av3emulator": { + "version": "3.2.2" + }, + "jp.lilxyzw.liltoon": { + "version": "1.4.1" + }, + "jp.suzuryg.face-emo": { + "version": "1.2.1" } }, "locked": { @@ -26,6 +35,22 @@ "dependencies": { "com.vrchat.avatars": "3.1.x" } + }, + "lyuma.av3emulator": { + "version": "3.2.2", + "dependencies": { + "com.vrchat.avatars": ">=3.1.0 <3.4.0" + } + }, + "jp.lilxyzw.liltoon": { + "version": "1.4.1", + "dependencies": {} + }, + "jp.suzuryg.face-emo": { + "version": "1.2.1", + "dependencies": { + "com.vrchat.avatars": ">=3.1.9" + } } } } \ No newline at end of file diff --git a/ProjectSettings/BurstAotSettings_Android.json b/ProjectSettings/BurstAotSettings_Android.json new file mode 100644 index 00000000..751473f1 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_Android.json @@ -0,0 +1,13 @@ +{ + "MonoBehaviour": { + "Version": 3, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0 + } +} diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json new file mode 100644 index 00000000..2144f6dc --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -0,0 +1,16 @@ +{ + "MonoBehaviour": { + "Version": 3, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "UsePlatformSDKLinker": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72 + } +} diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index fc66ff8d..b6bb0ac5 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -28,10 +28,7 @@ GraphicsSettings: m_LensFlare: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} - m_AlwaysIncludedShaders: - - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + m_AlwaysIncludedShaders: [] m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index cfde1109..72a22bf9 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -650,7 +650,7 @@ PlayerSettings: incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 - additionalIl2CppArgs: + additionalIl2CppArgs: --compiler-flags="" --linker-flags="" scriptingRuntimeVersion: 1 gcIncremental: 1 assemblyVersionValidation: 1 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 42131f31..0c8e050c 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,13 +4,13 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 3 + m_CurrentQuality: 2 m_QualitySettings: - serializedVersion: 2 name: VRC Low pixelLightCount: 4 shadows: 2 - shadowResolution: 2 + shadowResolution: 1 shadowProjection: 1 shadowCascades: 2 shadowDistance: 75 @@ -58,7 +58,7 @@ QualitySettings: skinWeights: 4 textureQuality: 0 anisotropicTextures: 2 - antiAliasing: 4 + antiAliasing: 2 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 @@ -86,43 +86,6 @@ QualitySettings: shadows: 2 shadowResolution: 3 shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 75 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 4 - textureQuality: 0 - anisotropicTextures: 2 - antiAliasing: 4 - softParticles: 1 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 0 - lodBias: 2 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 4096 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 128 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} - excludedTargetPlatforms: - - Android - - serializedVersion: 2 - name: VRC Ultra - pixelLightCount: 8 - shadows: 2 - shadowResolution: 3 - shadowProjection: 1 shadowCascades: 4 shadowDistance: 150 shadowNearPlaneOffset: 2 diff --git a/ProjectSettings/lilToonSetting.json b/ProjectSettings/lilToonSetting.json index 9db1ea51..ddc41af5 100644 --- a/ProjectSettings/lilToonSetting.json +++ b/ProjectSettings/lilToonSetting.json @@ -11,7 +11,6 @@ "LIL_FEATURE_SHADOW": true, "LIL_FEATURE_RECEIVE_SHADOW": true, "LIL_FEATURE_SHADOW_3RD": true, - "LIL_FEATURE_SHADOW_LUT": true, "LIL_FEATURE_EMISSION_1ST": true, "LIL_FEATURE_EMISSION_2ND": true, "LIL_FEATURE_ANIMATE_EMISSION_UV": true, @@ -35,8 +34,6 @@ "LIL_FEATURE_AUDIOLINK_VERTEX": true, "LIL_FEATURE_AUDIOLINK_LOCAL": true, "LIL_FEATURE_DISSOLVE": true, - "LIL_FEATURE_IDMASK": true, - "LIL_FEATURE_DITHER": true, "LIL_FEATURE_ENCRYPTION": false, "LIL_FEATURE_ANIMATE_OUTLINE_UV": true, "LIL_FEATURE_OUTLINE_TONE_CORRECTION": true, @@ -102,7 +99,6 @@ "LIL_OPTIMIZE_USE_FORWARDADD_SHADOW": false, "LIL_OPTIMIZE_USE_VERTEXLIGHT": true, "LIL_OPTIMIZE_USE_LIGHTMAP": false, - "LIL_OPTIMIZE_DEFFERED": false, "isLocked": false, "isDebugOptimize": false, "isOptimizeInTestBuild": false, @@ -113,12 +109,6 @@ "defaultBeforeExposureLimit": 10000.0, "defaultMonochromeLighting": 0.0, "defaultlilDirectionalLightStrength": 1.0, - "mainLightModeName": "", - "outlineLightModeName": "", - "preLightModeName": "", - "furLightModeName": "", - "furPreLightModeName": "", - "gemPreLightModeName": "", "presetSkin": { "instanceID": 0 },