diff --git a/Assets/Prefabs/Arrival Display.prefab b/Assets/Prefabs/Arrival Display.prefab index 9c2f659..93738e1 100644 --- a/Assets/Prefabs/Arrival Display.prefab +++ b/Assets/Prefabs/Arrival Display.prefab @@ -56,6 +56,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 5599998666058814250} + _Sign: {fileID: 165281433678564029} _Display: {fileID: 8703330570973995998} --- !u!114 &5599998666058814250 MonoBehaviour: @@ -315,6 +316,11 @@ PrefabInstance: propertyPath: m_Name value: SM_DestinationCard objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 85fb9450493e0894191f35f1bc4e8edf, type: 3} propertyPath: m_StaticEditorFlags @@ -329,6 +335,12 @@ PrefabInstance: addedObject: {fileID: 7676618605733070073} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85fb9450493e0894191f35f1bc4e8edf, type: 3} +--- !u!1 &165281433678564029 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + m_PrefabInstance: {fileID: 1047750225737676780} + m_PrefabAsset: {fileID: 0} --- !u!4 &648767085292326919 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, diff --git a/Assets/Prefabs/Case List Entry List.prefab b/Assets/Prefabs/Case List Entry List.prefab index 1a1449f..60858ab 100644 --- a/Assets/Prefabs/Case List Entry List.prefab +++ b/Assets/Prefabs/Case List Entry List.prefab @@ -712,6 +712,11 @@ PrefabInstance: propertyPath: MapFiles.Array.size value: 8 objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: ClueImages.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.size @@ -763,6 +768,11 @@ PrefabInstance: propertyPath: MapFiles.Array.data[7].url value: https://witwics-dev.github.io/TheWilliamsburglary/Maps/atlas_8.png objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: ClueImages.Array.data[0].url + value: https://witwics-dev.github.io/TheWilliamsburglary/ExtraImages/0.png + objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[0].url diff --git a/Assets/Prefabs/Modem.prefab b/Assets/Prefabs/Modem.prefab index 7ee802f..f54f66f 100644 --- a/Assets/Prefabs/Modem.prefab +++ b/Assets/Prefabs/Modem.prefab @@ -1,5 +1,37 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &497488136702045868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6417972481979237589} + m_Layer: 0 + m_Name: Activation Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6417972481979237589 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497488136702045868} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3200115956421457733} + m_Father: {fileID: 6538633228974114170} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2802413248237860970 GameObject: m_ObjectHideFlags: 0 @@ -33,7 +65,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3200115956421457733} + - {fileID: 6417972481979237589} - {fileID: 5664439777900644494} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -101,8 +133,11 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 932720169245821887} + _ModemActivationObject: {fileID: 497488136702045868} _ModemDestination: {fileID: 0} _AudioManager: {fileID: 0} + _ModemAnimator: {fileID: 0} + _ModemDestinationAnimator: {fileID: 0} --- !u!114 &932720169245821887 MonoBehaviour: m_ObjectHideFlags: 0 @@ -234,7 +269,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 6538633228974114170} + m_TransformParent: {fileID: 6417972481979237589} m_Modifications: - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, type: 3} @@ -259,17 +294,17 @@ PrefabInstance: - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, type: 3} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 291f686..571ad28 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -22690,6 +22690,11 @@ PrefabInstance: value: objectReference: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} + - target: {fileID: 497488136702045868, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} propertyPath: _AudioManager @@ -67932,11 +67937,6 @@ PrefabInstance: value: objectReference: {fileID: 3331666085199925244, guid: fa9de454fe013ac4e9fabd14308a4623, type: 3} - - target: {fileID: 3331666085199925244, guid: fa9de454fe013ac4e9fabd14308a4623, - type: 3} - propertyPath: ClueImages.Array.data[0].url - value: https://witwics-dev.github.io/TheWilliamsburglary/ExtraImages/0.png - objectReference: {fileID: 0} - target: {fileID: 3902373814749228331, guid: fa9de454fe013ac4e9fabd14308a4623, type: 3} propertyPath: m_AnchorMax.y @@ -68122,7 +68122,7 @@ PrefabInstance: - target: {fileID: 2802413248237860970, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4265969037790604469, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} @@ -72166,7 +72166,7 @@ PrefabInstance: - target: {fileID: 963772615436927068, guid: d31a80d8d627ccf4dbe74f28d7061f7c, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3575829574452964246, guid: d31a80d8d627ccf4dbe74f28d7061f7c, type: 3} @@ -72775,34 +72775,34 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: cf2685410a4f72447a34ea1791a70a1c, type: 2} - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 diff --git a/Assets/Textures/HDR.meta b/Assets/Textures/HDR.meta deleted file mode 100644 index 6a3df72..0000000 --- a/Assets/Textures/HDR.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c22dc84494eddba4eb4c0f3c818ecb14 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/HDR/T_PolyHaven_DancingHall.exr.meta b/Assets/Textures/HDR/T_PolyHaven_DancingHall.exr.meta deleted file mode 100644 index 0f3d148..0000000 --- a/Assets/Textures/HDR/T_PolyHaven_DancingHall.exr.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: ad691ad023308ca40a599f91a3e80687 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 1 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 2 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 3 - compressionQuality: 25 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Location Board/T_FootprintsPanel_Albedo.png.meta b/Assets/Textures/Location Board/T_FootprintsPanel_Albedo.png.meta index 7476f76..5ca9b2c 100644 --- a/Assets/Textures/Location Board/T_FootprintsPanel_Albedo.png.meta +++ b/Assets/Textures/Location Board/T_FootprintsPanel_Albedo.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 512 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 diff --git a/Assets/Textures/Location Board/T_WarrantPanel_Albedo.png.meta b/Assets/Textures/Location Board/T_WarrantPanel_Albedo.png.meta index ad69ca2..2e07692 100644 --- a/Assets/Textures/Location Board/T_WarrantPanel_Albedo.png.meta +++ b/Assets/Textures/Location Board/T_WarrantPanel_Albedo.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 512 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 diff --git a/Assets/Textures/T_VHS.png.meta b/Assets/Textures/T_VHS.png.meta index 4ee08b4..827a371 100644 --- a/Assets/Textures/T_VHS.png.meta +++ b/Assets/Textures/T_VHS.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 512 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 256 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -108,7 +108,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 256 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 diff --git a/Assets/Textures/T_VHS_Normal.bmp.meta b/Assets/Textures/T_VHS_Normal.bmp.meta index 209f0a3..930d52c 100644 --- a/Assets/Textures/T_VHS_Normal.bmp.meta +++ b/Assets/Textures/T_VHS_Normal.bmp.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 512 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 256 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -108,7 +108,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 256 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 diff --git a/Assets/UdonSharp/ArrivalDisplay.asset b/Assets/UdonSharp/ArrivalDisplay.asset index a81d378..a06649c 100644 --- a/Assets/UdonSharp/ArrivalDisplay.asset +++ b/Assets/UdonSharp/ArrivalDisplay.asset @@ -44,25 +44,25 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 1 + Data: 4 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: _Display + Data: _Sign - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Display + Data: _Sign - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + Data: UnityEngine.GameObject, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -105,6 +105,198 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Display + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Display + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 7 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 9|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ActivateSign + - Name: $v + Entry: 7 + Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ActivateSign + - Name: k__BackingField + Entry: 7 + Data: 11|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 13|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 14|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _DisplayText + - Name: $v + Entry: 7 + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _DisplayText + - Name: k__BackingField + Entry: 7 + Data: 16|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 16 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 18|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 19|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/ArrivalDisplay.cs b/Assets/UdonSharp/ArrivalDisplay.cs index 44072c6..6e9397f 100644 --- a/Assets/UdonSharp/ArrivalDisplay.cs +++ b/Assets/UdonSharp/ArrivalDisplay.cs @@ -9,10 +9,43 @@ using VRC.Udon; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class ArrivalDisplay : UdonSharpBehaviour { + [SerializeField] private GameObject _Sign; [SerializeField] private TextMeshProUGUI _Display; - public void SetDisplay(string Text) + [UdonSynced, FieldChangeCallback(nameof(ActivateSign))] private bool _ActivateSign; + [UdonSynced, FieldChangeCallback(nameof(DisplayText))] private string _DisplayText; + + + public void Activate(bool Active) + { + ActivateSign = Active; + RequestSerialization(); + } + + public void SetDisplayText(string Text) { - _Display.text = Text; - } + DisplayText = Text; + RequestSerialization(); + } + + + private bool ActivateSign + { + set + { + _ActivateSign = value; + _Sign.SetActive(_ActivateSign); + } + get => _ActivateSign; + } + + private string DisplayText + { + set + { + _DisplayText = value; + _Display.text = _DisplayText; + } + get => _DisplayText; + } } diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 9b13929..08407ea 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -69,6 +69,12 @@ public class CaseManager : UdonSharpBehaviour public void LoadCaseFile(CaseManagerListEntry CaseFile) { + Networking.SetOwner(Networking.LocalPlayer, gameObject); + Networking.SetOwner(Networking.LocalPlayer, _Round1Manager.gameObject); + Networking.SetOwner(Networking.LocalPlayer, _Round2Manager.gameObject); + Networking.SetOwner(Networking.LocalPlayer, _Round3Manager.gameObject); + Networking.SetOwner(Networking.LocalPlayer, _HostCard.gameObject); + _CaseFileCluesURL = CaseFile.CaseFileURL; _CaseFileLootImage = CaseFile.LootImage; _CaseFileMaps = CaseFile.MapFiles; diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 6aec768..9a3d34a 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -63,11 +63,13 @@ public class GameManagerRound1 : GameManagerBase _PlayerBuzzInAllowed = new bool[_PlayerPodiums.Length]; - _Modem.ResetModem(); - _Modem.gameObject.SetActive(false); - _ArrivalDisplay.gameObject.SetActive(false); + Networking.SetOwner(Networking.GetOwner(gameObject), _Modem.gameObject); + _Modem.Activate(false); - _LightningRoundAnimator.SetBool("Lightning", false); + Networking.SetOwner(Networking.GetOwner(gameObject), _ArrivalDisplay.gameObject); + _ArrivalDisplay.Activate(false); + + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(ResetLightningRoundAnimation)); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.WhereInTheWorld); SendCustomEventDelayedSeconds(nameof(PlaySecondPartOfThemeMusic), 3.6666666666f); @@ -515,7 +517,7 @@ public class GameManagerRound1 : GameManagerBase private void BeginLightningRound() { - _LightningRoundAnimator.SetBool("Lightning", true); + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlayLightningRoundAnimation)); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.Thunder); HostCardLightningRoundInterface Interface = @@ -532,6 +534,16 @@ public class GameManagerRound1 : GameManagerBase EnableInteraction("First Question"); } + [NetworkCallable] + public void PlayLightningRoundAnimation() + { + _LightningRoundAnimator.SetBool("Lightning", true); + } + [NetworkCallable] + public void ResetLightningRoundAnimation() + { + _LightningRoundAnimator.SetBool("Lightning", false); + } private void LightningRoundCluesLoop() { @@ -1146,15 +1158,15 @@ public class GameManagerRound1 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.CapitalLoop); - _Modem.gameObject.SetActive(true); - _ArrivalDisplay.gameObject.SetActive(true); + _Modem.Activate(true); + _ArrivalDisplay.Activate(true); EnableInteraction("Activate Modem"); } private void ActivateModem() { - _Modem.BeginTeleportProcess(); + _Modem.Teleport(); SendCustomEventDelayedSeconds(nameof(_ContinueToRound2_Private), 5.0f); } public void _ContinueToRound2_Private() diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index ca9b7f6..3e20bfd 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -367,7 +367,7 @@ public class GameManagerRound2 : GameManagerBase set { _Location = value; - _ArrivalDisplay.SetDisplay(_Location); + _ArrivalDisplay.SetDisplayText(_Location); } get => _Location; } diff --git a/Assets/UdonSharp/Modem/Modem.asset b/Assets/UdonSharp/Modem/Modem.asset index c242856..eb71efb 100644 --- a/Assets/UdonSharp/Modem/Modem.asset +++ b/Assets/UdonSharp/Modem/Modem.asset @@ -44,7 +44,193 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 5 + Data: 8 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ActivateModem + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ActivateModem + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 5|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 6|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _BeginTeleport + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _BeginTeleport + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 9|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 10|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ModemActivationObject + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ModemActivationObject + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: @@ -53,13 +239,13 @@ MonoBehaviour: Data: _ModemDestination - Name: $v Entry: 7 - Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ModemDestination - Name: k__BackingField Entry: 7 - Data: 3|System.RuntimeType, mscorlib + Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Modem, Assembly-CSharp @@ -68,7 +254,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 4|System.RuntimeType, mscorlib + Data: 17|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.Udon.UdonBehaviour, VRC.Udon @@ -89,13 +275,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -119,13 +305,13 @@ MonoBehaviour: Data: _AudioManager - Name: $v Entry: 7 - Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AudioManager - Name: k__BackingField Entry: 7 - Data: 8|System.RuntimeType, mscorlib + Data: 21|System.RuntimeType, mscorlib - Name: Entry: 1 Data: AudioManager, Assembly-CSharp @@ -134,7 +320,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -149,13 +335,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 10|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 23|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -164,7 +350,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 11|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 24|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -188,13 +374,13 @@ MonoBehaviour: Data: _ModemAnimator - Name: $v Entry: 7 - Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ModemAnimator - Name: k__BackingField Entry: 7 - Data: 13|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -203,7 +389,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 13 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -218,13 +404,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 28|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -248,16 +434,16 @@ MonoBehaviour: Data: _ModemDestinationAnimator - Name: $v Entry: 7 - Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ModemDestinationAnimator - Name: k__BackingField Entry: 9 - Data: 13 + Data: 26 - Name: k__BackingField Entry: 9 - Data: 13 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -272,13 +458,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 31|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -302,13 +488,13 @@ MonoBehaviour: Data: _EnteredPlayers - Name: $v Entry: 7 - Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _EnteredPlayers - Name: k__BackingField Entry: 7 - Data: 20|System.RuntimeType, mscorlib + Data: 33|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -317,7 +503,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 20 + Data: 33 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -332,13 +518,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 22|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 35|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Modem/Modem.cs b/Assets/UdonSharp/Modem/Modem.cs index f356def..4f9bb30 100644 --- a/Assets/UdonSharp/Modem/Modem.cs +++ b/Assets/UdonSharp/Modem/Modem.cs @@ -10,6 +10,10 @@ using VRC.Udon.Common.Interfaces; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class Modem : UdonSharpBehaviour { + [UdonSynced, FieldChangeCallback(nameof(ActivateModem))] private bool _ActivateModem = false; + [UdonSynced, FieldChangeCallback(nameof(BeginTeleport))] private bool _BeginTeleport = false; + + [SerializeField] private GameObject _ModemActivationObject; [SerializeField] private Modem _ModemDestination; [Space] @@ -23,13 +27,6 @@ public class Modem : UdonSharpBehaviour - public void ResetModem() - { - _ModemAnimator.SetBool("Teleport", false); - _ModemDestinationAnimator.SetBool("Teleport", false); - } - - public override void OnPlayerTriggerEnter(VRCPlayerApi Player) { for (int i = 0; i < MAX_PLAYERS_IN_MODEM; i++) @@ -61,28 +58,49 @@ public class Modem : UdonSharpBehaviour } - public void BeginTeleportProcess() + public void Activate(bool Active) { - _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, - "PlaySFX", SFXEventType.ModemOperation); + ActivateModem = Active; + RequestSerialization(); + } + + public void Teleport() + { + BeginTeleport = true; + RequestSerialization(); + } + + private void ExecuteTeleportProcess() + { + // This is a synced function, so only play the sound effect locally. + _AudioManager.PlaySFX(SFXEventType.ModemOperation); _ModemAnimator.SetBool("Teleport", true); _ModemDestinationAnimator.SetBool("Teleport", true); SendCustomEventDelayedSeconds(nameof(TeleportAllPlayers), 4.0f); - SendCustomEventDelayedSeconds(nameof(ResetAnimations), 6.0f); + SendCustomEventDelayedSeconds(nameof(EndTeleport), 6.0f); } public void TeleportAllPlayers() { - SendCustomNetworkEvent(NetworkEventTarget.All, nameof(TeleportLocalPlayerIfInModem)); + // Only the Modem owner should execute teleportations. + if (Networking.GetOwner(gameObject) == Networking.LocalPlayer) + { + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(TeleportLocalPlayerIfInModem)); + } } - public void ResetAnimations() + public void ResetTeleportProcess() { _ModemAnimator.SetBool("Teleport", false); _ModemDestinationAnimator.SetBool("Teleport", false); } + public void EndTeleport() + { + BeginTeleport = false; + RequestSerialization(); + } [NetworkCallable] @@ -110,4 +128,32 @@ public class Modem : UdonSharpBehaviour _ModemDestination.transform.position + DestinationPositionDelta, DeltaRotation * Networking.LocalPlayer.GetRotation()); } + + + private bool ActivateModem + { + set + { + _ActivateModem = value; + _ModemActivationObject.SetActive(_ActivateModem); + } + get => _ActivateModem; + } + + private bool BeginTeleport + { + set + { + _BeginTeleport = value; + if (_BeginTeleport) + { + ExecuteTeleportProcess(); + } + else + { + ResetTeleportProcess(); + } + } + get => _BeginTeleport; + } } diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index ba6209e..d925021 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -10,8 +10,8 @@ AudioManager: Default Speaker Mode: 2 m_SampleRate: 48000 m_DSPBufferSize: 1024 - m_VirtualVoiceCount: 64 - m_RealVoiceCount: 32 + m_VirtualVoiceCount: 32 + m_RealVoiceCount: 24 m_EnableOutputSuspension: 1 m_SpatializerPlugin: OculusSpatializer m_AmbisonicDecoderPlugin: OculusSpatializer diff --git a/Assets/Textures/HDR/T_PolyHaven_DancingHall.exr b/Raw Files/T_PolyHaven_DancingHall.exr similarity index 100% rename from Assets/Textures/HDR/T_PolyHaven_DancingHall.exr rename to Raw Files/T_PolyHaven_DancingHall.exr