diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 7f7794a..f895212 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -73,7 +73,6 @@ - @@ -107,6 +106,7 @@ + @@ -135,6 +135,7 @@ + diff --git a/Assets/Materials/RT_VideoPlayer.mat b/Assets/Materials/RT_VideoPlayer.mat new file mode 100644 index 0000000..cdf7980 --- /dev/null +++ b/Assets/Materials/RT_VideoPlayer.mat @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RT_VideoPlayer + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLE_GEOMETRIC_SPECULAR_AA + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 8600000, guid: 4ddd9ec3c4599e14c8050a554582bc3e, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Bicubic: 0 + - _BumpScale: 1 + - _DetailNormalMapScale: 1 + - _EnableGeometricSpecularAA: 1 + - _Glossiness: 1 + - _GlossyReflections: 0 + - _LightmapType: 0 + - _Metallic: 1 + - _OcclusionStrength: 1 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularHighlights: 0 + - _UVSec: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/RT_VideoPlayer.mat.meta b/Assets/Materials/RT_VideoPlayer.mat.meta new file mode 100644 index 0000000..3819556 --- /dev/null +++ b/Assets/Materials/RT_VideoPlayer.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f7fb51ae73e7ea448d340dab1beccb3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 24d4e8d..106c611 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -4218,6 +4218,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 115578770} + _VideoPlayer: {fileID: 115578772} VideoPool: - url: https://witwics.actual.horse/static/crook-in-jail/ContessaInJail.mp4 - url: https://witwics.actual.horse/static/crook-in-jail/DoubleTroubleInJail.mp4 @@ -4259,9 +4260,9 @@ MonoBehaviour: loop: 0 renderMode: 0 targetTexture: {fileID: 8600000, guid: 4ddd9ec3c4599e14c8050a554582bc3e, type: 2} - targetMaterialRenderer: {fileID: 2028006813} + targetMaterialRenderer: {fileID: 0} targetMaterialProperty: _EmissionMap - aspectRatio: 1 + aspectRatio: 3 targetAudioSources: - {fileID: 2018849108} maximumResolution: 360 @@ -8313,6 +8314,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 949eb8690c7931145836b58adb7eafcf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &134374695 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 134374696} + - component: {fileID: 134374698} + - component: {fileID: 134374697} + m_Layer: 22 + m_Name: Live + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &134374696 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 134374695} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00013580173} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 974801523} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 555.4999, y: -224.78125} + m_SizeDelta: {x: 156.99997, y: 88.3125} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &134374697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 134374695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &134374698 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 134374695} + m_CullTransparentMesh: 1 --- !u!1 &135090744 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6247895816115081831, guid: 126991d511ca61841a0ef899b6c038a6, @@ -15331,7 +15407,7 @@ PrefabInstance: - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -15426,31 +15502,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.x - value: 11.263925 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.y - value: 996.83997 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.z - value: 15.763637 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.8591459 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.51173085 - objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -15469,27 +15520,27 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: sleepFlag - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnPos.x - value: 11.263925 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnPos.y - value: 996.83997 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnPos.z - value: 15.763637 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.w - value: -0.8591459 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -15499,7 +15550,7 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.y - value: 0.51173085 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -20259,8 +20310,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 527.3333, y: -58.874992} - m_SizeDelta: {x: 209.33333, y: 117.749985} + m_AnchoredPosition: {x: 396.49994, y: -44.15625} + m_SizeDelta: {x: 156.99997, y: 88.3125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &449385710 MonoBehaviour: @@ -32996,8 +33047,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104.666664, y: -58.874992} - m_SizeDelta: {x: 209.33333, y: 117.749985} + m_AnchoredPosition: {x: 78.499985, y: -44.15625} + m_SizeDelta: {x: 156.99997, y: 88.3125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &558715348 MonoBehaviour: @@ -33093,6 +33144,50 @@ MonoBehaviour: m_StringArgument: Camera1_Switch m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &559777313 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 559777314} + - component: {fileID: 559777315} + m_Layer: 22 + m_Name: Spacer (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &559777314 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559777313} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00013580173} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 974801523} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 555.4999, y: -134.46875} + m_SizeDelta: {x: 156.99997, y: 88.3125} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &559777315 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559777313} + m_CullTransparentMesh: 1 --- !u!1 &560691080 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7034199273745288373, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -33213,12 +33308,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 561847092} m_PrefabAsset: {fileID: 0} ---- !u!23 &561847094 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: 3b9e171cd9a05f4409116211d956033a, - type: 3} - m_PrefabInstance: {fileID: 561847092} - m_PrefabAsset: {fileID: 0} --- !u!1 &562887658 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8453222299736309925, guid: be33bc7f6c414e6409becfa348b9310d, @@ -38752,8 +38841,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 316, y: -58.874992} - m_SizeDelta: {x: 209.33333, y: 117.749985} + m_AnchoredPosition: {x: 237.49995, y: -44.15625} + m_SizeDelta: {x: 156.99997, y: 88.3125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &717190864 MonoBehaviour: @@ -42476,8 +42565,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 316, y: -178.62497} - m_SizeDelta: {x: 209.33333, y: 117.749985} + m_AnchoredPosition: {x: 78.499985, y: -134.46875} + m_SizeDelta: {x: 156.99997, y: 88.3125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &796654659 MonoBehaviour: @@ -48049,6 +48138,12 @@ RectTransform: - {fileID: 2071042738} - {fileID: 796654658} - {fileID: 1451018077} + - {fileID: 1055505696} + - {fileID: 559777314} + - {fileID: 988673799} + - {fileID: 1688766231} + - {fileID: 1741622418} + - {fileID: 134374696} m_Father: {fileID: 1333952428} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -48076,7 +48171,7 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 209.33333, y: 117.749985} + m_CellSize: {x: 156.99997, y: 88.3125} m_Spacing: {x: 2, y: 2} m_Constraint: 0 m_ConstraintCount: 2 @@ -48398,6 +48493,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &988673798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 988673799} + - component: {fileID: 988673800} + m_Layer: 22 + m_Name: Spacer (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &988673799 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 988673798} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00013580173} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 974801523} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 78.499985, y: -224.78125} + m_SizeDelta: {x: 156.99997, y: 88.3125} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &988673800 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 988673798} + m_CullTransparentMesh: 1 --- !u!1 &988783135 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8369629034858625372, guid: e9914385266bca24db809c39e395f03c, @@ -53333,6 +53472,50 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5448599223445625650} m_PrefabAsset: {fileID: 0} +--- !u!1 &1055505695 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1055505696} + - component: {fileID: 1055505697} + m_Layer: 22 + m_Name: Spacer (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1055505696 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055505695} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00013580173} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 974801523} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 396.49994, y: -134.46875} + m_SizeDelta: {x: 156.99997, y: 88.3125} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1055505697 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055505695} + m_CullTransparentMesh: 1 --- !u!1 &1056359575 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8202295805916797183, guid: be33bc7f6c414e6409becfa348b9310d, @@ -61905,7 +62088,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -200} + m_AnchoredPosition: {x: 320, y: -520} m_SizeDelta: {x: 640, y: 320} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1333952429 @@ -63361,14 +63544,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1355971342} serializedVersion: 2 - m_LocalRotation: {x: -0.36687618, y: 0.60448474, z: -0.60448474, w: -0.3668765} - m_LocalPosition: {x: -14.83, y: 2.26, z: 1.69} + m_LocalRotation: {x: -0.40374658, y: 0.58050716, z: -0.5805072, w: -0.4037469} + m_LocalPosition: {x: -15.53, y: 1.99, z: 1.34} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1614278399} m_Father: {fileID: 1276291775} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 117.491} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 110.362} --- !u!1 &1356247071 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6133542484281842419, guid: be33bc7f6c414e6409becfa348b9310d, @@ -65598,8 +65781,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 527.3333, y: -178.62497} - m_SizeDelta: {x: 209.33333, y: 117.749985} + m_AnchoredPosition: {x: 237.49995, y: -134.46875} + m_SizeDelta: {x: 156.99997, y: 88.3125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1451018078 MonoBehaviour: @@ -76611,6 +76794,113 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1582278623} m_PrefabAsset: {fileID: 0} +--- !u!1 &1582487347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1582487349} + - component: {fileID: 1582487348} + - component: {fileID: 1582487351} + - component: {fileID: 1582487350} + m_Layer: 0 + m_Name: Video Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &1582487348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1582487347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -560078975, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} + m_Name: + m_EditorClassIdentifier: + EnableAutomaticResync: 0 + videoURL: + url: + autoPlay: 0 + loop: 0 + renderMode: 0 + targetTexture: {fileID: 8600000, guid: 4ddd9ec3c4599e14c8050a554582bc3e, type: 2} + targetMaterialRenderer: {fileID: 0} + targetMaterialProperty: _EmissionMap + aspectRatio: 3 + targetAudioSources: + - {fileID: 2018849108} + maximumResolution: 360 +--- !u!4 &1582487349 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1582487347} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 44.423214, y: -8.907965, z: 21.090984} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1582487350 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1582487347} + 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: ce28b2301c190c64a91b539833da012a, + type: 2} + programSource: {fileID: 11400000, guid: 94d9f43101845e244b13e23bea9e10a8, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1582487351 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1582487347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4110298af614c34fa508b9180055317, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1582487350} --- !u!1 &1583513122 GameObject: m_ObjectHideFlags: 0 @@ -78001,7 +78291,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!64 &1614278396 MeshCollider: m_ObjectHideFlags: 0 @@ -80987,6 +81277,50 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 937910637} m_PrefabAsset: {fileID: 0} +--- !u!1 &1688766230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1688766231} + - component: {fileID: 1688766232} + m_Layer: 22 + m_Name: Spacer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1688766231 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688766230} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00013580173} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 974801523} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 237.49995, y: -224.78125} + m_SizeDelta: {x: 156.99997, y: 88.3125} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1688766232 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688766230} + m_CullTransparentMesh: 1 --- !u!1 &1691482839 GameObject: m_ObjectHideFlags: 0 @@ -82772,6 +83106,50 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1741622417 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1741622418} + - component: {fileID: 1741622419} + m_Layer: 22 + m_Name: Spacer (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1741622418 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1741622417} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00013580173} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 974801523} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 396.49994, y: -224.78125} + m_SizeDelta: {x: 156.99997, y: 88.3125} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1741622419 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1741622417} + m_CullTransparentMesh: 1 --- !u!1 &1742277294 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1413072422791182760, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -83152,7 +83530,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1762618933} - - component: {fileID: 1762618934} + - component: {fileID: 1762618937} - component: {fileID: 1762618935} - component: {fileID: 1762618936} m_Layer: 0 @@ -83179,31 +83557,6 @@ Transform: - {fileID: 776581557} m_Father: {fileID: 1276291775} m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} ---- !u!114 &1762618934 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1762618932} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -560078975, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} - m_Name: - m_EditorClassIdentifier: - EnableAutomaticResync: 0 - videoURL: - url: - autoPlay: 0 - loop: 0 - renderMode: 0 - targetTexture: {fileID: 8600000, guid: 4ddd9ec3c4599e14c8050a554582bc3e, type: 2} - targetMaterialRenderer: {fileID: 561847094} - targetMaterialProperty: _EmissionMap - aspectRatio: 1 - targetAudioSources: - - {fileID: 2018849108} - maximumResolution: 360 --- !u!114 &1762618935 MonoBehaviour: m_ObjectHideFlags: 0 @@ -83226,6 +83579,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1762618936} + _VideoPlayer: {fileID: 1762618937} VideoPool: - url: https://witwics.actual.horse/static/endings/EndCredits2.mp4 VideoPoolFallback: @@ -83256,6 +83610,31 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 +--- !u!114 &1762618937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1762618932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -560078975, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} + m_Name: + m_EditorClassIdentifier: + EnableAutomaticResync: 0 + videoURL: + url: + autoPlay: 0 + loop: 0 + renderMode: 0 + targetTexture: {fileID: 8600000, guid: 4ddd9ec3c4599e14c8050a554582bc3e, type: 2} + targetMaterialRenderer: {fileID: 0} + targetMaterialProperty: _EmissionMap + aspectRatio: 3 + targetAudioSources: + - {fileID: 2018849108} + maximumResolution: 360 --- !u!1 &1763164383 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3042364557672022809, guid: 126991d511ca61841a0ef899b6c038a6, @@ -88236,21 +88615,6 @@ PrefabInstance: propertyPath: m_Name value: Video Player Camera Anchor objectReference: {fileID: 0} - - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_LocalScale.x - value: 0.6024095 - objectReference: {fileID: 0} - - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_LocalScale.y - value: 0.60240966 - objectReference: {fileID: 0} - - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_LocalScale.z - value: 0.6024095 - objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x @@ -93296,12 +93660,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b9e171cd9a05f4409116211d956033a, type: 3} ---- !u!23 &2028006813 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: 3b9e171cd9a05f4409116211d956033a, - type: 3} - m_PrefabInstance: {fileID: 2028006812} - m_PrefabAsset: {fileID: 0} --- !u!4 &2028006814 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3b9e171cd9a05f4409116211d956033a, @@ -94620,7 +94978,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2057791822} - - component: {fileID: 2057791821} + - component: {fileID: 2057791823} - component: {fileID: 2057791820} - component: {fileID: 2057791819} m_Layer: 0 @@ -94678,7 +95036,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 2057791819} - _VideoPlayer: {fileID: 2057791821} + _VideoPlayer: {fileID: 2057791823} _BlankScreenMesh: {fileID: 1123331149} _VideoScreenMesh: {fileID: 1123331146} _MapScreenMesh: {fileID: 1123331148} @@ -94690,7 +95048,26 @@ MonoBehaviour: - {fileID: 1562217078} - {fileID: 2053568538} - {fileID: 2103814193} ---- !u!114 &2057791821 +--- !u!4 &2057791822 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057791818} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.60876137, z: 0, w: 0.7933534} + m_LocalPosition: {x: 9.172, y: 0, z: -2.458} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2123702479} + - {fileID: 1123331144} + - {fileID: 1707197902} + - {fileID: 2057732729} + m_Father: {fileID: 2110808113} + m_LocalEulerAnglesHint: {x: 0, y: 75, z: 0} +--- !u!114 &2057791823 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -94715,25 +95092,6 @@ MonoBehaviour: targetAudioSources: - {fileID: 2018849108} maximumResolution: 360 ---- !u!4 &2057791822 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057791818} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0.60876137, z: 0, w: 0.7933534} - m_LocalPosition: {x: 9.172, y: 0, z: -2.458} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2123702479} - - {fileID: 1123331144} - - {fileID: 1707197902} - - {fileID: 2057732729} - m_Father: {fileID: 2110808113} - m_LocalEulerAnglesHint: {x: 0, y: 75, z: 0} --- !u!1 &2058128274 GameObject: m_ObjectHideFlags: 0 @@ -95270,8 +95628,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104.666664, y: -178.62497} - m_SizeDelta: {x: 209.33333, y: 117.749985} + m_AnchoredPosition: {x: 555.4999, y: -44.15625} + m_SizeDelta: {x: 156.99997, y: 88.3125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2071042739 MonoBehaviour: @@ -104993,72 +105351,74 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} + - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} + - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} + - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} + - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} + - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} + - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} - - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -110455,6 +110815,10 @@ MonoBehaviour: ID: 1283 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1582487347} + ID: 1284 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -111155,6 +111519,7 @@ SceneRoots: - {fileID: 358170790} - {fileID: 1193701800} - {fileID: 1947493793} + - {fileID: 1582487349} - {fileID: 1027471609} - {fileID: 1276291775} - {fileID: 1855771788} diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 3c4c932..815e34b 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -161,7 +161,7 @@ public class GameManagerRound1 : GameManagerBase _GameHasBegun = false; - _VideoPlayer.InitialiseLists(_CaseManager.GetMaps(), _CaseManager.GetVideos()); + _VideoPlayer.LoadLists(_CaseManager.GetMaps(), _CaseManager.GetVideos()); _VideoPlayer.SetVideoIndex(_CaseManager.GetIntroVideo()); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index c587190..cb5a44e 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -66,8 +66,6 @@ public class GameManagerRound2 : GameManagerBase _JailChain.Initialise(); _JailPhone.Initialise(); - _JailPlayer.PlayVideo = false; - SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), true); _CameraControllerRound2.InitialiseCameras(); @@ -79,7 +77,6 @@ public class GameManagerRound2 : GameManagerBase public override void DeinitialiseGameMode() { - _JailPlayer.PlayVideo = false; _JailPhone.Activate = false; _JailChain.Show = false; diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 4176ef2..ca90a05 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -96,8 +96,6 @@ public class GameManagerRound3 : GameManagerBase public override void DeinitialiseGameMode() { - _EndingPlayer.PlayVideo = false; - _CameraControllerRound3.DeinitialiseCameras(); base.DeinitialiseGameMode(); diff --git a/Assets/UdonSharp/RandomVideoPlayer.asset b/Assets/UdonSharp/RandomVideoPlayer.asset index cbb48b1..06be148 100644 --- a/Assets/UdonSharp/RandomVideoPlayer.asset +++ b/Assets/UdonSharp/RandomVideoPlayer.asset @@ -50,19 +50,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: VideoPool + Data: _VideoPlayer - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: VideoPool + Data: _VideoPlayer - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDKBase.VRCUrl[], VRCSDKBase + Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3 - Name: Entry: 8 Data: @@ -86,7 +86,13 @@ MonoBehaviour: Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -104,19 +110,157 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: VideoPoolFallback + Data: _VideoIndex - Name: $v Entry: 7 - Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: VideoPoolFallback + Data: _VideoIndex - Name: k__BackingField - Entry: 9 - Data: 3 + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 3 + Data: 7 + - 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: _VideoIsPlaying + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoIsPlaying + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - 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: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 14|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 15|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: VideoPool + - Name: $v + Entry: 7 + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPool + - Name: k__BackingField + Entry: 7 + Data: 17|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl[], VRCSDKBase + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -131,7 +275,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 6|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -152,25 +296,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _VideoPlayer + Data: VideoPoolFallback - Name: $v Entry: 7 - Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _VideoPlayer + Data: VideoPoolFallback - Name: k__BackingField - Entry: 7 - Data: 8|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3 - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 8 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -182,10 +320,10 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -201,138 +339,6 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _VideoIndex - - Name: $v - Entry: 7 - Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _VideoIndex - - Name: k__BackingField - Entry: 7 - Data: 11|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, 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: _VideoIsPlaying - - Name: $v - Entry: 7 - Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _VideoIsPlaying - - Name: k__BackingField - Entry: 7 - Data: 16|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, 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/RandomVideoPlayer.cs b/Assets/UdonSharp/RandomVideoPlayer.cs index aef0e47..6425e01 100644 --- a/Assets/UdonSharp/RandomVideoPlayer.cs +++ b/Assets/UdonSharp/RandomVideoPlayer.cs @@ -9,19 +9,14 @@ using VRC.Udon; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class RandomVideoPlayer : UdonSharpBehaviour { - public VRCUrl[] VideoPool; - public VRCUrl[] VideoPoolFallback; - - private BaseVRCVideoPlayer _VideoPlayer; + [SerializeField] private BaseVRCVideoPlayer _VideoPlayer; [UdonSynced, FieldChangeCallback(nameof(VideoIndex))] private int _VideoIndex = -1; [UdonSynced, FieldChangeCallback(nameof(PlayVideo))] private bool _VideoIsPlaying; + public VRCUrl[] VideoPool; + public VRCUrl[] VideoPoolFallback; - void Start() - { - _VideoPlayer = GetComponent(); - } public void LoadRandomVideo() { 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/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.asset b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.asset index b2c148c..73d0d9a 100644 --- a/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.asset +++ b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 7 + Data: 8 - Name: Entry: 7 Data: @@ -441,6 +441,54 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _PlayingColour + - Name: $v + Entry: 7 + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PlayingColour + - Name: k__BackingField + Entry: 9 + Data: 18 + - Name: k__BackingField + Entry: 9 + Data: 18 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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/Video Load Indicators/VideoLoadIndicator.cs b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.cs index 4911b11..456c616 100644 --- a/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.cs +++ b/Assets/UdonSharp/Video Load Indicators/VideoLoadIndicator.cs @@ -11,7 +11,8 @@ public enum IndicationStatus Idle, Loading, LoadSuccess, - LoadFailure + LoadFailure, + Playing } [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] @@ -26,6 +27,7 @@ public class VideoLoadIndicator : UdonSharpBehaviour private readonly Color _LoadingColour = new Color(0.784313725f, 0.784313725f, 0.0f); private readonly Color _LoadSuccessColour = new Color(0.0f, 0.784313725f, 0.0f); private readonly Color _LoadFailureColour = new Color(0.784313725f, 0.0f, 0.0f); + private readonly Color _PlayingColour = new Color(0.0f, 0.784313725f, 0.784313725f); void Start() @@ -53,6 +55,7 @@ public class VideoLoadIndicator : UdonSharpBehaviour case IndicationStatus.Loading: _IndicatorMesh.material.SetColor("_Color", _LoadingColour); break; case IndicationStatus.LoadSuccess: _IndicatorMesh.material.SetColor("_Color", _LoadSuccessColour); break; case IndicationStatus.LoadFailure: _IndicatorMesh.material.SetColor("_Color", _LoadFailureColour); break; + case IndicationStatus.Playing: _IndicatorMesh.material.SetColor("_Color", _PlayingColour); break; } RequestSerialization(); } diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.meta b/Assets/UdonSharp/Video Players.meta similarity index 100% rename from Assets/UdonSharp/CaseVideoSyncPlayer.meta rename to Assets/UdonSharp/Video Players.meta diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.asset similarity index 100% rename from Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset rename to Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.asset diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset.meta b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.asset.meta similarity index 100% rename from Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset.meta rename to Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.asset.meta diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs similarity index 98% rename from Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs rename to Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs index 06de149..0393523 100644 --- a/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs +++ b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs @@ -119,7 +119,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour base.OnDeserialization(Result); } - public void InitialiseLists(VRCUrl[] Maps, VRCUrl[] Videos) + public void LoadLists(VRCUrl[] Maps, VRCUrl[] Videos) { _CaseMapsList = Maps; _ReloadMapList(); @@ -316,6 +316,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour private void _PlayVideo_Private() { _VideoPlayer.Play(); + SetVideoLoadStatus(IndicationStatus.Playing); } private void _StopVideo_Private() @@ -333,8 +334,10 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour { _PlayVideo_Private(); } - - SetVideoLoadStatus(IndicationStatus.LoadSuccess); + else + { + SetVideoLoadStatus(IndicationStatus.LoadSuccess); + } base.OnVideoReady(); } diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs.meta b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs.meta similarity index 100% rename from Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs.meta rename to Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs.meta diff --git a/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.asset b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.asset new file mode 100644 index 0000000..de4e6bc --- /dev/null +++ b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.asset @@ -0,0 +1,53 @@ +%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: MultiRoundVideoPlayer + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: ce28b2301c190c64a91b539833da012a, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: c4110298af614c34fa508b9180055317, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: -8588864902355323910 + 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: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.asset.meta b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.asset.meta new file mode 100644 index 0000000..b5df1df --- /dev/null +++ b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 94d9f43101845e244b13e23bea9e10a8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs new file mode 100644 index 0000000..0c537c8 --- /dev/null +++ b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs @@ -0,0 +1,88 @@ + +using UdonSharp; +using UnityEngine; +using UnityEngine.Video; +using VRC.SDK3.Components.Video; +using VRC.SDK3.Video.Components.Base; +using VRC.SDKBase; +using VRC.Udon; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class MultiRoundVideoPlayer : UdonSharpBehaviour +{/* + [SerializeField] private BaseVRCVideoPlayer _VideoPlayer; + + public void LoadURL(VRCUrl URL) + { + _VideoPlayer.LoadURL(URL); + SetVideoLoadStatus(IndicationStatus.Loading); + } + + public void Play() + { + _VideoPlayer.Play(); + } + + public void Stop() + { + _VideoPlayer.Stop(); + } + + public bool IsReady() + { + return _VideoPlayer.IsReady; + } + + public bool IsPlaying() + { + return _VideoPlayer.IsPlaying; + } + + public float GetDuration() + { + return _VideoPlayer.GetDuration(); + } + + public float GetTime() + { + return _VideoPlayer.GetTime(); + } + + public override void OnVideoError(VideoError VideoError) + { + switch (VideoError) + { + case VideoError.Unknown: + Debug.LogError("[MultiRoundVideoPlayer] Unknown playback error."); + break; + case VideoError.InvalidURL: + Debug.LogError("[MultiRoundVideoPlayer] Invalid URL."); + break; + case VideoError.AccessDenied: + Debug.LogError("[MultiRoundVideoPlayer] Access denied."); + break; + case VideoError.PlayerError: + Debug.LogError("[MultiRoundVideoPlayer] Error with video player."); + break; + case VideoError.RateLimited: + Debug.LogError("[MultiRoundVideoPlayer] Rate limited. Attempting another reload in 2 seconds..."); + SendCustomEventDelayedSeconds(nameof(LoadURL), 2.1f); + return; + } + + //if (_UseFallback) + //{ + _StopVideo_Private(); + //} + //else + //{ + // Debug.Log("[CaseVideoSyncPlayer] Attempting fallback in 5 seconds..."); + // SendCustomEventDelayedSeconds(nameof(TryLoadFallbackURL), 5.5f); + //} + + SetVideoLoadStatus(IndicationStatus.LoadFailure); + + base.OnVideoError(VideoError); + } +*/} diff --git a/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs.meta b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs.meta new file mode 100644 index 0000000..5213f3f --- /dev/null +++ b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c4110298af614c34fa508b9180055317 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRChatCameraSystem b/Assets/VRChatCameraSystem index 7145f5a..08e09a6 160000 --- a/Assets/VRChatCameraSystem +++ b/Assets/VRChatCameraSystem @@ -1 +1 @@ -Subproject commit 7145f5a5dd1781ea98cd3df9bc96655803c07ccd +Subproject commit 08e09a6a662705d15e770b8bb3186d0513734a4d 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 c20c4be..949c893 100644 --- a/VRC.ClientSim.csproj +++ b/VRC.ClientSim.csproj @@ -1266,14 +1266,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 73b3dff..8908370 100644 --- a/VRC.SDK3.Editor.csproj +++ b/VRC.SDK3.Editor.csproj @@ -1184,14 +1184,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 63027b6..5d4c581 100644 --- a/VRC.SDKBase.Editor.csproj +++ b/VRC.SDKBase.Editor.csproj @@ -1267,14 +1267,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 48720b4..2539812 100644 --- a/VRC.SDKBase.csproj +++ b/VRC.SDKBase.csproj @@ -1186,14 +1186,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 67bf9ec..597e186 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 343c1a1..a0cc0e6 100644 --- a/VRC.Udon.csproj +++ b/VRC.Udon.csproj @@ -1144,14 +1144,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 f3bc28c..4a839ae 100644 --- a/VRWorldToolkit.Editor.csproj +++ b/VRWorldToolkit.Editor.csproj @@ -1147,14 +1147,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 +