From 097afec788bd48d9d04c6a6ac4dd263ed96ef0fb Mon Sep 17 00:00:00 2001 From: raccoon Date: Fri, 16 Aug 2024 03:25:08 +0500 Subject: [PATCH] VRC SDK stuff --- .../scenes/measuregeneric-world.unity | 15 +++++++++------ ProjectSettings/DynamicsManager.asset | 9 ++++++--- ProjectSettings/TagManager.asset | 10 +++++----- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Assets/measuregeneric/scenes/measuregeneric-world.unity b/Assets/measuregeneric/scenes/measuregeneric-world.unity index 0388c91..8488662 100644 --- a/Assets/measuregeneric/scenes/measuregeneric-world.unity +++ b/Assets/measuregeneric/scenes/measuregeneric-world.unity @@ -864,7 +864,7 @@ MonoBehaviour: m_EditorClassIdentifier: launchedFromSDKPipeline: 0 completedSDKPipeline: 0 - blueprintId: + blueprintId: wrld_add5dd23-a676-4be8-90f0-07519ea2fd7a contentType: 1 assetBundleUnityVersion: fallbackStatus: 0 @@ -891,14 +891,14 @@ MonoBehaviour: interactThruLayers: 0 autoSpatializeAudioSources: 0 gravity: {x: 0, y: -9.81, z: 0} - layerCollisionArr: 01010101010001010101010100010001010101010101010101010101010101010101010101000101010101010001000101010101010101010101010101010101010101010100010101010101000100010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101000101010101010001000101010101010101010101010101010101000000010000010100000000000000000000000000000101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010100010101010101000100010101010101010101010101010101010101010101010001010100000100000000000001010101010101010101010101010101010101000101010000010000000000000101010101010101010101010101010101010100010101010101000100010101010101010101010101010101010100000001000001010000000000000000000000000000010101010101010101010101010101000101010000010001010101010000000001010101010101010101000000010000010100000000000100000000000000000101010101010101010101010101010001010100000100010001010101010101010101010101010101010101010101000101010000010001000101010101010101010101010101010101010101010100010101000001000100010101010101010101010101010101010101010101010001010101010100000001010101010101010101010101010101010101010101000101010101010000000101010101010101010101010101010101010101010100010101010101000000010101010101010101010101010101010101010101010001010101010100000001010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101 + layerCollisionArr: 01010101010001010101010100010001010101000101010101010101010101010101010101000101010101010001000101010100010101010101010101010101010101010100010101010101000100010101010001010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101000101010101010001000101010100010101010101010101010101000000010000010100000000000000000000000000000101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010100010101010101000100010101010001010101010101010101010101010101010001010100000100000000000001000101010101010101010101010101010101000101010000010000000000000100010101010101010101010101010101010100010101010101000100010101010001010101010101010101010100000001000001010000000000000000000000000000010101010101010101010101010101000101010000010001010101010000000001010101010101010101000000010000010100000000000100000000000000000101010101010101010101010101010001010100000100010001010101000101010101010101010101010101010101000101010000010001000101010100010101010101010101010101010101010100010101000001000100010101010001010101010101010101010101010101010001010101010100000001010101000101010101010101010101010000000100000101000000000000000000000000000001010101010101010101010101010100010101010101000000010101010001010101010101010101010101010101010001010101010100000001010101000101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101 capacity: 0 contentSex: 0 contentViolence: 0 contentGore: 0 contentOther: 0 releasePublic: 0 - unityVersion: 2019.4.31f1 + unityVersion: 2022.3.6f1 udonProducts: [] Name: NSFW: 0 @@ -908,9 +908,7 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: e69375109fdac6f488a091c5ffef2ada, type: 2} - {fileID: 2100000, guid: 8275de5e6f690e447b92a3c55e1ea9a6, type: 2} - - {fileID: 2100000, guid: f9f1b289cb5178642a347c0c6dfce511, type: 2} - {fileID: 2100000, guid: 82c71488a4e2c7045a809af43ba10b74, type: 2} LightMapsNear: [] LightMapsFar: [] @@ -964,7 +962,12 @@ MonoBehaviour: RenderReflectionBounces: 0 RenderReflectionIntensity: 0 RenderSkybox: {fileID: 0} - NetworkIDs: [] + NetworkIDs: + - gameObject: {fileID: 3480278762663670689} + ID: 10 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} NavigationAreas: [] diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 4a93999..483f1c8 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -3,10 +3,11 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 14 m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 + m_DefaultMaxDepenetrationVelocity: 10 m_SleepThreshold: 0.005 m_DefaultContactOffset: 0.01 m_DefaultSolverIterations: 6 @@ -17,10 +18,11 @@ PhysicsManager: m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: dfafffffdfafffffdfafffffffffffffdfafffffc800c0ffffffffffffffffffdfafffffdf09fcffdf09fcffdfafffffc800c0ffdfe9c3ffc820c0ffdfa9ffffdfa9ffffdfa9ffffdf8fffffdf8fffffdf8fffffdf8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - m_AutoSimulation: 1 + m_LayerCollisionMatrix: dfaff7ffdfaff7ffdfaff7ffffffffffdfaff7ffc800c0ffffffffffffffffffdfaff7ffdf09f4ffdf09f4ffdfaff7ffc800c0ffdfe9c3ffc820c0ffdfa9f7ffdfa9f7ffdfa9f7ffdf8ff7ffc800c0ffdf8ff7ffdf8ff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 + m_InvokeCollisionCallbacks: 1 m_ClothInterCollisionSettingsToggle: 0 m_ClothGravity: {x: 0, y: -9.81, z: 0} m_ContactPairsMode: 0 @@ -32,5 +34,6 @@ PhysicsManager: m_FrictionType: 0 m_EnableEnhancedDeterminism: 0 m_EnableUnifiedHeightmaps: 1 + m_ImprovedPatchFriction: 0 m_SolverType: 0 m_DefaultMaxAngularSpeed: 7 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 6b6fb7f..8cec94b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -8,11 +8,11 @@ TagManager: - Default - TransparentFX - Ignore Raycast - - + - reserved3 - Water - UI - - - - + - reserved6 + - reserved7 - Interactive - Player - PlayerLocal @@ -24,8 +24,8 @@ TagManager: - StereoRight - Walkthrough - MirrorReflection - - reserved2 - - reserved3 + - InternalUI + - HardwareObjects - reserved4 - -