diff --git a/Assets/Prefabs/Jail Chain.prefab b/Assets/Prefabs/Jail Chain.prefab index e7fa569..6c00e58 100644 --- a/Assets/Prefabs/Jail Chain.prefab +++ b/Assets/Prefabs/Jail Chain.prefab @@ -398,7 +398,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &6918184314202523600 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 106c611..856ef98 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -4143,7 +4143,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 115578769} - - component: {fileID: 115578772} - component: {fileID: 115578771} - component: {fileID: 115578770} m_Layer: 0 @@ -4218,7 +4217,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 115578770} - _VideoPlayer: {fileID: 115578772} + _VideoPlayer: {fileID: 1582487351} VideoPool: - url: https://witwics.actual.horse/static/crook-in-jail/ContessaInJail.mp4 - url: https://witwics.actual.horse/static/crook-in-jail/DoubleTroubleInJail.mp4 @@ -4241,31 +4240,6 @@ MonoBehaviour: - url: https://filehost.battybovine.com/witwics/crook-in-jail/TopGrungeInJail.mp4 - url: https://filehost.battybovine.com/witwics/crook-in-jail/VicTheSlickInJail.mp4 - url: https://filehost.battybovine.com/witwics/crook-in-jail/WonderRatInJail.mp4 ---- !u!114 &115578772 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115578768} - 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 &116074573 GameObject: m_ObjectHideFlags: 0 @@ -11233,6 +11207,11 @@ MonoBehaviour: - {fileID: 92283836} - {fileID: 1662151577} _CommentUI: {fileID: 1394546108} + _ButtonColourEnabled: {r: 1, g: 1, b: 1, a: 1} + _ButtonColourDisabled: {r: 0.5, g: 0.5, b: 0.5, a: 1} + _ButtonColourLoot: {r: 0, g: 0.78431374, b: 0, a: 1} + _ButtonColourWarrant: {r: 0.78431374, g: 0.78431374, b: 0, a: 1} + _ButtonColourCrook: {r: 0.78431374, g: 0, b: 0, a: 1} --- !u!1 &198611403 GameObject: m_ObjectHideFlags: 0 @@ -17599,7 +17578,7 @@ MonoBehaviour: ExactGrip: {fileID: 0} allowManipulationWhenEquipped: 0 orientation: 0 - AutoHold: 1 + AutoHold: 3 InteractionText: Pick Up UseText: useEventBroadcastType: 0 @@ -17613,7 +17592,7 @@ MonoBehaviour: currentlyHeldBy: {fileID: 0} pickupable: 0 proximity: 0.15 - version: 0 + version: 1 --- !u!54 &379391075 Rigidbody: m_ObjectHideFlags: 0 @@ -44096,6 +44075,7 @@ MonoBehaviour: _Round1Manager: {fileID: 515404446} _Round2Manager: {fileID: 865296978} _Round3Manager: {fileID: 969831474} + _MultiRoundVideoPlayer: {fileID: 1582487351} _HostCard: {fileID: 379391087} _CaseManagerList: {fileID: 1145254423} _HostTeleportButton: {fileID: 600640153} @@ -76807,12 +76787,12 @@ GameObject: - component: {fileID: 1582487351} - component: {fileID: 1582487350} m_Layer: 0 - m_Name: Video Player + m_Name: Multi-Round Video Player m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1582487348 MonoBehaviour: m_ObjectHideFlags: 0 @@ -76901,6 +76881,11 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1582487350} + _VideoPlayer: {fileID: 1582487348} + _RoundCallbacks: + - {fileID: 2057791820} + - {fileID: 115578771} + - {fileID: 1762618935} --- !u!1 &1583513122 GameObject: m_ObjectHideFlags: 0 @@ -83530,7 +83515,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1762618933} - - component: {fileID: 1762618937} - component: {fileID: 1762618935} - component: {fileID: 1762618936} m_Layer: 0 @@ -83579,7 +83563,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1762618936} - _VideoPlayer: {fileID: 1762618937} + _VideoPlayer: {fileID: 1582487351} VideoPool: - url: https://witwics.actual.horse/static/endings/EndCredits2.mp4 VideoPoolFallback: @@ -83610,31 +83594,6 @@ 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, @@ -94978,7 +94937,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2057791822} - - component: {fileID: 2057791823} - component: {fileID: 2057791820} - component: {fileID: 2057791819} m_Layer: 0 @@ -95036,7 +94994,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 2057791819} - _VideoPlayer: {fileID: 2057791823} + _VideoPlayer: {fileID: 1582487351} _BlankScreenMesh: {fileID: 1123331149} _VideoScreenMesh: {fileID: 1123331146} _MapScreenMesh: {fileID: 1123331148} @@ -95067,31 +95025,6 @@ Transform: - {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} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057791818} - 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 &2058128274 GameObject: m_ObjectHideFlags: 0 @@ -105351,74 +105284,76 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, 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: 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: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, 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: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} + - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} + - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, 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: 462153a63867ae44596b4d0413a039bc, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, 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: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -110951,7 +110886,7 @@ PrefabInstance: - target: {fileID: 4279963186528276829, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: sleepFlag - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4279963186528276829, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} @@ -111266,7 +111201,7 @@ PrefabInstance: - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.size - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} @@ -111287,22 +111222,22 @@ PrefabInstance: type: 3} propertyPath: _HostEventListeners.Array.data[2] value: - objectReference: {fileID: 379391084} + objectReference: {fileID: 198611405} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[3] value: - objectReference: {fileID: 198611405} + objectReference: {fileID: 2057732731} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[4] value: - objectReference: {fileID: 2057732731} + objectReference: {fileID: 1737232025} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[5] value: - objectReference: {fileID: 1737232025} + objectReference: {fileID: 1264786911} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[6] diff --git a/Assets/UdonSharp/Game Managers/CaseManager.asset b/Assets/UdonSharp/Game Managers/CaseManager.asset index e05ddbc..b7115f8 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.asset +++ b/Assets/UdonSharp/Game Managers/CaseManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 24 + Data: 25 - Name: Entry: 7 Data: @@ -383,19 +383,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _HostCard + Data: _MultiRoundVideoPlayer - Name: $v Entry: 7 Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostCard + Data: _MultiRoundVideoPlayer - Name: k__BackingField Entry: 7 Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: HostCardManager, Assembly-CSharp + Data: MultiRoundVideoPlayer, Assembly-CSharp - Name: Entry: 8 Data: @@ -452,19 +452,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseManagerList + Data: _HostCard - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseManagerList + Data: _HostCard - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CaseManagerListView, Assembly-CSharp + Data: HostCardManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -488,19 +488,10 @@ MonoBehaviour: Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 34|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 34|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -521,25 +512,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _HostTeleportButton + Data: _CaseManagerList - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostTeleportButton + Data: _CaseManagerList - Name: k__BackingField Entry: 7 - Data: 37|System.RuntimeType, mscorlib + Data: 36|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.UI.Button, UnityEngine.UI + Data: CaseManagerListView, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 37 + Data: 9 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -554,10 +545,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 38|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -581,16 +581,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LiveIndicator + Data: _HostTeleportButton - Name: $v Entry: 7 Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LiveIndicator + Data: _HostTeleportButton - Name: k__BackingField Entry: 7 Data: 41|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.UI.Button, UnityEngine.UI + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 41 + - 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: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 43|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _LiveIndicator + - Name: $v + Entry: 7 + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LiveIndicator + - Name: k__BackingField + Entry: 7 + Data: 45|System.RuntimeType, mscorlib - Name: Entry: 1 Data: LiveIndicator, Assembly-CSharp @@ -614,13 +674,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 43|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 47|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -629,7 +689,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 44|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 48|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -653,13 +713,13 @@ MonoBehaviour: Data: _CaseFileCluesURL - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileCluesURL - Name: k__BackingField Entry: 7 - Data: 46|System.RuntimeType, mscorlib + Data: 50|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCUrl, VRCSDKBase @@ -668,7 +728,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 46 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -683,13 +743,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 48|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 52|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -713,76 +773,16 @@ MonoBehaviour: Data: _CaseFileLootImage - Name: $v Entry: 7 - Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileLootImage - Name: k__BackingField Entry: 9 - Data: 46 + Data: 50 - Name: k__BackingField Entry: 9 - Data: 46 - - 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: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 51|UdonSharp.UdonSyncedAttribute, 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: _CaseFileMaps - - Name: $v - Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CaseFileMaps - - Name: k__BackingField - Entry: 7 - Data: 53|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDKBase.VRCUrl[], VRCSDKBase - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 53 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -824,19 +824,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileVideos + Data: _CaseFileMaps - Name: $v Entry: 7 Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseFileMaps + - Name: k__BackingField + Entry: 7 + Data: 57|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl[], VRCSDKBase + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 57 + - 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: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 59|UdonSharp.UdonSyncedAttribute, 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: _CaseFileVideos + - Name: $v + Entry: 7 + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileVideos - Name: k__BackingField Entry: 9 - Data: 53 + Data: 57 - Name: k__BackingField Entry: 9 - Data: 53 + Data: 57 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -851,13 +911,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 58|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -881,16 +941,16 @@ MonoBehaviour: Data: _CaseFileVideosFallback - Name: $v Entry: 7 - Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileVideosFallback - Name: k__BackingField Entry: 9 - Data: 53 + Data: 57 - Name: k__BackingField Entry: 9 - Data: 53 + Data: 57 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -905,13 +965,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 61|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 65|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -935,76 +995,16 @@ MonoBehaviour: Data: _CaseFileClueImages - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileClueImages - Name: k__BackingField Entry: 9 - Data: 53 + Data: 57 - Name: k__BackingField Entry: 9 - Data: 53 - - 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: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 64|UdonSharp.UdonSyncedAttribute, 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: _CaseTitle - - Name: $v - Entry: 7 - Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CaseTitle - - Name: k__BackingField - Entry: 7 - Data: 66|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 66 + Data: 57 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1046,19 +1046,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseDescription + Data: _CaseTitle - Name: $v Entry: 7 Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseDescription + Data: _CaseTitle - Name: k__BackingField - Entry: 9 - Data: 66 + Entry: 7 + Data: 70|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 66 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1073,13 +1079,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 72|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1100,25 +1106,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseIntroVideo + Data: _CaseDescription - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseIntroVideo + Data: _CaseDescription - Name: k__BackingField - Entry: 7 - Data: 73|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 70 - Name: k__BackingField Entry: 9 - Data: 73 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1160,19 +1160,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseIntroVideoTranscript + Data: _CaseIntroVideo - Name: $v Entry: 7 Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseIntroVideo + - Name: k__BackingField + Entry: 7 + Data: 77|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 77 + - 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: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 79|UdonSharp.UdonSyncedAttribute, 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: _CaseIntroVideoTranscript + - Name: $v + Entry: 7 + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseIntroVideoTranscript - Name: k__BackingField Entry: 9 - Data: 66 + Data: 70 - Name: k__BackingField Entry: 9 - Data: 66 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1187,13 +1247,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 78|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 82|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1217,76 +1277,16 @@ MonoBehaviour: Data: _StolenLoot - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StolenLoot - Name: k__BackingField Entry: 9 - Data: 66 + Data: 70 - Name: k__BackingField Entry: 9 - Data: 66 - - 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: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 81|UdonSharp.UdonSyncedAttribute, 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: _AccusedCrook - - Name: $v - Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AccusedCrook - - Name: k__BackingField - Entry: 7 - Data: 83|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: AccusedCrook, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 73 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1328,25 +1328,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FinalRoundContinent + Data: _AccusedCrook - Name: $v Entry: 7 Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FinalRoundContinent + Data: _AccusedCrook - Name: k__BackingField Entry: 7 Data: 87|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: ContinentMap, Assembly-CSharp + Data: AccusedCrook, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 73 + Data: 77 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1388,25 +1388,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentWinningPlayers + Data: _FinalRoundContinent - Name: $v Entry: 7 Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentWinningPlayers + Data: _FinalRoundContinent - Name: k__BackingField Entry: 7 Data: 91|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.String[], mscorlib + Data: ContinentMap, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 91 + Data: 77 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1448,16 +1448,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileDictionary + Data: _CurrentWinningPlayers - Name: $v Entry: 7 Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileDictionary + Data: _CurrentWinningPlayers - Name: k__BackingField Entry: 7 Data: 95|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 95 + - 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: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 97|UdonSharp.UdonSyncedAttribute, 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: _CaseFileDictionary + - Name: $v + Entry: 7 + Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseFileDictionary + - Name: k__BackingField + Entry: 7 + Data: 99|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -1466,7 +1526,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 95 + Data: 99 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1481,7 +1541,8 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 0d1dcd0..d9802b4 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -37,6 +37,7 @@ public class CaseManager : UdonSharpBehaviour [SerializeField] private GameManagerRound2 _Round2Manager; [SerializeField] private GameManagerRound3 _Round3Manager; [Space] + [SerializeField] private MultiRoundVideoPlayer _MultiRoundVideoPlayer; [SerializeField] private HostCardManager _HostCard; [Space] [SerializeField] private CaseManagerListView _CaseManagerList; @@ -218,6 +219,8 @@ public class CaseManager : UdonSharpBehaviour public void ContinueToRound1() { + _MultiRoundVideoPlayer.SetCurrentRound(VideoPlayerRound.Round1); + _Round2Manager.DeinitialiseGameMode(); _Round3Manager.DeinitialiseGameMode(); _HostCard.SetGameManager(_Round1Manager); @@ -228,6 +231,8 @@ public class CaseManager : UdonSharpBehaviour public void ContinueToRound2() { + _MultiRoundVideoPlayer.SetCurrentRound(VideoPlayerRound.Round2); + _Round1Manager.DeinitialiseGameMode(); _Round3Manager.DeinitialiseGameMode(); _HostCard.SetGameManager(_Round2Manager); @@ -238,6 +243,8 @@ public class CaseManager : UdonSharpBehaviour public void ContinueToRound3() { + _MultiRoundVideoPlayer.SetCurrentRound(VideoPlayerRound.Round3); + _Round1Manager.DeinitialiseGameMode(); _Round2Manager.DeinitialiseGameMode(); _HostCard.SetGameManager(_Round3Manager); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index cb5a44e..c24ec1d 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -194,6 +194,9 @@ public class GameManagerRound2 : GameManagerBase HostCardRecoverTheLootInterface RecoverTheLootInterface = (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); RecoverTheLootInterface.SetComment(_Players[_CurrentPlayerCounter % _Players.Length] + ", you're up first.", COLOR_STANDARD); + RecoverTheLootInterface.SetLootButton(_LocationBoard.LootLocation); + RecoverTheLootInterface.SetWarrantButton(_LocationBoard.WarrantLocation); + RecoverTheLootInterface.SetCrookButton(_LocationBoard.CrookLocation); RecoverTheLootInterface.EnableAllPanelButtons(true); for (int i = 0; i < _Landmarks.Length; i++) diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.asset b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.asset index 5c254c5..63ad8b5 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.asset +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 9 + Data: 13 - Name: Entry: 7 Data: @@ -320,19 +320,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ButtonColours + Data: _ButtonColourEnabled - Name: $v Entry: 7 Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ButtonColours + Data: _ButtonColourEnabled - Name: k__BackingField Entry: 7 Data: 18|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Color[], UnityEngine.CoreModule + Data: UnityEngine.Color, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -350,13 +350,22 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 20|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -374,25 +383,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ButtonColourEnabled + Data: _ButtonColourDisabled - Name: $v Entry: 7 - Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ButtonColourEnabled + Data: _ButtonColourDisabled - Name: k__BackingField - Entry: 7 - Data: 21|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 18 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 18 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -404,7 +407,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -428,19 +431,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ButtonColourDisabled + Data: _ButtonColourLoot - Name: $v Entry: 7 Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ButtonColourDisabled + Data: _ButtonColourLoot - Name: k__BackingField Entry: 9 - Data: 21 + Data: 18 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 18 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -452,10 +455,67 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 25|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - 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: _ButtonColourWarrant + - Name: $v + Entry: 7 + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ButtonColourWarrant + - 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -476,19 +536,73 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ButtonColourAlreadyChosen + Data: _ButtonColourCrook - Name: $v Entry: 7 - Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ButtonColourAlreadyChosen + Data: _ButtonColourCrook - Name: k__BackingField Entry: 9 - Data: 21 + Data: 18 - Name: k__BackingField Entry: 9 - Data: 21 + 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 29|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: 7 + Data: + - Name: $k + Entry: 1 + Data: _LootButton + - Name: $v + Entry: 7 + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LootButton + - Name: k__BackingField + Entry: 7 + Data: 31|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 31 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -503,7 +617,103 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 32|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: 7 + Data: + - Name: $k + Entry: 1 + Data: _WarrantButton + - Name: $v + Entry: 7 + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _WarrantButton + - Name: k__BackingField + Entry: 9 + Data: 31 + - Name: k__BackingField + Entry: 9 + Data: 31 + - 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: 34|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: 7 + Data: + - Name: $k + Entry: 1 + Data: _CrookButton + - Name: $v + Entry: 7 + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookButton + - Name: k__BackingField + Entry: 9 + Data: 31 + - Name: k__BackingField + Entry: 9 + Data: 31 + - 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: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.cs b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.cs index 98f8ff6..b4ca596 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.cs +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.cs @@ -11,12 +11,17 @@ using VRC.Udon; public class HostCardRecoverTheLootInterface : HostCardInterfaceBase { [SerializeField] private TextMeshProUGUI _CommentUI; + [Space] + public Color _ButtonColourEnabled = Color.white; + public Color _ButtonColourDisabled = Color.gray; + [Space] + public Color _ButtonColourLoot = new Color(0.0f, 1.0f, 1.0f); + public Color _ButtonColourWarrant = new Color(1.0f, 1.0f, 0.0f); + public Color _ButtonColourCrook = new Color(0.0f, 1.0f, 0.0f); - private Color[] _ButtonColours; - - private Color _ButtonColourEnabled = Color.white; - private Color _ButtonColourDisabled = Color.gray; - private Color _ButtonColourAlreadyChosen = Color.yellow; + private int _LootButton = -1; + private int _WarrantButton = -1; + private int _CrookButton = -1; public void SetComment(string Comment, Color CommentColour) @@ -43,5 +48,25 @@ public class HostCardRecoverTheLootInterface : HostCardInterfaceBase ChoiceButtons[i].enabled = Enable; ChoiceButtonImages[i].color = Enable ? _ButtonColourEnabled : _ButtonColourDisabled; } + + if (_LootButton >= 0) ChoiceButtonImages[_LootButton].color = _ButtonColourLoot; + if (_WarrantButton >= 0) ChoiceButtonImages[_WarrantButton].color = _ButtonColourWarrant; + if (_CrookButton >= 0) ChoiceButtonImages[_CrookButton].color = _ButtonColourCrook; + } + + + public void SetLootButton(int Index) + { + _LootButton = (Index - 1) % ChoiceButtons.Length; + } + + public void SetWarrantButton(int Index) + { + _WarrantButton = (Index - 1) % ChoiceButtons.Length; + } + + public void SetCrookButton(int Index) + { + _CrookButton = (Index - 1) % ChoiceButtons.Length; } } diff --git a/Assets/UdonSharp/JailChain.cs b/Assets/UdonSharp/JailChain.cs index e46f81c..4939c75 100644 --- a/Assets/UdonSharp/JailChain.cs +++ b/Assets/UdonSharp/JailChain.cs @@ -82,6 +82,8 @@ public class JailChain : UdonSharpBehaviour { set { + Debug.Log("[JailChain] " + (value ? "Showing" : "Hiding") + " jail chain..."); + _Show = value; _JailChainAnimator.SetBool("Show", _Show); RequestSerialization(); diff --git a/Assets/UdonSharp/RandomVideoPlayer.asset b/Assets/UdonSharp/RandomVideoPlayer.asset index 06be148..ccdf3eb 100644 --- a/Assets/UdonSharp/RandomVideoPlayer.asset +++ b/Assets/UdonSharp/RandomVideoPlayer.asset @@ -62,13 +62,19 @@ MonoBehaviour: Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3 + Data: MultiRoundVideoPlayer, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 9 - Data: 3 + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -83,13 +89,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -113,13 +119,13 @@ MonoBehaviour: Data: _VideoIndex - Name: $v Entry: 7 - Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoIndex - Name: k__BackingField Entry: 7 - Data: 7|System.RuntimeType, mscorlib + Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -128,7 +134,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -143,19 +149,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 9|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 10|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 10|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 11|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -179,13 +185,13 @@ MonoBehaviour: Data: _VideoIsPlaying - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoIsPlaying - Name: k__BackingField Entry: 7 - Data: 12|System.RuntimeType, mscorlib + Data: 13|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -194,7 +200,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 12 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -209,19 +215,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 14|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 15|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 15|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 16|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -245,13 +251,13 @@ MonoBehaviour: Data: VideoPool - Name: $v Entry: 7 - Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: VideoPool - Name: k__BackingField Entry: 7 - Data: 17|System.RuntimeType, mscorlib + Data: 18|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCUrl[], VRCSDKBase @@ -260,7 +266,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 17 + Data: 18 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -275,7 +281,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -299,16 +305,16 @@ MonoBehaviour: Data: VideoPoolFallback - Name: $v Entry: 7 - Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: VideoPoolFallback - Name: k__BackingField Entry: 9 - Data: 17 + Data: 18 - Name: k__BackingField Entry: 9 - Data: 17 + Data: 18 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -323,7 +329,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/RandomVideoPlayer.cs b/Assets/UdonSharp/RandomVideoPlayer.cs index 6425e01..8e18b42 100644 --- a/Assets/UdonSharp/RandomVideoPlayer.cs +++ b/Assets/UdonSharp/RandomVideoPlayer.cs @@ -9,7 +9,7 @@ using VRC.Udon; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class RandomVideoPlayer : UdonSharpBehaviour { - [SerializeField] private BaseVRCVideoPlayer _VideoPlayer; + [SerializeField] private MultiRoundVideoPlayer _VideoPlayer; [UdonSynced, FieldChangeCallback(nameof(VideoIndex))] private int _VideoIndex = -1; [UdonSynced, FieldChangeCallback(nameof(PlayVideo))] private bool _VideoIsPlaying; @@ -42,11 +42,10 @@ public class RandomVideoPlayer : UdonSharpBehaviour _VideoPlayer.Stop(); } - public override void OnVideoEnd() + public void VideoEnded() { transform.position = new Vector3(transform.position.x, -1000.0f, transform.position.z); PlayVideo = false; - base.OnVideoEnd(); } diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 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: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 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: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 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: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 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: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 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: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 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: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 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: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.asset b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.asset index 6894309..57292a5 100644 --- a/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.asset +++ b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.asset @@ -62,13 +62,19 @@ MonoBehaviour: Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3 + Data: MultiRoundVideoPlayer, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 9 - Data: 3 + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -83,13 +89,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -113,13 +119,13 @@ MonoBehaviour: Data: _BlankScreenMesh - Name: $v Entry: 7 - Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BlankScreenMesh - Name: k__BackingField Entry: 7 - Data: 7|System.RuntimeType, mscorlib + Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule @@ -128,7 +134,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -143,13 +149,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 9|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 10|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Meshes @@ -158,7 +164,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 11|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -182,16 +188,16 @@ MonoBehaviour: Data: _VideoScreenMesh - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoScreenMesh - Name: k__BackingField Entry: 9 - Data: 7 + Data: 8 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -206,13 +212,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 13|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -236,16 +242,16 @@ MonoBehaviour: Data: _MapScreenMesh - Name: $v Entry: 7 - Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MapScreenMesh - Name: k__BackingField Entry: 9 - Data: 7 + Data: 8 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -260,13 +266,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 16|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -290,13 +296,13 @@ MonoBehaviour: Data: _MapScreenMaterial - Name: $v Entry: 7 - Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MapScreenMaterial - Name: k__BackingField Entry: 7 - Data: 18|System.RuntimeType, mscorlib + Data: 19|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Material, UnityEngine.CoreModule @@ -305,7 +311,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 18 + Data: 19 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -320,13 +326,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 20|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 21|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Materials @@ -335,7 +341,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 22|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -359,13 +365,13 @@ MonoBehaviour: Data: _PlaceholderMapTexture - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlaceholderMapTexture - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 24|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Texture2D, UnityEngine.CoreModule @@ -374,7 +380,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 23 + Data: 24 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -389,13 +395,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 26|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -419,13 +425,13 @@ MonoBehaviour: Data: _VideoLoadIndicators - Name: $v Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoLoadIndicators - Name: k__BackingField Entry: 7 - Data: 27|System.RuntimeType, mscorlib + Data: 28|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VideoLoadIndicator[], Assembly-CSharp @@ -434,7 +440,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 28|System.RuntimeType, mscorlib + Data: 29|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -455,13 +461,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 30|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 31|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Video Status @@ -470,7 +476,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 31|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 32|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -494,13 +500,13 @@ MonoBehaviour: Data: _SubMapIndex - Name: $v Entry: 7 - Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _SubMapIndex - Name: k__BackingField Entry: 7 - Data: 33|System.RuntimeType, mscorlib + Data: 34|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -509,7 +515,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -524,19 +530,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 35|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 36|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 36|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 37|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -560,13 +566,13 @@ MonoBehaviour: Data: _ShowScreen - Name: $v Entry: 7 - Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ShowScreen - Name: k__BackingField Entry: 7 - Data: 38|System.RuntimeType, mscorlib + Data: 39|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ClueScreenType, Assembly-CSharp @@ -575,7 +581,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -590,19 +596,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 40|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 41|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 41|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 42|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -626,13 +632,13 @@ MonoBehaviour: Data: _FlashCorrectAnswer - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FlashCorrectAnswer - Name: k__BackingField Entry: 7 - Data: 43|System.RuntimeType, mscorlib + Data: 44|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -641,7 +647,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 43 + Data: 44 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -656,19 +662,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 45|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 46|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 46|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 47|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -692,16 +698,16 @@ MonoBehaviour: Data: _VideoIndex - Name: $v Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoIndex - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -716,13 +722,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 49|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -746,16 +752,16 @@ MonoBehaviour: Data: _OldVideoIndex - Name: $v Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _OldVideoIndex - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -770,7 +776,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -794,16 +800,16 @@ MonoBehaviour: Data: _VideoIsPlaying - Name: $v Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoIsPlaying - Name: k__BackingField Entry: 9 - Data: 43 + Data: 44 - Name: k__BackingField Entry: 9 - Data: 43 + Data: 44 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -818,19 +824,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 54|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 55|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 55|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 56|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -854,13 +860,13 @@ MonoBehaviour: Data: _CaseMapsList - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseMapsList - Name: k__BackingField Entry: 7 - Data: 57|System.RuntimeType, mscorlib + Data: 58|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCUrl[], VRCSDKBase @@ -869,7 +875,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 57 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -884,13 +890,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 60|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -914,16 +920,16 @@ MonoBehaviour: Data: _CaseMapsListCache - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseMapsListCache - Name: k__BackingField Entry: 9 - Data: 57 + Data: 58 - Name: k__BackingField Entry: 9 - Data: 57 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -938,7 +944,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -962,13 +968,13 @@ MonoBehaviour: Data: _CachedMapIndices - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CachedMapIndices - Name: k__BackingField Entry: 7 - Data: 63|System.RuntimeType, mscorlib + Data: 64|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32[], mscorlib @@ -977,7 +983,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 63 + Data: 64 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -992,13 +998,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 65|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 66|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1022,16 +1028,16 @@ MonoBehaviour: Data: _LoadedMaps - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LoadedMaps - Name: k__BackingField Entry: 9 - Data: 63 + Data: 64 - Name: k__BackingField Entry: 9 - Data: 63 + Data: 64 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1046,7 +1052,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1070,16 +1076,16 @@ MonoBehaviour: Data: _CaseVideoList - Name: $v Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseVideoList - Name: k__BackingField Entry: 9 - Data: 57 + Data: 58 - Name: k__BackingField Entry: 9 - Data: 57 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1094,13 +1100,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 70|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1124,16 +1130,16 @@ MonoBehaviour: Data: _CaseVideoListCache - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseVideoListCache - Name: k__BackingField Entry: 9 - Data: 57 + Data: 58 - Name: k__BackingField Entry: 9 - Data: 57 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1148,7 +1154,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1172,13 +1178,13 @@ MonoBehaviour: Data: _MapDownloader - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MapDownloader - Name: k__BackingField Entry: 7 - Data: 74|System.RuntimeType, mscorlib + Data: 75|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Image.VRCImageDownloader, VRCSDK3 @@ -1187,7 +1193,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 74 + Data: 75 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1202,7 +1208,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1226,13 +1232,13 @@ MonoBehaviour: Data: _MapImages - Name: $v Entry: 7 - Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MapImages - Name: k__BackingField Entry: 7 - Data: 77|System.RuntimeType, mscorlib + Data: 78|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Texture2D[], UnityEngine.CoreModule @@ -1241,7 +1247,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 77 + Data: 78 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1256,7 +1262,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1280,13 +1286,13 @@ MonoBehaviour: Data: _UdonEventReceiverThis - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _UdonEventReceiverThis - Name: k__BackingField Entry: 7 - Data: 80|System.RuntimeType, mscorlib + Data: 81|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.Udon.Common.Interfaces.IUdonEventReceiver, VRC.Udon.Common @@ -1295,7 +1301,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 80 + Data: 81 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1310,7 +1316,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1334,16 +1340,16 @@ MonoBehaviour: Data: _MapDownloadIndex - Name: $v Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MapDownloadIndex - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 9 - Data: 33 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1358,7 +1364,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1382,16 +1388,16 @@ MonoBehaviour: Data: _MapDownloadsInProgress - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MapDownloadsInProgress - Name: k__BackingField Entry: 9 - Data: 43 + Data: 44 - Name: k__BackingField Entry: 9 - Data: 43 + Data: 44 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1406,7 +1412,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs index 0393523..bb1b759 100644 --- a/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs +++ b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs @@ -21,7 +21,7 @@ public enum ClueScreenType [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class CaseVideoSyncPlayer : UdonSharpBehaviour { - [SerializeField] private BaseVRCVideoPlayer _VideoPlayer; + [SerializeField] private MultiRoundVideoPlayer _VideoPlayer; [Header("Meshes")] [SerializeField] private MeshRenderer _BlankScreenMesh; @@ -81,6 +81,12 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour _MapDownloader.Dispose(); } + public override void OnOwnershipTransferred(VRCPlayerApi Player) + { + Networking.SetOwner(Player, _VideoPlayer.gameObject); + base.OnOwnershipTransferred(Player); + } + public override void OnDeserialization(DeserializationResult Result) { { // Map syncing and redownloading @@ -328,7 +334,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour SetVideoLoadStatus(IndicationStatus.Idle); } - public override void OnVideoReady() + public void VideoIsReady() { if (_VideoIsPlaying) { @@ -338,13 +344,11 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour { SetVideoLoadStatus(IndicationStatus.LoadSuccess); } - - base.OnVideoReady(); } - public override void OnVideoError(VideoError VideoError) + public void VideoError() { - switch(VideoError) + /*switch(VideoError) { case VideoError.Unknown: Debug.LogError("[CaseVideoSyncPlayer] Unknown playback error."); @@ -372,11 +376,9 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour //{ // Debug.Log("[CaseVideoSyncPlayer] Attempting fallback in 5 seconds..."); // SendCustomEventDelayedSeconds(nameof(TryLoadFallbackURL), 5.5f); - //} + //}*/ SetVideoLoadStatus(IndicationStatus.LoadFailure); - - base.OnVideoError(VideoError); } //public void TryLoadFallbackURL() //{ @@ -395,7 +397,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour } } - public override void OnVideoStart() + public void VideoStarted() { if (_VideoIsPlaying) { @@ -405,20 +407,16 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour { _VideoPlayer.Stop(); } - - base.OnVideoStart(); } - public override void OnVideoEnd() + public void VideoEnded() { _SwapToScreen(ClueScreenType.Blank, false); - - base.OnVideoEnd(); } public float GetVideoDuration() { - if (_VideoPlayer.IsReady || _VideoPlayer.IsPlaying) + if (_VideoPlayer.IsReady() || _VideoPlayer.IsPlaying()) { return _VideoPlayer.GetDuration(); } @@ -427,7 +425,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour public float GetVideoTime() { - if (_VideoPlayer.IsPlaying) + if (_VideoPlayer.IsPlaying()) { return _VideoPlayer.GetTime(); } diff --git a/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.asset b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.asset index de4e6bc..4da2ccf 100644 --- a/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.asset +++ b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.asset @@ -44,7 +44,205 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 0 + Data: 3 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _VideoPlayer + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoPlayer + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3 + - 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: 7 + Data: + - Name: $k + Entry: 1 + Data: _RoundCallbacks + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _RoundCallbacks + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UdonSharp.UdonSharpBehaviour[], UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - 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: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CurrentRound + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CurrentRound + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VideoPlayerRound, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 13|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - 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: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 15|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 16|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/Video Players/MultiRoundVideoPlayer.cs b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs index 0c537c8..3c26f3d 100644 --- a/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs +++ b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs @@ -1,22 +1,47 @@  using UdonSharp; using UnityEngine; -using UnityEngine.Video; using VRC.SDK3.Components.Video; using VRC.SDK3.Video.Components.Base; using VRC.SDKBase; -using VRC.Udon; + + +public enum VideoPlayerRound +{ + INVALID_ROUND, + + Round1, + Round2, + Round3, + + MAX_ROUNDS +} [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class MultiRoundVideoPlayer : UdonSharpBehaviour -{/* +{ [SerializeField] private BaseVRCVideoPlayer _VideoPlayer; + [SerializeField] private UdonSharpBehaviour[] _RoundCallbacks; + + [UdonSynced, FieldChangeCallback(nameof(CurrentRound))] private VideoPlayerRound _CurrentRound = VideoPlayerRound.INVALID_ROUND; + + + public void SetCurrentRound(VideoPlayerRound Round) + { + if (Round > VideoPlayerRound.INVALID_ROUND && Round < VideoPlayerRound.MAX_ROUNDS) + { + _CurrentRound = Round; + Stop(); + } + RequestSerialization(); + } + + public void LoadURL(VRCUrl URL) { _VideoPlayer.LoadURL(URL); - SetVideoLoadStatus(IndicationStatus.Loading); } public void Play() @@ -49,6 +74,31 @@ public class MultiRoundVideoPlayer : UdonSharpBehaviour return _VideoPlayer.GetTime(); } + + public override void OnVideoReady() + { + foreach (UdonSharpBehaviour Object in _RoundCallbacks) + { + _ExecuteCurrentRoundCallback_Private("VideoIsReady"); + } + + base.OnVideoReady(); + } + + public override void OnVideoStart() + { + _ExecuteCurrentRoundCallback_Private("VideoStarted"); + + base.OnVideoStart(); + } + + public override void OnVideoEnd() + { + _ExecuteCurrentRoundCallback_Private("VideoEnded"); + + base.OnVideoEnd(); + } + public override void OnVideoError(VideoError VideoError) { switch (VideoError) @@ -71,18 +121,30 @@ public class MultiRoundVideoPlayer : UdonSharpBehaviour return; } - //if (_UseFallback) - //{ - _StopVideo_Private(); - //} - //else - //{ - // Debug.Log("[CaseVideoSyncPlayer] Attempting fallback in 5 seconds..."); - // SendCustomEventDelayedSeconds(nameof(TryLoadFallbackURL), 5.5f); - //} + Stop(); - SetVideoLoadStatus(IndicationStatus.LoadFailure); + _ExecuteCurrentRoundCallback_Private("VideoError"); base.OnVideoError(VideoError); } -*/} + + + private void _ExecuteCurrentRoundCallback_Private(string Event) + { + if (_CurrentRound > VideoPlayerRound.INVALID_ROUND && _CurrentRound < VideoPlayerRound.MAX_ROUNDS) + { + _RoundCallbacks[(int)_CurrentRound - 1].SendCustomEvent(Event); + } + } + + + public VideoPlayerRound CurrentRound + { + set + { + _CurrentRound = value; + Stop(); + } + get => _CurrentRound; + } +} diff --git a/Assets/VRChatCameraSystem b/Assets/VRChatCameraSystem index 08e09a6..b055824 160000 --- a/Assets/VRChatCameraSystem +++ b/Assets/VRChatCameraSystem @@ -1 +1 @@ -Subproject commit 08e09a6a662705d15e770b8bb3186d0513734a4d +Subproject commit b055824802284bd188000c5e88bcff7e2d0a8783 diff --git a/UdonSharp.Editor.csproj b/UdonSharp.Editor.csproj index 3ce1418..96c8e41 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Lib.csproj b/UdonSharp.Lib.csproj index 8def6c3..de30fa2 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UdonSharp.Runtime.csproj b/UdonSharp.Runtime.csproj index 95b4222..404efcf 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.Addressables.csproj b/UniTask.Addressables.csproj index 9aa8103..ea8c8d3 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.DOTween.csproj b/UniTask.DOTween.csproj index d48f31c..7a59b69 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.Editor.csproj b/UniTask.Editor.csproj index 71a3f7f..d3bccb9 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UniTask.Linq.csproj b/UniTask.Linq.csproj index 70a2010..2d5a27b 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.TextMeshPro.csproj b/UniTask.TextMeshPro.csproj index 51bed4e..b8ba197 100644 --- a/UniTask.TextMeshPro.csproj +++ b/UniTask.TextMeshPro.csproj @@ -1123,14 +1123,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.csproj b/UniTask.csproj index 21f0a84..1bdff38 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UnityEditorTests.csproj b/UnityEditorTests.csproj index b9085b2..7b09a12 100644 --- a/UnityEditorTests.csproj +++ b/UnityEditorTests.csproj @@ -990,14 +990,14 @@ Library\ScriptAssemblies\UnityEditor.TestRunner.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.ClientSim.Editor.csproj b/VRC.ClientSim.Editor.csproj index 2577234..322f28d 100644 --- a/VRC.ClientSim.Editor.csproj +++ b/VRC.ClientSim.Editor.csproj @@ -1159,14 +1159,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.ClientSim.csproj b/VRC.ClientSim.csproj index 949c893..c20c4be 100644 --- a/VRC.ClientSim.csproj +++ b/VRC.ClientSim.csproj @@ -1266,14 +1266,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.ExampleCentral.Editor.csproj b/VRC.ExampleCentral.Editor.csproj index b01e5a7..cee0d79 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.Editor.csproj b/VRC.SDK3.Editor.csproj index 8908370..73b3dff 100644 --- a/VRC.SDK3.Editor.csproj +++ b/VRC.SDK3.Editor.csproj @@ -1184,14 +1184,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.csproj b/VRC.SDK3.csproj index 36b455c..83e2836 100644 --- a/VRC.SDK3.csproj +++ b/VRC.SDK3.csproj @@ -1149,14 +1149,14 @@ Library\ScriptAssemblies\Cinemachine.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.SDKBase.Editor.BuildPipeline.csproj b/VRC.SDKBase.Editor.BuildPipeline.csproj index d0cafb5..60ab3fc 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.SDKBase.Editor.ShaderStripping.csproj b/VRC.SDKBase.Editor.ShaderStripping.csproj index 13677d0..7e57a23 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.Editor.csproj b/VRC.SDKBase.Editor.csproj index 5d4c581..63027b6 100644 --- a/VRC.SDKBase.Editor.csproj +++ b/VRC.SDKBase.Editor.csproj @@ -1267,14 +1267,14 @@ Library\ScriptAssemblies\Unity.XR.Oculus.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.csproj b/VRC.SDKBase.csproj index 2539812..48720b4 100644 --- a/VRC.SDKBase.csproj +++ b/VRC.SDKBase.csproj @@ -1186,14 +1186,14 @@ Library\ScriptAssemblies\Unity.Timeline.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.Udon.Editor.csproj b/VRC.Udon.Editor.csproj index 7ca0cd2..af6c3b2 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.Udon.Serialization.OdinSerializer.csproj b/VRC.Udon.Serialization.OdinSerializer.csproj index 597e186..67bf9ec 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.Udon.csproj b/VRC.Udon.csproj index a0cc0e6..343c1a1 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRWorldToolkit.Editor.csproj b/VRWorldToolkit.Editor.csproj index 4a839ae..f3bc28c 100644 --- a/VRWorldToolkit.Editor.csproj +++ b/VRWorldToolkit.Editor.csproj @@ -1147,14 +1147,14 @@ Library\ScriptAssemblies\Unity.Postprocessing.Runtime.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.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 0ee0bd0..d33831e 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.Editor.csproj b/vrchat.jordo.easyquestswitch.Editor.csproj index b3680ec..f92ad30 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.csproj b/vrchat.jordo.easyquestswitch.csproj index 6175adb..e7c0214 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\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False +