diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 7a80d06..3b85376 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -73,8 +73,9 @@ + - + diff --git a/Assets/Models/SM_DrywallPanel5x7.1.fbx b/Assets/Models/SM_DrywallPanel5x7.1.fbx index 60da660..6ffa425 100644 Binary files a/Assets/Models/SM_DrywallPanel5x7.1.fbx and b/Assets/Models/SM_DrywallPanel5x7.1.fbx differ diff --git a/Assets/Models/SM_DrywallPanel5x7.1.fbx.meta b/Assets/Models/SM_DrywallPanel5x7.1.fbx.meta index 7a6310e..aeb4bc8 100644 --- a/Assets/Models/SM_DrywallPanel5x7.1.fbx.meta +++ b/Assets/Models/SM_DrywallPanel5x7.1.fbx.meta @@ -48,7 +48,7 @@ ModelImporter: nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 - generateSecondaryUV: 1 + generateSecondaryUV: 0 useFileUnits: 1 keepQuads: 0 weldVertices: 1 diff --git a/Assets/Models/SM_WallPlane.fbx b/Assets/Models/SM_WallPlane.fbx new file mode 100644 index 0000000..7469537 Binary files /dev/null and b/Assets/Models/SM_WallPlane.fbx differ diff --git a/Assets/Models/SM_WallPlane.fbx.meta b/Assets/Models/SM_WallPlane.fbx.meta new file mode 100644 index 0000000..62b40e3 --- /dev/null +++ b/Assets/Models/SM_WallPlane.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 81ecaf33982cefb46a2322fc78bac412 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index a65c1f5..35091a1 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -8297,10 +8297,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1193701800} m_Modifications: + - target: {fileID: 176651841783575305, guid: d065e253d298f0f44bb1d1c926531103, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -462981019419857548, guid: 81ecaf33982cefb46a2322fc78bac412, + type: 3} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.1 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -8325,7 +8331,7 @@ PrefabInstance: - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalPosition.y - value: 16.923624 + value: 4.21 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -8335,27 +8341,27 @@ PrefabInstance: - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999982 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0.5000002 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0.5000001 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalRotation.z - value: -0.7071068 + value: -0.49999988 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -10298,6 +10304,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 198611404} + - component: {fileID: 198611406} + - component: {fileID: 198611405} m_Layer: 22 m_Name: Video Load Indicators m_TagString: Untagged @@ -10324,6 +10332,59 @@ Transform: - {fileID: 1987643329} m_Father: {fileID: 2057791822} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &198611405 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 198611403} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 19a103c7a60cb9d4dbfbe20f9f9ff6c4, + type: 2} + programSource: {fileID: 11400000, guid: 9b2c4c61d500bbb42999680f19bae34b, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &198611406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 198611403} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7465b696c7c0ce94a9f726e2003ae74c, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 198611405} + _Indicators: + - {fileID: 312861885} + - {fileID: 1526794725} + - {fileID: 1953513695} + - {fileID: 1987643328} --- !u!1 &200748790 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4743609146738866493, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -13524,7 +13585,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &312861886 Transform: m_ObjectHideFlags: 0 @@ -27672,10 +27733,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1193701800} m_Modifications: + - target: {fileID: 176651841783575305, guid: d065e253d298f0f44bb1d1c926531103, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -462981019419857548, guid: 81ecaf33982cefb46a2322fc78bac412, + type: 3} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.1 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -27690,12 +27757,12 @@ PrefabInstance: - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalPosition.y - value: 19.28 + value: 3.83 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalPosition.z - value: 24.37 + value: 24.35 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -30998,6 +31065,7 @@ MonoBehaviour: - {fileID: 841163053} - {fileID: 272672682} - {fileID: 379391084} + - {fileID: 198611405} _CameraEventListeners: - {fileID: 904261778} --- !u!65 &824788963 @@ -32948,10 +33016,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1193701800} m_Modifications: + - target: {fileID: 176651841783575305, guid: d065e253d298f0f44bb1d1c926531103, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -462981019419857548, guid: 81ecaf33982cefb46a2322fc78bac412, + type: 3} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.1 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -32966,7 +33040,7 @@ PrefabInstance: - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalPosition.y - value: 19.28 + value: 3.83 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -48488,7 +48562,7 @@ PrefabInstance: - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.1 + value: 0.25 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -56927,7 +57001,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1526794726 Transform: m_ObjectHideFlags: 0 @@ -61305,10 +61379,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1193701800} m_Modifications: + - target: {fileID: 176651841783575305, guid: d065e253d298f0f44bb1d1c926531103, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -462981019419857548, guid: 81ecaf33982cefb46a2322fc78bac412, + type: 3} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.1 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -61323,7 +61403,7 @@ PrefabInstance: - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalPosition.y - value: 16.9 + value: 4.03 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -61333,27 +61413,27 @@ PrefabInstance: - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.4999999 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0.50000024 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.5000001 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalRotation.z - value: 0.7071068 + value: 0.49999988 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 3881061088311295148, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -71959,7 +72039,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1953513696 Transform: m_ObjectHideFlags: 0 @@ -73294,7 +73374,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1987643329 Transform: m_ObjectHideFlags: 0 @@ -79385,7 +79465,7 @@ PrefabInstance: - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.1 + value: 0.25 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -84688,46 +84768,46 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} + - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} + - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} + - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} + - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} + - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} @@ -84741,10 +84821,6 @@ MonoBehaviour: - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - - {fileID: 2100000, guid: c4e4a6e05f1eb9e40b245c97b9837de1, type: 2} - - {fileID: 2100000, guid: 1f89d6919019b0f448994cf16358a645, type: 2} - - {fileID: 2100000, guid: 0f5c040cb557f6c499cd572a32b794b1, type: 2} - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - {fileID: 2100000, guid: cf9efbb6277ea2d4aa7d30bc9073915e, type: 2} @@ -89357,6 +89433,10 @@ MonoBehaviour: ID: 1117 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 198611403} + ID: 1118 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index d62d90f..3596c62 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index 6e8a1bc..8317072 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index f87b1eb..81696fb 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index 02db9ea..98e296e 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index 7a65c54..70e4e16 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index c51ad3e..956c021 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index e875ecf..b070081 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index 352f99b..8f6a715 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/UdonSharp/Video Load Indicators.meta b/Assets/UdonSharp/Video Load Indicators.meta new file mode 100644 index 0000000..c1edfeb --- /dev/null +++ b/Assets/UdonSharp/Video Load Indicators.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: baeea289f7f7042448aef6423a5c3990 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.asset b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.asset similarity index 100% rename from Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.asset rename to Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.asset diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.asset.meta b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.asset.meta similarity index 100% rename from Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.asset.meta rename to Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.asset.meta diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.cs b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.cs similarity index 100% rename from Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.cs rename to Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.cs diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.cs.meta b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.cs.meta similarity index 100% rename from Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.cs.meta rename to Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.cs.meta diff --git a/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.asset b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.asset new file mode 100644 index 0000000..636d216 --- /dev/null +++ b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.asset @@ -0,0 +1,113 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: VideoLoadIndicatorGroup + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 19a103c7a60cb9d4dbfbe20f9f9ff6c4, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 7465b696c7c0ce94a9f726e2003ae74c, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 6070922825778914421 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Indicators + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Indicators + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject[], UnityEngine.CoreModule + - 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: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|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: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.asset.meta b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.asset.meta new file mode 100644 index 0000000..0cd9c7a --- /dev/null +++ b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b2c4c61d500bbb42999680f19bae34b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.cs b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.cs new file mode 100644 index 0000000..c45c0d4 --- /dev/null +++ b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.cs @@ -0,0 +1,28 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class VideoLoadIndicatorGroup : UdonSharpBehaviour +{ + [SerializeField] private GameObject[] _Indicators; + + public void HostEnabled() + { + foreach (GameObject Indicator in _Indicators) + { + Indicator.SetActive(true); + } + } + + public void HostDisabled() + { + foreach (GameObject Indicator in _Indicators) + { + Indicator.SetActive(false); + } + } +} diff --git a/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.cs.meta b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.cs.meta new file mode 100644 index 0000000..2c14669 --- /dev/null +++ b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicatorGroup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7465b696c7c0ce94a9f726e2003ae74c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UdonSharp.Editor.csproj b/UdonSharp.Editor.csproj index 96c8e41..3ce1418 100644 --- a/UdonSharp.Editor.csproj +++ b/UdonSharp.Editor.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Lib.csproj b/UdonSharp.Lib.csproj index de30fa2..8def6c3 100644 --- a/UdonSharp.Lib.csproj +++ b/UdonSharp.Lib.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UdonSharp.Runtime.csproj b/UdonSharp.Runtime.csproj index 404efcf..95b4222 100644 --- a/UdonSharp.Runtime.csproj +++ b/UdonSharp.Runtime.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.Addressables.csproj b/UniTask.Addressables.csproj index ea8c8d3..9aa8103 100644 --- a/UniTask.Addressables.csproj +++ b/UniTask.Addressables.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.DOTween.csproj b/UniTask.DOTween.csproj index 7a59b69..d48f31c 100644 --- a/UniTask.DOTween.csproj +++ b/UniTask.DOTween.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.Editor.csproj b/UniTask.Editor.csproj index d3bccb9..71a3f7f 100644 --- a/UniTask.Editor.csproj +++ b/UniTask.Editor.csproj @@ -1128,14 +1128,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UniTask.Linq.csproj b/UniTask.Linq.csproj index 2d5a27b..70a2010 100644 --- a/UniTask.Linq.csproj +++ b/UniTask.Linq.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.TextMeshPro.csproj b/UniTask.TextMeshPro.csproj index b8ba197..51bed4e 100644 --- a/UniTask.TextMeshPro.csproj +++ b/UniTask.TextMeshPro.csproj @@ -1123,14 +1123,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.csproj b/UniTask.csproj index 1bdff38..21f0a84 100644 --- a/UniTask.csproj +++ b/UniTask.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UnityEditorTests.csproj b/UnityEditorTests.csproj index 7b09a12..b9085b2 100644 --- a/UnityEditorTests.csproj +++ b/UnityEditorTests.csproj @@ -990,14 +990,14 @@ Library\ScriptAssemblies\UnityEditor.TestRunner.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.ClientSim.Editor.csproj b/VRC.ClientSim.Editor.csproj index 322f28d..2577234 100644 --- a/VRC.ClientSim.Editor.csproj +++ b/VRC.ClientSim.Editor.csproj @@ -1159,14 +1159,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.ClientSim.csproj b/VRC.ClientSim.csproj index 51197bb..01430dc 100644 --- a/VRC.ClientSim.csproj +++ b/VRC.ClientSim.csproj @@ -1264,14 +1264,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.ExampleCentral.Editor.csproj b/VRC.ExampleCentral.Editor.csproj index cee0d79..b01e5a7 100644 --- a/VRC.ExampleCentral.Editor.csproj +++ b/VRC.ExampleCentral.Editor.csproj @@ -1138,14 +1138,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.Editor.csproj b/VRC.SDK3.Editor.csproj index 6b6a057..e8075f3 100644 --- a/VRC.SDK3.Editor.csproj +++ b/VRC.SDK3.Editor.csproj @@ -1181,14 +1181,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.csproj b/VRC.SDK3.csproj index 83e2836..36b455c 100644 --- a/VRC.SDK3.csproj +++ b/VRC.SDK3.csproj @@ -1149,14 +1149,14 @@ Library\ScriptAssemblies\Cinemachine.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.SDKBase.Editor.BuildPipeline.csproj b/VRC.SDKBase.Editor.BuildPipeline.csproj index 60ab3fc..d0cafb5 100644 --- a/VRC.SDKBase.Editor.BuildPipeline.csproj +++ b/VRC.SDKBase.Editor.BuildPipeline.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.SDKBase.Editor.ShaderStripping.csproj b/VRC.SDKBase.Editor.ShaderStripping.csproj index 7e57a23..13677d0 100644 --- a/VRC.SDKBase.Editor.ShaderStripping.csproj +++ b/VRC.SDKBase.Editor.ShaderStripping.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.Editor.csproj b/VRC.SDKBase.Editor.csproj index 24a9850..bd6e5b8 100644 --- a/VRC.SDKBase.Editor.csproj +++ b/VRC.SDKBase.Editor.csproj @@ -1258,14 +1258,14 @@ Library\ScriptAssemblies\Unity.XR.Oculus.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.csproj b/VRC.SDKBase.csproj index 3952b05..d8fa5c8 100644 --- a/VRC.SDKBase.csproj +++ b/VRC.SDKBase.csproj @@ -1185,14 +1185,14 @@ Library\ScriptAssemblies\Unity.Timeline.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.Udon.Editor.csproj b/VRC.Udon.Editor.csproj index af6c3b2..7ca0cd2 100644 --- a/VRC.Udon.Editor.csproj +++ b/VRC.Udon.Editor.csproj @@ -1206,14 +1206,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.Udon.Serialization.OdinSerializer.csproj b/VRC.Udon.Serialization.OdinSerializer.csproj index 00336f1..3f7c27b 100644 --- a/VRC.Udon.Serialization.OdinSerializer.csproj +++ b/VRC.Udon.Serialization.OdinSerializer.csproj @@ -1305,14 +1305,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.Udon.csproj b/VRC.Udon.csproj index c325600..0f5c1d1 100644 --- a/VRC.Udon.csproj +++ b/VRC.Udon.csproj @@ -1143,14 +1143,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRWorldToolkit.Editor.csproj b/VRWorldToolkit.Editor.csproj index 282495a..0d1a5ad 100644 --- a/VRWorldToolkit.Editor.csproj +++ b/VRWorldToolkit.Editor.csproj @@ -1146,14 +1146,14 @@ Library\ScriptAssemblies\Unity.Postprocessing.Runtime.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/com.vrchat.core.vpm-resolver.Editor.csproj b/com.vrchat.core.vpm-resolver.Editor.csproj index d33831e..0ee0bd0 100644 --- a/com.vrchat.core.vpm-resolver.Editor.csproj +++ b/com.vrchat.core.vpm-resolver.Editor.csproj @@ -1142,14 +1142,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.Editor.csproj b/vrchat.jordo.easyquestswitch.Editor.csproj index f92ad30..b3680ec 100644 --- a/vrchat.jordo.easyquestswitch.Editor.csproj +++ b/vrchat.jordo.easyquestswitch.Editor.csproj @@ -1129,14 +1129,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.csproj b/vrchat.jordo.easyquestswitch.csproj index e7c0214..6175adb 100644 --- a/vrchat.jordo.easyquestswitch.csproj +++ b/vrchat.jordo.easyquestswitch.csproj @@ -1151,14 +1151,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False +