From 2f25e805a945aaf557d9cd050875f077bd059d5d Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Sat, 2 May 2026 04:49:04 -0400 Subject: [PATCH] Microphones have been reworked to be more reliable and sync better. --- Assets/Scenes/witwics.unity | 317 ++++----- .../Scenes/witwics/OcclusionCullingData.asset | 604 ++++++++-------- .../Game Managers/GameManagerBase.asset | 62 +- .../Game Managers/GameManagerBase.cs | 59 +- .../Game Managers/GameManagerRound1.asset | 648 ++++++++++-------- .../Game Managers/GameManagerRound1.cs | 2 - .../Game Managers/GameManagerRound2.asset | 426 +++++++----- .../Game Managers/GameManagerRound2.cs | 2 - .../Game Managers/GameManagerRound3.asset | 647 +++++++++-------- .../Game Managers/GameManagerRound3.cs | 2 - Assets/UdonSharp/Microphone.asset | 72 +- Assets/UdonSharp/Microphone.cs | 86 ++- .../UtilityScripts/BoneFollower.asset | 2 +- .../UtilityScripts/InteractToggle.asset | 2 +- .../UtilityScripts/PlayerModSetter.asset | 2 +- .../Synced/GlobalToggleObject.asset | 2 +- .../Synced/MasterToggleObject.asset | 2 +- .../UtilityScripts/TrackingDataFollower.asset | 2 +- .../UtilityScripts/WorldAudioSettings.asset | 2 +- 19 files changed, 1635 insertions(+), 1306 deletions(-) diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 2e2e3e6..a621afb 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -2335,16 +2335,15 @@ GameObject: - component: {fileID: 51189180} - component: {fileID: 51189183} - component: {fileID: 51189184} - - component: {fileID: 51189185} - component: {fileID: 51189182} - component: {fileID: 51189181} m_Layer: 18 - m_Name: Microphone Area + m_Name: Round 2 Microphone Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &51189180 Transform: m_ObjectHideFlags: 0 @@ -2379,7 +2378,7 @@ MonoBehaviour: SynchronizePosition: 0 AllowCollisionOwnershipTransfer: 0 Reliable: 0 - _syncMethod: 2 + _syncMethod: 3 serializedProgramAsset: {fileID: 11400000, guid: e9311ad20f96a384bbc12e5d57e8acf1, type: 2} programSource: {fileID: 11400000, guid: 7874d8cac34e7544c960f6392673f399, type: 2} @@ -2429,8 +2428,8 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 2.35 - m_Center: {x: 0, y: 0, z: 0} + m_Radius: 3.5098195 + m_Center: {x: -0.6347161, y: 0, z: 0.000000026053831} --- !u!135 &51189184 SphereCollider: m_ObjectHideFlags: 0 @@ -2450,31 +2449,8 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 3.4331448 - m_Center: {x: 0.46841148, y: 0, z: 7.2048817} ---- !u!136 &51189185 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 51189179} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 2.21 - m_Height: 7.15 - m_Direction: 2 - m_Center: {x: -3.18, y: 0, z: 3.18} + m_Radius: 3.1435492 + m_Center: {x: -0.80602753, y: 0, z: 8.397052} --- !u!1 &56104913 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, @@ -19232,7 +19208,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &344488388 Transform: m_ObjectHideFlags: 0 @@ -19267,8 +19243,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 7.259323, y: 42.43669, z: 42.716873} - m_Center: {x: -2.0168934, y: 21.218346, z: 0} + m_Size: {x: 7.5920734, y: 8.989397, z: 42.716873} + m_Center: {x: -1.8505182, y: 4.4946985, z: 0} --- !u!114 &344488390 MonoBehaviour: m_ObjectHideFlags: 2 @@ -19288,7 +19264,7 @@ MonoBehaviour: SynchronizePosition: 0 AllowCollisionOwnershipTransfer: 0 Reliable: 0 - _syncMethod: 2 + _syncMethod: 3 serializedProgramAsset: {fileID: 11400000, guid: e9311ad20f96a384bbc12e5d57e8acf1, type: 2} programSource: {fileID: 11400000, guid: 7874d8cac34e7544c960f6392673f399, type: 2} @@ -23209,12 +23185,12 @@ GameObject: - component: {fileID: 431721603} - component: {fileID: 431721602} m_Layer: 18 - m_Name: Microphone Area + m_Name: Round 1 Microphone Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &431721601 Transform: m_ObjectHideFlags: 0 @@ -23249,7 +23225,7 @@ MonoBehaviour: SynchronizePosition: 0 AllowCollisionOwnershipTransfer: 0 Reliable: 0 - _syncMethod: 2 + _syncMethod: 3 serializedProgramAsset: {fileID: 11400000, guid: e9311ad20f96a384bbc12e5d57e8acf1, type: 2} programSource: {fileID: 11400000, guid: 7874d8cac34e7544c960f6392673f399, type: 2} @@ -23299,8 +23275,8 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 3.3346615 - m_Center: {x: -0.50385773, y: 0, z: 0.61844677} + m_Radius: 2.384252 + m_Center: {x: -0.046692856, y: 0.87, z: 0.04126548} --- !u!135 &431721605 SphereCollider: m_ObjectHideFlags: 0 @@ -23320,8 +23296,8 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1.5665269 - m_Center: {x: 0.7108256, y: 0.9998722, z: 4.868249} + m_Radius: 1.4081349 + m_Center: {x: 0.76201105, y: 0.99987197, z: 4.9754257} --- !u!1 &432147265 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1109820307783882289, guid: be33bc7f6c414e6409becfa348b9310d, @@ -37511,12 +37487,12 @@ GameObject: - component: {fileID: 772205216} - component: {fileID: 772205215} m_Layer: 18 - m_Name: Microphone Area + m_Name: Round 3 Microphone Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &772205214 Transform: m_ObjectHideFlags: 0 @@ -37551,7 +37527,7 @@ MonoBehaviour: SynchronizePosition: 0 AllowCollisionOwnershipTransfer: 0 Reliable: 0 - _syncMethod: 2 + _syncMethod: 3 serializedProgramAsset: {fileID: 11400000, guid: e9311ad20f96a384bbc12e5d57e8acf1, type: 2} programSource: {fileID: 11400000, guid: 7874d8cac34e7544c960f6392673f399, type: 2} @@ -37601,8 +37577,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 11.839521, y: 5, z: 11} - m_Center: {x: 0.18888569, y: 2.5, z: 0} + m_Size: {x: 12.521076, y: 5, z: 11} + m_Center: {x: -0.15189171, y: 2.5, z: 0} --- !u!1 &772889382 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4680653884435436470, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -97558,11 +97534,6 @@ PrefabInstance: propertyPath: m_Name value: Wanted Poster objectReference: {fileID: 0} - - target: {fileID: 860989952984718177, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1247484022146431936, guid: 6bf5a3bce57127941812f36d3213a10a, type: 3} propertyPath: serializationData.Prefab @@ -97582,7 +97553,7 @@ PrefabInstance: - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, type: 3} propertyPath: m_LocalPosition.z - value: 0.012 + value: 0.032 objectReference: {fileID: 0} - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, type: 3} @@ -113444,140 +113415,141 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} - - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} - - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 73a2ec678ab61104d971005336784b32, type: 2} - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} - - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: fc0750ef89ab53149ba2fadc20b2cfd6, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} - - {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} - - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} - - {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2} - - {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2} - - {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2} - - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} + - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} + - {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} + - {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, 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: 73a2ec678ab61104d971005336784b32, type: 2} + - {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, type: 2} - {fileID: 2100000, guid: fe90be54e303efe419a122683668383b, type: 2} - {fileID: 2100000, guid: 03943341e30772e44ba4bbd3d57d75ee, type: 2} + - {fileID: 2100000, guid: fc0750ef89ab53149ba2fadc20b2cfd6, type: 2} - {fileID: 2100000, guid: 52bf82e7bd694ae44b45ce6f356fa6d2, type: 2} - {fileID: 2100000, guid: a60ee32d2ee008a419eafd03826f2584, type: 2} - {fileID: 2100000, guid: 20293e1762c586648a0e8d1efc60b30b, type: 2} - - {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, type: 2} - - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} - - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} - - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} - - {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2} - - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} - - {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} - - {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2} - - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} + - {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2} + - {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2} + - {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2} + - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} + - {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2} + - {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} - - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} - - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} - - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} - - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} - - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - - {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - - {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: bfecf9fce24c1594da25d824b7f3cd0f, type: 2} - - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} - - {fileID: 2100000, guid: 3de15bd11b713c0499f9c2087271ca20, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} + - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} + - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, 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: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} - - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} - - {fileID: 2100000, guid: e906284b99d80584b9ef1772424ae26b, 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: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - {fileID: 2100000, guid: cc50b68eaabf3b84cad9a23b7eab8d9f, type: 2} + - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} + - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} + - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} + - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} + - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} + - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} + - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} + - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} - - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} - - {fileID: 2100000, guid: c1a13522d86649c4fa6009ae3c1df7a1, type: 2} - - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 6471999af7ee3174f97c25370f32166d, type: 2} - - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} - - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} - - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2} - - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} + - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} + - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} + - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} + - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} + - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} + - {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2} + - {fileID: 2100000, guid: c1a13522d86649c4fa6009ae3c1df7a1, type: 2} + - {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, type: 2} + - {fileID: 2100000, guid: 3de15bd11b713c0499f9c2087271ca20, type: 2} + - {fileID: 2100000, guid: bfecf9fce24c1594da25d824b7f3cd0f, type: 2} + - {fileID: 2100000, guid: e906284b99d80584b9ef1772424ae26b, type: 2} + - {fileID: 2100000, guid: 6471999af7ee3174f97c25370f32166d, type: 2} + - {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2} + - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} + - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} + - {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} + - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} + - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} + - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2} + - {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2} + - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -119931,7 +119903,7 @@ PrefabInstance: - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.size - value: 8 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} @@ -119947,36 +119919,51 @@ PrefabInstance: type: 3} propertyPath: _HostEventListeners.Array.data[1] value: - objectReference: {fileID: 272672682} + objectReference: {fileID: 515404445} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[2] value: - objectReference: {fileID: 198611405} + objectReference: {fileID: 865296977} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[3] value: - objectReference: {fileID: 2057732731} + objectReference: {fileID: 969831473} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[4] value: - objectReference: {fileID: 1737232025} + objectReference: {fileID: 272672682} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[5] value: - objectReference: {fileID: 1264786911} + objectReference: {fileID: 198611405} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[6] value: - objectReference: {fileID: 570548974} + objectReference: {fileID: 2057732731} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[7] value: + objectReference: {fileID: 1737232025} + - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, + type: 3} + propertyPath: _HostEventListeners.Array.data[8] + value: + objectReference: {fileID: 1264786911} + - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, + type: 3} + propertyPath: _HostEventListeners.Array.data[9] + value: + objectReference: {fileID: 570548974} + - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, + type: 3} + propertyPath: _HostEventListeners.Array.data[10] + value: objectReference: {fileID: 508235244} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} diff --git a/Assets/Scenes/witwics/OcclusionCullingData.asset b/Assets/Scenes/witwics/OcclusionCullingData.asset index aac804d..c1d0898 100644 --- a/Assets/Scenes/witwics/OcclusionCullingData.asset +++ b/Assets/Scenes/witwics/OcclusionCullingData.asset @@ -7,344 +7,348 @@ OcclusionCullingData: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: OcclusionCullingData - m_PVSData: 120000d631574e0e902000000000204200000000000020c2000020c2000020c20000204200002042000020422000000050010000000000000100000060010000a6000000500200000000000000000000e0110000a8000000a00100004a0000000000000000000000000000000000000000000000000000000000000002000000200200000000000090010000010000000100000001000000700100008001000080140000000000000000000000000000000000000000000000000000542034302e3020534f2031302e3020534820302e32353020424620352046203020435320302e30202d20332e332e3232204620302030204f472030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f0000000000000000000000000100000000000000000000000000000000000040000000000000000000000000000000001200000000000000000000002701856f7dbd9fb902c24028200a818144108ce02144064010080421212c04885031320a8828092681e8968680401052464c9809364227f404a05034aa4456600c940133708ad0401a4a0251c00a17c1440804886011408253280d00e12a300492201020c245301125e12a040483c0104e824008082681200000000000000000000000000000000000000000ffff0000ffffffff0000000000000000ff80ff7d0099ffb100cd00990000000000000000b4c8cac180c295bfb3c2c2414c379d41ac470d41e7d6c241f0f4c8c194c295bf86eb6dc1100b9f41ae470d4184eb6dc1c0f5c8c10600a0bf666676c13a0a9f41f45e6b36cdccc4414e6199bfb484fc3ec12553412e728abf1a0d203fa5035541fc4264c1000028b60ae62bc1941ee23fe514dd3d99e8e83f553d9abf8519e23eac0953417c1f6dbf276e8b3f768057417a34bdc100b851b81859edc03b5563c197ff9f40a4d377c0e62368c0d314dd3dcd383841084bd8bf2d97ef3e673857416a228ec0e414dd3d98eaf0c033901dc05474a3404f075fc0ae1a48c0cd14dd3db9ba23414069d1be2d97ef3e1d364f417b2481c0ba14dd3d6cf297c0b54442c0f085603f9ee06fc03034d0bfb062af3e1c574c41984b2cbea62c294075ac63411f85adc1503e4abf35338fc11f85adc1375c1341cfccd841b4a73dc0a00bdd3d224f6bc0a0cae0bf49c9993f5648c0bfca2f92c191c2753e2a5c8fc074da8cc10ad7233fd6a3b040ca2f92c191c2753ed6a3b04074da8cc10ad7233feb5178417cb8a0c061affb32c66de83f5a54ff40a970dd3d982cd5414adb81c050cedd3df0ac2d4177d24bc0b1a9da3ff7a53b41a26891c0dc14dd3d73bf8241a12f68c0ae47ea3f48228c410cdf5bbfb484fc3efe935841cc003ebf1a0d203fe2715a410b975dbf8519e23ee6775841dc3b16bf276e8b3fb0ee5c416c55323d2c35de3d4d4e5c41b058ab3fd578a340868e6b41f84328bfaaf1d23deb501a41d41a9640c74be34060d5bb41e4d074c000000000fc124841055d2641000020411dd2d541437d2bc035efe83e91133a41fb0ae6bfe8de25408431484148fb04bfb484fc3e38025e41103acebe1a0d203f1ce05f4167b306bf8519e23e22e65d41e1607dbe276e8b3fec5c62410a173dbeb8efdc3d8ead5741660d073fa20d643f97f76141a635a1c0df14dd3da082144138ba973d5474a340ed4c66415fbd5dc0e414dd3de2eb6541405ba93d5474a34092df9a412a5ec5bfb484fc3e26a64d410a6fb6bf1a0d203f0a844f41313ac6bf8519e23e118a4d419a8ca2bf276e8b3fdb0052418e45b5bf80c8dc3de93d9e41a4a6b93fd2d88f3fa2f8b441b1ed44c10082b739e7bb154100a0e2ba3fcddd3d15e3a6418ab16dc05e7bc93d86e8084131694fc054bb633fabb70f411efc44c1e414dd3d8d369a41cc405bc05474a34003bca7417e1480c080c8dc3daceeb241c86591bfd2d88f3f65a9c941a85d99bf000000007d09e03fb029014101002041afc16e41d6a30041c85278bf36338fc1d8a30041f07a1041d0ccd841c2f5c8c100000041666676c13e0a9f4100000041cdccc441586d7fc00f3e5b3f7b3589c0ce175cc0e0d0b03f399b7ec0cacd013ef44c603f14ad6ec036a3383f08c9b23f926d50c0b3ca18bec9abaa3f239bc4c02607c93d2c71114075dbaec0cb57163e45f3a93f3094aac08aecba3e6ecd1140886397c09e3d28c148644940a45b17c1b04304c1fa266d40803b0ac1ca2f9ac1a4703d3f53b87ec074da94c185eb913fd6a3c040db1f6ec0ba14dd3d004bb0c0c2142cc0f085603f77458fc0183249bf8c39973ff795fcc0b80108bf4b2a1b408932e6c0f84eb2bfd2b23f3f5a03fcbfd0bf29bf62340140e894cebe7ad8bfbfe314dd3d025906c0c8adb23ead8b1b40180f193e7f732cc038e7a83f5da11bc1496f07c075531240a55017c1348a9bbfe414dd3d06b45cc0ea9aad3f5474a340ac9cee3fe6599ac0e414dd3da4212dc1f73292bf5474a340e72810c1986956c0ba14dd3d6edbc7c036f715c0f085603f41a2a7c084b185bec83be63dc00b89c052ec0b3f8286ae3f3c665ec0002e573aba14dd3dbc746ac0026a7c3ff085603fb8672bc0ca2faac153b8de3f53b87ec074daa4c1c3f50840d6a3c0405bfb63c1e414dd3d642f2dc145cf99c05474a34082efe8c092a59bbfe414dd3dbc1c11c151de903f5474a340e0a13ac0e3f9f3bf0ebeb13f58bf15c175f1a9bf0ae80d40a06e11c151f380bfe494ba3fba0708c15d5653bf9f7c0940ca0800c1ce4db33eb20e2a408caf98c0e0d9653fd4e54140c96a51c0ca2fa2c153b89e3f2a5c8fc074da9cc185ebd13fd6a3b0401fec3ec00ebeb13f362ddfc03da92dc00ae80d401aabccc0ec87f5be7929b63f56a6e1c054178fbe54b20b40120fd0c0713472c0e851603fac5db2c0a5f42dc0513ac03f1cb085c0678462c00ebeb13f9e02b9c0854151c00ae80d408280a6c0321c83c00ebeb13f56ba92c083f574c00ae80d403a3880c031d967402a1b01a4ee9e1341fc188b40000020416cce1f4160ecc53f0629a03e8be4c440777b164056c5563f4cabda4010d7e63f56679f3efa2ece4064c82c40d7092f3f778ae9409191094056679f3e855edd4044fb4240d7092f3fd086f840a80a5840a32af83e7abd1c4175dd7540909c373f18302241a9411f40b4d8f63ec0c70341d7462740629e413f3523074189591940b4d8f63ea4fa0641b75e2140629e413f19560a41d1d91c40f4c9ba3eac800341ffde24400297233f21dc0641b1f11640f4c9ba3e90b30641dff61e400297233f050f0a4144a64440d23e063e50561441b380654048c0103fb56e1a413069953f80c8dc3d0b078541c7a45240d2d88f3f7c4fa041bdd9294074f1dd3d857e13411a354a40281a1d3f9e941c41d1455040dcefdc3df1bb5041b19281400dda823fd5735d4112803e4023bedc3d693411418ed86c40f728ae3e6d011d41b2323840f88ddf3d7c661b41d8235740d0f1fb3e0c4923410735933fd7566c3d28eb1f41487482401c20a44006df5c41de90404080c8dc3d54d25141c6db8740d2d88f3f5ae386410ec59f3f56679f3ea2e2b440662e0940d7092f3f5a2ecf402dc43f4016f7e43d51070a41b2f96e40a06e2b3ffd991541b1d8514086ebb1be4fb79c417240064148e19440769cc5416413253f10bedc3d67aaa7405cc8544051ff1f4136c60241c8e97e4080c8dc3d9c9d17415d668a40d2d88f3f82df54419601474006f7db3da7f91b4157767c40a46ded3ec4872941e4abf7c09ca21b3f78018f4152e3ddc08bdba43f86f5934179a7f6c0fb188f3f75cc8f415995e0c0dd93a33f6fc990413ed1aebf4faf2a402d61504134e427bf1b7c374013bd5b4148fb04bfe63f9c3f38025e41103acebe4625ad3f1ce05f4167b306bf19a5953f22e65d41e1607dbedf8ce83fec5c6241fedabcc09b61194001fb9b413f76bbc0ab412b40b7d19d413240f3bf96941a3f050d85411e4ec0bf25fc0d40a53a8941cd2f9ac1a4703d3fd4a3c04071da94c185eb913ff628804120cf15c086ce063ffc1d68410000adb8ef4c3f40e6168e41d00adcc09d8c1840f18a9d41c966d7c0ad6c2a405fff9e41bdbc10c086941a3f402d89416687eebf21fc0d40e05a8d41ca2fa2c153b89e3fd6a3b04074da9cc185ebd13feb517841506199bfdc68f83fc225534130728abf1ea70440a6035541553d9abf0fcef13fac0953417c1f6dbfeb5a224076805741553d9abf19a5953fac0953417c1f6dbfdf8ce83f76805741506199bfe63f9c3fc225534130728abf4625ad3fa6035541313ac6bf0fcef13f118a4d419a8ca2bfeb5a2240db0052412a5ec5bfdc68f83f26a64d410a6fb6bf1ea704400a844f410a6cf4be96941a3fde956941da8ea2bd25fc0d401ff1714125d2a2c049a912403a2e9b414f5a9ec05a892440eaaa9c419de846c002e7243f75963441cb9e2dc0f5fdc03febe83a41d7c546c0686fcc3fc58d3441037c2dc0ee7c1d403be03a41dafc46bee7254e3f63c956410074063fb1807b3f3f9d6141581d97c0dc5ed73fcdea9a41a28f91c0fc1efb3f12289c41fc5798c04846f33ff00c9b41438692c034830b40f1359c410d975dbf0fcef13fe6775841db3b16bfea5a22409aed5c415928d8c09ca21b3fd69d8d41c75fbec08bdba43fe4919241ec23d7c0fb188f3fd3688e41cc11c1c0dd93a33fcd658f41cda4b8c09ca21b3f353a8c413bdc9ec08bdba43f432e914160a0b7c0fb188f3f32058d41408ea1c0dd93a33f2c028e410b975dbf19a5953fe6775841dc3b16bfdf8ce83fb0ee5c410cdf5bbfe63f9c3ffe935841cc003ebf4625ad3fe2715a413c60d3c09b61194024299d4135bccec0ab412b40929d9e4164fb04bfdc68f83f38025e41483acebe1ea704401ce05f4167b306bf0fcef13f22e65d41e1607dbeeb5a2240ec5c624105a956bf96941a3f5ed67141b689e1be25fc0d409f317a41dbd2f2c0dc5ed73f1e459f4159ccebc0fc1efb3fcee69f41fd30b4c09b611940ebb69b41fe60b1c0ab412b407f6f9d412a5ec5bfe63f9c3f26a64d410a6fb6bf4625ad3f0a844f41313ac6bf19a5953f118a4d419a8ca2bfdf8ce83fdb00524163d8ecc01c36793f80029c416a2096c07c771d40a8e89f413998f1c04846f33f3f379f41b791eac034830b40efd89f418c0fedc0a30d064073939e41ce1ce7c0b3ed174069b19f413d4de6c049a912402a5a9e41cd1de0c05989244075629f418973c9c09b61194009949c414a0fc6c0ab412b40bd3b9e416b86abc09d8c1840124c9b41acffa8c0ae6c2a40b20d9d41ca2faac153b8de3fd6a3c04074daa4c1c3f50840f6288041bdf722bf0f022a402d195c415722dbbee56a3840976f5f4127d39bc0a30d06401bd09a41feb197c0b3ed1740f75b9c41911607401e2c7a3f2db7e040c7a12140eea9a43f9c45ee4073031440ac2f7a3fe8f7e940a98e2e40b5aba43f5786f7404dca1b402c6d193fbe4207417bcf2340349f5f3f339e0a41ff431e40384d373fe08b07412d492640407f7d3f55e70a41dd9f26402296553f6fa104410ba52e4015e48d3fe4fc07411f2c2440384d373ffd5804414d312c40407f7d3f72b407416db221402c6d193fda0f04419bb72940349f5f3f4f6b0741bdb720402296553f53d40741ebbc284015e48d3fc82f0b41422aa53fac2f7a3f3e39bb40ae40da3fb5aba43fadc7c8409e46f33f1e2c7a3f741cd740852e1440eea9a43fe3aae440a6b9d03f6679663f944bcf4009e8024092d09a3f03dadc4057f911406635703fb4ccea408d842c4092ae9f3f235bf84096849c3f6679663fbea7bc40029bd13f92d09a3f2d36ca40fe0dd93f1e2c7a3fcebfcd4035120740eea9a43f3d4edb4033b802406679663fb61de24069431d4092d09a3f25acef409259ef3fc433703f65ffd740ff371240c1ad9f3fd48de5409a2ca13f6635703f1616bc400643d63f92ae9f3f85a4c9409ab3ba3f6635703f5233c54006caef3f92ae9f3fc1c1d24076a9b63f6679663f5afdc540e2bfeb3f92d09a3fc98bd3401e71eb3f6679663f86d5d840c543104092d09a3ff563e640d59504406635703f7e37e1400b211f4092ae9f3fedc5ee407e60bf3f1e2c7a3fcc94c440ea76f43feea9a43f3b23d240ce66d43f6635703f5460ce409dbe044092ae9f3fc3eedb4055c40f406679663f8274eb403333204092d09a3ff102f940deec043f7929b63ff2d589c02a25383f54b20b405c7d70c001cea440f61203ba04c5ab41e409c140d1b80840fdd3b2418c00000016000000070000009a000000120000009b0000002f0000009c0000003d000000a20000005c000000a400000071000000730000001f00000003000000090000000a0000000b0000000f0000001000000033000000360000003b0000003e000000440000004500000050000000630000006200000067000000680000005b0000006f000000890000007f00000080000000900000005700000069000000000000000100000017000000020000002d0000001b0000002e0000003000000037000000470000004800000049000000530000005800000051000000590000006d0000005f0000006a000000700000006c0000006e0000007b0000007900000087000000960000008e000000a1000000080000000c000000190000000e00000011000000260000002700000028000000290000002a0000002b00000032000000380000003a0000006b0000005a000000660000007e000000760000007a0000008a0000008f0000009f00000006000000050000001500000013000000140000000d000000180000001e0000001d0000001c0000001a000000310000003400000035000000400000003f000000430000004200000046000000410000004b0000004e0000004f0000004a000000520000005400000061000000600000005600000055000000650000006400000074000000840000008500000077000000860000008800000092000000930000008b000000980000009400000095000000910000009d000000a3000000a5000000a0000000040000002c0000002500000023000000200000002200000024000000210000003c000000390000004d0000004c0000005e0000005d0000007200000075000000780000007c0000008200000081000000830000008d00000099000000970000007d0000009e000000000000000000000090140000000000000000000000000000000020c2000020c2000020c2000020420000204200002042a6330000b00a0000600b000007000000400b000001000c000000a03e1200020050000000e0020000000000000000000000000000000000000000000010000000050000002600000000000000000000000000000000800000ffff00801000000006000000000000000000000000000000000000000000ff7fffff0000004000801600000008000000460000000400000000000000000000000000ff7fffffff3f008000801e0000000b00000000000000000000000000000000000000ff7f0000ffff00000040ffff290000000a00000042000000050000000000000000000000ff7f00000040ff3f00c0ffff330000000300000000000000a40000000000000000000000ff7fff3a0099ff5000cd0099360000000700000045000000030000000000000000000000ff7fff3f0080ff3f006000c03d0000000500000000000000010000000000000000000000ff99ff3f0080ff5f008000c0420000000700000000000000000000000000000000000000ffbfff3f0080ff3f0080ffff490000000900000045000000040000000000000000000000ff7fff7f00c0ff3f0080ffff52000000010000001b000000220000000000000000000000ff7fff7f0099ff5000ac009953000000020000003c000000080000000000000000000000ff7fff9900c0ff5000c00099550000000a00000045000000030000000000000000000000ff7fffbfffffff3fffffffff5f00000006000000000000000000000000000000000000000000ff7fffffff7fffff004065000000070000000e0000002a0000000000000000000000ff3fff7fffffff7fffff00806c000000070000002d000000060000000000000000000000ff99ff3f00c0ff7f00c0ffff730000000a00000038000000090000000000000000000000ff7f000000c0ffbfffffffff7d00000000000000300000000b0000000100000000000000ff80ff7d0099ffb100cd0099000000000000000000000020ff7f0100ff7f0000ff3f000000000020ff7f0200ff7f0000ff7fff3f00000060ff7f0300ff3f0000ff7f000000000060ff7f0400ffbfff3fff2f000000000060ff7f0400ff4dff3fff3fff2f00000060ff7f0600ff4dff3fff7fff3f00000060ff7f0500ffbdffb9ff6fff6700000060ff7f0500ff79ff73ff78ff7300000020ff7f0d00ff3f0000ffffff7f00000020ff7f0e00ff7fff3fffffff7f00000060ff7f1000ffffffbfff3f000000000060ff7f1000ffffffceff7fff3fffffff9300000000ff7f0000ff7f0000ffffff1300000000ff7f0000ffff0000ffffffb3ffff0000ff7f0000ff7f0000ffffff5300000000ffff0000ff7f0000000000a0ff3f0200ffffff7fff7f000000000000ff7f0000ff7f0000ff3f000000000060ff7f0300ff3f0000ffffff7fffffff9300000000ffffff7fff7f0000ffffff33ffff0000ff7f0000ff3f0000ffffff5300000000ff3f0000ffffff7f00000080ff3f0100ffffff7fff7f000000000000ff7f0000ff7f0000ff7fff3f00000060ff7f0900ff4dff3fffbfff7f00000060ff7f0c00ff7fff3fffffffbf000000a0ff7f0d00ffffff7fff3f0000000000a0ff7f0e00ffffff7fff7fff3fffffff33ffff0000ff7f0000ff7fff3fffffff5300000000ff7fff3fffffff7f000000a0ff3f0400ff3f0000ffffff7f000000a0ff3f0600ff7fff3fffbfff7f000000a0ff3f0800ff7fff3fffffffbf000000a0ff3f0900ffbfff7fffffff7f000000a0ff3f0c00ffffffbfffffff7f00000040ff7f0000ff3f0000ff7f000000000040ff7f0100ff3f0000ffffff7fffffff9300000000ffff0000ffffff7fffffff1300000000ffffff7fff3f0000ffffff33ffff0000ffffff7fff3f0000ffffff73ffff0000ff3f0000ffff000000000080ff3f0300ff3f0000ffffff7f00000020ff3f0600ffbfff7fff5fff3f00000020ff3f0700ffbfff99ff7fff5f00000020ff3f0800ffffffbfff7fff3f00000040ff7f0000ffbfff3fff2f000000000040ff7f0000ff4dff3fff3fff2f00000020ff3f0f00ffffff99ffbfff7f000000a0ffbf1000ff3f0000ffffff7fffffff1300000000ffffff7fffbfff3fffffff73ffff0000ffbfff3fff3f000000000020ff7f0a00ff98ff7fff88ff5000000040ff7f0000ffbdffb9ff6fff6700000040ff7f0000ff79ff73ff78ff7300000080ff3f0300ff7fff3fffbfff7f00000000ff3f0400ffbfff7fff5fff3f000000a0ff5f0700ff7fff3fffbfff9900000060ffbf0800ff5fff3fff7fff3f00000020ff7f0900ff8fff7fff4fff3f00000020ff7f0900ffbfff8fff5fff3f00000040ff7f0000ff4dff3fff7fff3f00000080ff5f0600ff7fff3fffbfff9900000000ff3f0400ffbfff99ff7fff5f00000060ffbf0800ff7fff5fff7fff3f00000020ff7f0900ffbfff99ff7fff5f000000a0ff7f0f00ff7fff3fffbfff9900000000ff3f0400ffffffbfff7fff3f00000080ff3f0300ff7fff3fffffffbf00000040ffbf0600ff5fff3fff7fff3f00000040ffbf0700ff7fff5fff7fff3f00000020ff7f0900ffffffbfff7fff3f000000a0ff7f0f00ff7fff3fffffffbfffffff73ffff0000ff7fff3fff7fff3f00000080ff3f0300ffbfff7fffffff7f00000020ffbf0c00ffffff7fff7fff3f00000000ff7f0600ff8fff7fff4fff3f00000000ff7f0600ffbfff8fff5fff3f00000000ff7f0700ffbfff99ff7fff5f00000000ff7f0800ffffffbfff7fff3f00000040ff7f0200ff4dff3fffbfff7f000000a0ff7f0f00ffbfff7fffffff99ffffff73ffff0000ff7fff3fffbfff7f00000000ff7f0500ff98ff7fff88ff5000000020ffbf0c00ff98ff7fffbfff50000000a0ffbf1000ffbfff99ff98ff8000000080ff3f0300ffffffbfffffff7f00000000ffbf0900ffffff7fff7fff3f00000000ffbf0b00ff98ff7fffbfff5000000040ff7f0200ff7fff3fffffffbf00000000ffbf0f00ffffff99ffbfff7f00000000ffbf1000ffffff7fffffffbf00000040ff7f0e00ffffff7fffffffbfffffffb3ffff0000ffffffbfffffff7fffffff33ffff0000ffffff7fffffff3fffffff73ffff0000ffffff3fffffffbf00000060ff3f0e00ffffff7fffffff7f00000000ff7f0000ff3f0000ffffff7f00000080ff7f0200ffffff7fff3f0000ffffffb3ffff0000ffffff7fff3f0000ffffff33ffff0000ff3f0000ffffff7fffffff5300000000ffffff7fffffff7f00000040ff3f0d00ffffff7fffffff7f00000000ff7f0000ff7fff3fffffff7f00000060ff7f0c00ffffff7fffffffbf00000060ff7f1000ffffffceffbfff7f00000080ff7f0200ffffff7fff7fff3fffffffb3ffff0000ffffff7fff7fff3fffffff33ffff0000ff7fff3fffffff7f00000000ff3f0400ffffff99ffbfff7f000000a0ffbf1000ffbfff3fffffff9900000020ffbf0c00ffffff99ffbfff7f00000080ff7f0700ff7fff3fffbfff9900000080ff7f0800ff7fff3fffffffbf00000080ff7f0900ffbfff7fffffff99ffffff73ffff0000ffbfff7fffbfff3f00000080ffbf0400ff3f0000ffffff7f00000080ffbf0f00ffbfff3fffffff9900000080ffbf0b00ffbfff99ff98ff8000000020ffbf0c00ffffff7fffffffbf00000040ff7f0000ffffffbfff3f000000000040ff7f0000ffffffceff7fff3f00000040ff7f0e00ffffffceffbfff7fffffff1300000000ffffff7fffffffbfffffffb3ffff0000ffbf0000ffffff7fffffff73ffff0000ffffffbfffbf000016c0eae6ff8dc7f770ffb633f3ba33f0bafac82acfe800fb7ac7b02ac884ab3a2ff8fa30cb5edfb98eaffbccfff26aa5ea0cfbcffcffae0e0f2bdfdcbc3fffcf5ffb7e137b38fcfc470cff777338effdf8ec3fe78ff38ff92cefb2f3fff87dfff1f3ffccf3ffff03900000000d131b232f3844515a636b757d848c080f171e252c34383d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100843313490c23405c3344ef143ffff17ffffff8512154554284514154a51288aa2144a544445a4144aa1145151145154144554444551144aa12845511451111591522885a2148a521445a4144a514445a42885522845a12885a21491522885a2148552288552284551144aa11445a1144a51288a52144aa1284551148552144a111591522845a12845a11485524445512845a1144a11154aa10000000000 + m_PVSData: 120000d634d5b011c02000000000204200000000000020c2000020c2000020c20000204200002042000020422000000050010000000000000100000060010000a800000050020000000000000000000010120000a8000000a00100004600000000000000000000000000000000000000000000000000000000000000020000002002000000000000900100000100000001000000010000007001000080010000b0140000000000000000000000000000000000000000000000000000542034302e3020534f2031302e3020534820302e32353020424620352046203020435320302e30202d20332e332e3232204620302030204f472030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f0000000000000000000000000100000000000000000000000000000000000040000000000000000000000000000000001200000000000000000000002701856f7dbd9fb90082c030180ae36164048f006202424148080d42e268908f601288ee690808044125b00498501370024f00224a422a5405aca01526c765f80ca281741404a330152e828970081581232484a8701a36025550100ea1225c04135110a8024150080ce124380482601202020000000000000000000000000000000000000000000000000000ffff0000ffffffff0000000000000000ff80ff7d0099ffb100cd009900000000000000002a5ec5bfb484fc3e26a64d410a6fb6bf1a0d203f0a844f41fc4264c1000028b60ae62bc1941ee23fe514dd3d99e8e83f6a228ec0e414dd3d98eaf0c033901dc05474a3404f075fc0ca2f92c191c2753ed6a3b04074da8cc10ad7233feb517841f0f4c8c194c295bf86eb6dc1100b9f41ae470d4184eb6dc1a85d99bf000000007d09e03fb029014101002041afc16e417b2481c0ba14dd3d6cf297c0b54442c0f085603f9ee06fc04adb81c050cedd3df0ac2d4177d24bc0b1a9da3ff7a53b41b4a73dc0a00bdd3d224f6bc0a0cae0bf49c9993f5648c0bf8e45b5bf80c8dc3de93d9e41a4a6b93fd2d88f3fa2f8b4411f85adc1503e4abf35338fc11f85adc1375c1341cfccd8417e1480c080c8dc3daceeb241c86591bfd2d88f3f65a9c9417a34bdc100b851b81859edc03b5563c197ff9f40a4d377c03034d0bfb062af3e1c574c41984b2cbea62c294075ac6341c0f5c8c10600a0bf666676c13a0a9f41f45e6b36cdccc4410cdf5bbfb484fc3efe935841cc003ebf1a0d203fe2715a41ca2f92c191c2753e2a5c8fc074da8cc10ad7233fd6a3b0408ab16dc05e7bc93d86e8084131694fc054bb633fabb70f416c55323d2c35de3d4d4e5c41b058ab3fd578a340868e6b4148fb04bfb484fc3e38025e41103acebe1a0d203f1ce05f41b1ed44c10082b739e7bb154100a0e2ba3fcddd3d15e3a6417cb8a0c061affb32c66de83f5a54ff40a970dd3d982cd541a635a1c0df14dd3da082144138ba973d5474a340ed4c6641e4d074c000000000fc124841055d2641000020411dd2d54167b306bf8519e23e22e65d41e1607dbe276e8b3fec5c62410b975dbf8519e23ee6775841dc3b16bf276e8b3fb0ee5c410a173dbeb8efdc3d8ead5741660d073fa20d643f97f76141b4c8cac180c295bfb3c2c2414c379d41ac470d41e7d6c241f84328bfaaf1d23deb501a41d41a9640c74be34060d5bb41ae1a48c0cd14dd3db9ba23414069d1be2d97ef3e1d364f41a26891c0dc14dd3d73bf8241a12f68c0ae47ea3f48228c415fbd5dc0e414dd3de2eb6541405ba93d5474a34092df9a41553d9abf8519e23eac0953417c1f6dbf276e8b3f76805741e62368c0d314dd3dcd383841084bd8bf2d97ef3e673857411efc44c1e414dd3d8d369a41cc405bc05474a34003bca741437d2bc035efe83e91133a41fb0ae6bfe8de254084314841313ac6bf8519e23e118a4d419a8ca2bf276e8b3fdb0052414e6199bfb484fc3ec12553412e728abf1a0d203fa5035541d6a30041c85278bf36338fc1d8a30041f07a1041d0ccd841c2f5c8c100000041666676c13e0a9f4100000041cdccc441ca2faac153b8de3f53b87ec074daa4c1c3f50840d6a3c0405bfb63c1e414dd3d642f2dc145cf99c05474a34082efe8c092a59bbfe414dd3dbc1c11c151de903f5474a340e0a13ac0586d7fc00f3e5b3f7b3589c0ce175cc0e0d0b03f399b7ec084b185bec83be63dc00b89c052ec0b3f8286ae3f3c665ec0f84eb2bfd2b23f3f5a03fcbfd0bf29bf62340140e894cebe51f380bfe494ba3fba0708c15d5653bf9f7c0940ca0800c1713472c0e851603fac5db2c0a5f42dc0513ac03f1cb085c0cacd013ef44c603f14ad6ec036a3383f08c9b23f926d50c01fec3ec00ebeb13f362ddfc03da92dc00ae80d401aabccc0321c83c00ebeb13f56ba92c083f574c00ae80d403a3880c0db1f6ec0ba14dd3d004bb0c0c2142cc0f085603f77458fc0678462c00ebeb13f9e02b9c0854151c00ae80d408280a6c07ad8bfbfe314dd3d025906c0c8adb23ead8b1b40180f193ee6599ac0e414dd3da4212dc1f73292bf5474a340e72810c1ca2f9ac1a4703d3f53b87ec074da94c185eb913fd6a3c040ce4db33eb20e2a408caf98c0e0d9653fd4e54140c96a51c0ca2fa2c153b89e3f2a5c8fc074da9cc185ebd13fd6a3b0407f732cc038e7a83f5da11bc1496f07c075531240a55017c1986956c0ba14dd3d6edbc7c036f715c0f085603f41a2a7c0cb57163e45f3a93f3094aac08aecba3e6ecd1140886397c09e3d28c148644940a45b17c1b04304c1fa266d40803b0ac1e3f9f3bf0ebeb13f58bf15c175f1a9bf0ae80d40a06e11c1183249bf8c39973ff795fcc0b80108bf4b2a1b408932e6c0ec87f5be7929b63f56a6e1c054178fbe54b20b40120fd0c0b3ca18bec9abaa3f239bc4c02607c93d2c71114075dbaec0348a9bbfe414dd3d06b45cc0ea9aad3f5474a340ac9cee3f002e573aba14dd3dbc746ac0026a7c3ff085603fb8672bc0d1d91c40f4c9ba3eac800341ffde24400297233f21dc0641d1455040dcefdc3df1bb5041b19281400dda823fd5735d416413253f10bedc3d67aaa7405cc8544051ff1f4136c60241b1f11640f4c9ba3e90b30641dff61e400297233f050f0a4189591940b4d8f63ea4fa0641b75e2140629e413f19560a410735933fd7566c3d28eb1f41487482401c20a44006df5c410ec59f3f56679f3ea2e2b440662e0940d7092f3f5a2ecf402dc43f4016f7e43d51070a41b2f96e40a06e2b3ffd991541a80a5840a32af83e7abd1c4175dd7540909c373f18302241a9411f40b4d8f63ec0c70341d7462740629e413f352307419601474006f7db3da7f91b4157767c40a46ded3ec4872941de90404080c8dc3d54d25141c6db8740d2d88f3f5ae38641bdd9294074f1dd3d857e13411a354a40281a1d3f9e941c413069953f80c8dc3d0b078541c7a45240d2d88f3f7c4fa04160ecc53f0629a03e8be4c440777b164056c5563f4cabda4031d967402a1b01a4ee9e1341fc188b40000020416cce1f41b1d8514086ebb1be4fb79c417240064148e19440769cc54110d7e63f56679f3efa2ece4064c82c40d7092f3f778ae94044a64440d23e063e50561441b380654048c0103fb56e1a41b2323840f88ddf3d7c661b41d8235740d0f1fb3e0c492341c8e97e4080c8dc3d9c9d17415d668a40d2d88f3f82df544112803e4023bedc3d693411418ed86c40f728ae3e6d011d419191094056679f3e855edd4044fb4240d7092f3fd086f840d7c546c0686fcc3fc58d3441037c2dc0ee7c1d403be03a41506199bfdc68f83fc225534130728abf1ea70440a6035541bdf722bf0f022a402d195c415722dbbee56a3840976f5f4105a956bf96941a3f5ed67141b689e1be25fc0d409f317a4179a7f6c0fb188f3f75cc8f415995e0c0dd93a33f6fc990413d4de6c049a912402a5a9e41cd1de0c05989244075629f41cd2f9ac1a4703d3fd4a3c04071da94c185eb913ff62880419de846c002e7243f75963441cb9e2dc0f5fdc03febe83a41553d9abf19a5953fac0953417c1f6dbfdf8ce83f76805741313ac6bf0fcef13f118a4d419a8ca2bfeb5a2240db0052410a6cf4be96941a3fde956941da8ea2bd25fc0d401ff1714160a0b7c0fb188f3f32058d41408ea1c0dd93a33f2c028e41e4abf7c09ca21b3f78018f4152e3ddc08bdba43f86f59341dbd2f2c0dc5ed73f1e459f4159ccebc0fc1efb3fcee69f41581d97c0dc5ed73fcdea9a41a28f91c0fc1efb3f12289c41fedabcc09b61194001fb9b413f76bbc0ab412b40b7d19d4167b306bf0fcef13f22e65d41e1607dbeeb5a2240ec5c6241ca2faac153b8de3fd6a3c04074daa4c1c3f50840f6288041313ac6bf19a5953f118a4d419a8ca2bfdf8ce83fdb005241506199bfe63f9c3fc225534130728abf4625ad3fa60355413ed1aebf4faf2a402d61504134e427bf1b7c374013bd5b4164fb04bfdc68f83f38025e41483acebe1ea704401ce05f415928d8c09ca21b3fd69d8d41c75fbec08bdba43fe4919241bdbc10c086941a3f402d89416687eebf21fc0d40e05a8d410b975dbf19a5953fe6775841dc3b16bfdf8ce83fb0ee5c41cda4b8c09ca21b3f353a8c413bdc9ec08bdba43f432e914163d8ecc01c36793f80029c416a2096c07c771d40a8e89f41dafc46bee7254e3f63c956410074063fb1807b3f3f9d61413998f1c04846f33f3f379f41b791eac034830b40efd89f41fd30b4c09b611940ebb69b41fe60b1c0ab412b407f6f9d41553d9abf0fcef13fac0953417c1f6dbfeb5a2240768057418c0fedc0a30d064073939e41ce1ce7c0b3ed174069b19f412a5ec5bfe63f9c3f26a64d410a6fb6bf4625ad3f0a844f41d00adcc09d8c1840f18a9d41c966d7c0ad6c2a405fff9e413240f3bf96941a3f050d85411e4ec0bf25fc0d40a53a89410d975dbf0fcef13fe6775841db3b16bfea5a22409aed5c41ca2fa2c153b89e3fd6a3b04074da9cc185ebd13feb5178410cdf5bbfe63f9c3ffe935841cc003ebf4625ad3fe2715a4148fb04bfe63f9c3f38025e41103acebe4625ad3f1ce05f41ec23d7c0fb188f3fd3688e41cc11c1c0dd93a33fcd658f413c60d3c09b61194024299d4135bccec0ab412b40929d9e418973c9c09b61194009949c414a0fc6c0ab412b40bd3b9e41fc5798c04846f33ff00c9b41438692c034830b40f1359c4125d2a2c049a912403a2e9b414f5a9ec05a892440eaaa9c412a5ec5bfdc68f83f26a64d410a6fb6bf1ea704400a844f4127d39bc0a30d06401bd09a41feb197c0b3ed1740f75b9c416b86abc09d8c1840124c9b41acffa8c0ae6c2a40b20d9d4120cf15c086ce063ffc1d68410000adb8ef4c3f40e6168e4167b306bf19a5953f22e65d41e1607dbedf8ce83fec5c62419e46f33f1e2c7a3f741cd740852e1440eea9a43fe3aae440dd9f26402296553f6fa104410ba52e4015e48d3fe4fc0741bdb720402296553f53d40741ebbc284015e48d3fc82f0b41ce66d43f6635703f5460ce409dbe044092ae9f3fc3eedb401e71eb3f6679663f86d5d840c543104092d09a3ff563e6406db221402c6d193fda0f04419bb72940349f5f3f4f6b0741ff431e40384d373fe08b07412d492640407f7d3f55e70a419a2ca13f6635703f1616bc400643d63f92ae9f3f85a4c9407e60bf3f1e2c7a3fcc94c440ea76f43feea9a43f3b23d2409ab3ba3f6635703f5233c54006caef3f92ae9f3fc1c1d240fe0dd93f1e2c7a3fcebfcd4035120740eea9a43f3d4edb40422aa53fac2f7a3f3e39bb40ae40da3fb5aba43fadc7c840d59504406635703f7e37e1400b211f4092ae9f3fedc5ee40a6b9d03f6679663f944bcf4009e8024092d09a3f03dadc4055c40f406679663f8274eb403333204092d09a3ff102f9404dca1b402c6d193fbe4207417bcf2340349f5f3f339e0a4176a9b63f6679663f5afdc540e2bfeb3f92d09a3fc98bd3409259ef3fc433703f65ffd740ff371240c1ad9f3fd48de54033b802406679663fb61de24069431d4092d09a3f25acef40911607401e2c7a3f2db7e040c7a12140eea9a43f9c45ee4057f911406635703fb4ccea408d842c4092ae9f3f235bf8401f2c2440384d373ffd5804414d312c40407f7d3f72b4074196849c3f6679663fbea7bc40029bd13f92d09a3f2d36ca4073031440ac2f7a3fe8f7e940a98e2e40b5aba43f5786f740300e2d3f29182d3fd9ad28c04083693f8816c53f454408c0270e2d3f148cd63fd8ad28c04983693f448b2240464408c0deec043f7929b63ff2d589c02a25383f54b20b405c7d70c001cea440f61203ba04c5ab41e409c140d1b80840fdd3b241730000000c00000004000000990000002e00000092000000350000008f00000071000000890000007a0000008b000000940000009b000000a70000009d00000085000000010000000300000006000000100000002200000026000000240000002a0000003100000032000000400000004100000053000000540000005700000060000000610000006a000000680000006d000000740000008d000000580000000e00000005000000020000000f000000160000001b000000390000003c000000450000004b0000004700000051000000590000005c00000069000000660000005d0000007b0000007e00000078000000800000008e0000009700000088000000a100000096000000a20000009f00000007000000120000001f0000001d0000001e0000002f000000430000003f00000044000000460000004d00000050000000560000005a0000005f00000063000000650000007200000076000000830000007c0000009a000000a600000000000000080000000a00000009000000110000001500000028000000290000001a000000190000001700000027000000200000001c0000002c000000230000002d0000003b0000003e00000034000000380000003d000000330000003600000042000000480000004a000000520000004f0000004e000000550000005b00000062000000640000007000000075000000770000008100000084000000930000007900000086000000910000008c000000980000009c0000009e000000a3000000a50000000d000000130000001400000025000000180000002100000030000000370000003a000000490000004c0000005e000000670000006b0000006f0000006c000000820000007d000000870000008a0000007f0000009000000095000000a00000000b0000002b000000a40000006e000000c0140000000000000000000000000000000020c2000020c2000020c2000020420000204200002042a6330000b00a0000600b000007000000400b000001000c000000a03e1200020050000000e0020000000000000000000000000000000000000000000010000000050000002600000000000000000000000000000000800000ffff00801000000006000000000000000000000000000000000000000000ff7fffff0000004000801600000008000000420000000400000000000000000000000000ff7fffffff3f008000801e0000000b00000000000000000000000000000000000000ff7f0000ffff00000040ffff290000000a0000003e000000050000000000000000000000ff7f00000040ff3f00c0ffff330000000300000000000000a40000000000000000000000ff7fff3a0099ff5000cd0099360000000700000041000000030000000000000000000000ff7fff3f0080ff3f006000c03d0000000500000000000000010000000000000000000000ff99ff3f0080ff5f008000c0420000000700000000000000000000000000000000000000ffbfff3f0080ff3f0080ffff490000000900000041000000040000000000000000000000ff7fff7f00c0ff3f0080ffff520000000100000017000000240000000000000000000000ff7fff7f0099ff5000ac0099530000000200000038000000080000000000000000000000ff7fff9900c0ff5000c00099550000000a00000041000000030000000000000000000000ff7fffbfffffff3fffffffff5f00000006000000000000000000000000000000000000000000ff7fffffff7fffff004065000000070000000d0000002a0000000000000000000000ff3fff7fffffff7fffff00806c000000070000002a000000060000000000000000000000ff99ff3f00c0ff7f00c0ffff730000000a00000035000000090000000000000000000000ff7f000000c0ffbfffffffff7d000000000000002d0000000b0000000100000000000000ff80ff7d0099ffb100cd0099000000000000000000000020ff7f0100ff7f0000ff3f000000000020ff7f0200ff7f0000ff7fff3f00000060ff7f0300ff3f0000ff7f000000000060ff7f0400ffbfff3fff2f000000000060ff7f0400ff4dff3fff3fff2f00000060ff7f0600ff4dff3fff7fff3f00000060ff7f0500ffbdffb9ff6fff6700000060ff7f0500ff79ff73ff78ff7300000020ff7f0d00ff3f0000ffffff7f00000020ff7f0e00ff7fff3fffffff7f00000060ff7f1000ffffffbfff3f000000000060ff7f1000ffffffceff7fff3fffffff9300000000ff7f0000ff7f0000ffffff1300000000ff7f0000ffff0000ffffffb3ffff0000ff7f0000ff7f0000ffffff5300000000ffff0000ff7f0000000000a0ff3f0200ffffff7fff7f000000000000ff7f0000ff7f0000ff3f000000000060ff7f0300ff3f0000ffffff7fffffff9300000000ffffff7fff7f0000ffffff33ffff0000ff7f0000ff3f0000ffffff5300000000ff3f0000ffffff7f00000080ff3f0100ffffff7fff7f000000000000ff7f0000ff7f0000ff7fff3f00000060ff7f0900ff4dff3fffbfff7f00000060ff7f0c00ff7fff3fffffffbf000000a0ff7f0d00ffffff7fff3f0000000000a0ff7f0e00ffffff7fff7fff3fffffff33ffff0000ff7f0000ff7fff3fffffff5300000000ff7fff3fffffff7f000000a0ff3f0400ff3f0000ffffff7f000000a0ff3f0600ff7fff3fffbfff7f000000a0ff3f0800ff7fff3fffffffbf000000a0ff3f0900ffbfff7fffffff7f000000a0ff3f0c00ffffffbfffffff7f00000040ff7f0000ff3f0000ff7f000000000040ff7f0100ff3f0000ffffff7fffffff9300000000ffff0000ffffff7fffffff1300000000ffffff7fff3f0000ffffff33ffff0000ffffff7fff3f0000ffffff73ffff0000ff3f0000ffff000000000080ff3f0300ff3f0000ffffff7f00000020ff3f0600ffbfff7fff5fff3f00000020ff3f0700ffbfff99ff7fff5f00000020ff3f0800ffffffbfff7fff3f00000040ff7f0000ffbfff3fff2f000000000040ff7f0000ff4dff3fff3fff2f00000020ff3f0f00ffffff99ffbfff7f000000a0ffbf1000ff3f0000ffffff7fffffff1300000000ffffff7fffbfff3fffffff73ffff0000ffbfff3fff3f000000000020ff7f0a00ff98ff7fff88ff5000000040ff7f0000ffbdffb9ff6fff6700000040ff7f0000ff79ff73ff78ff7300000080ff3f0300ff7fff3fffbfff7f00000000ff3f0400ffbfff7fff5fff3f000000a0ff5f0700ff7fff3fffbfff9900000060ffbf0800ff5fff3fff7fff3f00000020ff7f0900ff8fff7fff4fff3f00000020ff7f0900ffbfff8fff5fff3f00000040ff7f0000ff4dff3fff7fff3f00000080ff5f0600ff7fff3fffbfff9900000000ff3f0400ffbfff99ff7fff5f00000060ffbf0800ff7fff5fff7fff3f00000020ff7f0900ffbfff99ff7fff5f000000a0ff7f0f00ff7fff3fffbfff9900000000ff3f0400ffffffbfff7fff3f00000080ff3f0300ff7fff3fffffffbf00000040ffbf0600ff5fff3fff7fff3f00000040ffbf0700ff7fff5fff7fff3f00000020ff7f0900ffffffbfff7fff3f000000a0ff7f0f00ff7fff3fffffffbfffffff73ffff0000ff7fff3fff7fff3f00000080ff3f0300ffbfff7fffffff7f00000020ffbf0c00ffffff7fff7fff3f00000000ff7f0600ff8fff7fff4fff3f00000000ff7f0600ffbfff8fff5fff3f00000000ff7f0700ffbfff99ff7fff5f00000000ff7f0800ffffffbfff7fff3f00000040ff7f0200ff4dff3fffbfff7f000000a0ff7f0f00ffbfff7fffffff99ffffff73ffff0000ff7fff3fffbfff7f00000000ff7f0500ff98ff7fff88ff5000000020ffbf0c00ff98ff7fffbfff50000000a0ffbf1000ffbfff99ff98ff8000000080ff3f0300ffffffbfffffff7f00000000ffbf0900ffffff7fff7fff3f00000000ffbf0b00ff98ff7fffbfff5000000040ff7f0200ff7fff3fffffffbf00000000ffbf0f00ffffff99ffbfff7f00000000ffbf1000ffffff7fffffffbf00000040ff7f0e00ffffff7fffffffbfffffffb3ffff0000ffffffbfffffff7fffffff33ffff0000ffffff7fffffff3fffffff73ffff0000ffffff3fffffffbf00000060ff3f0e00ffffff7fffffff7f00000000ff7f0000ff3f0000ffffff7f00000080ff7f0200ffffff7fff3f0000ffffffb3ffff0000ffffff7fff3f0000ffffff33ffff0000ff3f0000ffffff7fffffff5300000000ffffff7fffffff7f00000040ff3f0d00ffffff7fffffff7f00000000ff7f0000ff7fff3fffffff7f00000060ff7f0c00ffffff7fffffffbf00000060ff7f1000ffffffceffbfff7f00000080ff7f0200ffffff7fff7fff3fffffffb3ffff0000ffffff7fff7fff3fffffff33ffff0000ff7fff3fffffff7f00000000ff3f0400ffffff99ffbfff7f000000a0ffbf1000ffbfff3fffffff9900000020ffbf0c00ffffff99ffbfff7f00000080ff7f0700ff7fff3fffbfff9900000080ff7f0800ff7fff3fffffffbf00000080ff7f0900ffbfff7fffffff99ffffff73ffff0000ffbfff7fffbfff3f00000080ffbf0400ff3f0000ffffff7f00000080ffbf0f00ffbfff3fffffff9900000080ffbf0b00ffbfff99ff98ff8000000020ffbf0c00ffffff7fffffffbf00000040ff7f0000ffffffbfff3f000000000040ff7f0000ffffffceff7fff3f00000040ff7f0e00ffffffceffbfff7fffffff1300000000ffffff7fffffffbfffffffb3ffff0000ffbf0000ffffff7fffffff73ffff0000ffffffbfffbf000016c0eae6ff8dc7f770ffb633f3ba33f0bafac82acfe800fb7ac7b02ac884ab3a2ff8fa30cb5edfb98eaffbccfff26aa5ea0cfbcffcffae0e0f2bdfdcbc3fffcf5ffb7e137b38fcfc470cff777338effdf8ec3fe78ff38ff92cefb2f3fff87dfff1f3ffccf3ffff03900000000d131b232f3844515a636b757d848c080f171e252c34383d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100843313490c23405c3344ef143ffff17ffffff8512154554284514154a51288aa2144a544445a4144aa1145151145154144554444551144aa12845511451111591522885a2148a521445a4144a514445a42885522845a12885a21491522885a2148552288552284551144aa11445a1144a51288a52144aa1284551148552144a111591522845a12845a11485524445512845a1144a11154aa10000000000 m_Scenes: - indexRenderers: 0 - sizeRenderers: 166 + sizeRenderers: 168 indexPortals: 0 sizePortals: 0 scene: 234ac6652f2be3943b8974a3fcbaba1f m_StaticRenderers: - - targetObject: 3561669902476781131 - targetPrefab: 195269413 - - targetObject: 3561669902476781131 - targetPrefab: 7497062160985860503 + - targetObject: 5395762849033877597 + targetPrefab: 789002245204939195 + - targetObject: 4635118799374185828 + targetPrefab: 6597279250610392207 - targetObject: -7511558181221131132 - targetPrefab: 1753375831 - - targetObject: 4351601775851787701 - targetPrefab: 2024292607 + targetPrefab: 96005904 - targetObject: -7511558181221131132 - targetPrefab: 1905064959 - - targetObject: 1968900501911500709 - targetPrefab: 4438766482650780789 - - targetObject: 940995387610717004 - targetPrefab: 4438766482650780789 - - targetObject: 2708739958050211779 - targetPrefab: 1584295245487527435 + targetPrefab: 124250300 - targetObject: -7511558181221131132 - targetPrefab: 175467006 + targetPrefab: 124273105 - targetObject: -7511558181221131132 - targetPrefab: 732678856 - - targetObject: 5444317254943555344 - targetPrefab: 4953860686005405531 - - targetObject: -7511558181221131132 - targetPrefab: 1123331143 - - targetObject: 5717347135439830637 - targetPrefab: 1525135584 - - targetObject: -7511558181221131132 - targetPrefab: 600479467 - - targetObject: 5717347135439830637 - targetPrefab: 492170616723644160 + targetPrefab: 139770782 - targetObject: 1466060218924807064 - targetPrefab: 1018401441 - - targetObject: 2751096909771140069 - targetPrefab: 1018401441 - - targetObject: 5717347135439830637 - targetPrefab: 731244042 + targetPrefab: 1305776201 + - targetObject: 3109912091784458562 + targetPrefab: 4439941099814456201 + - targetObject: 1466060218924807064 + targetPrefab: 1249864385 + - targetObject: -7511558181221131132 + targetPrefab: 25650784 + - targetObject: 260140876 + targetPrefab: 0 + - targetObject: 5395762849033877597 + targetPrefab: 1984717371 - targetObject: -7511558181221131132 targetPrefab: 267965641 - - targetObject: 1466060218924807064 - targetPrefab: 990092987 - - targetObject: 2751096909771140069 - targetPrefab: 990092987 - - targetObject: 1314192677750578227 - targetPrefab: 938385720 - - targetObject: 2708739958050211779 - targetPrefab: 934922675 - targetObject: -7511558181221131132 - targetPrefab: 1699737571 - - targetObject: -7511558181221131132 - targetPrefab: 1548013197 - - targetObject: 5717347135439830637 - targetPrefab: 302004181 - - targetObject: -7511558181221131132 - targetPrefab: 1012354932 + targetPrefab: 38498937 - targetObject: 4351601775851787701 - targetPrefab: 633609066 + targetPrefab: 91371483 + - targetObject: 3561669902476781131 + targetPrefab: 195269413 - targetObject: -7511558181221131132 - targetPrefab: 1584083749 - - targetObject: -7511558181221131132 - targetPrefab: 1488972618 - - targetObject: 4351601775851787701 - targetPrefab: 832323181 - - targetObject: 4351601775851787701 - targetPrefab: 1294116878969307432 + targetPrefab: 297529246 + - targetObject: 1968900501911500709 + targetPrefab: 4438766482650780789 + - targetObject: 5975530834638872138 + targetPrefab: 7959770407137091214 - targetObject: 5383915834804199889 targetPrefab: 4439941099814456201 - targetObject: 9199244788021150158 targetPrefab: 4439941099814456201 - - targetObject: 8489222910475806241 - targetPrefab: 4439941099814456201 - - targetObject: 5986860653123913771 - targetPrefab: 4439941099814456201 - - targetObject: 6391950332602189361 - targetPrefab: 4439941099814456201 - - targetObject: 145649568303227995 - targetPrefab: 4439941099814456201 - - targetObject: 5781856680037161349 - targetPrefab: 4439941099814456201 - - targetObject: 810790293382867686 - targetPrefab: 4439941099814456201 - - targetObject: 3109912091784458562 - targetPrefab: 4439941099814456201 - - targetObject: 3845294101582553977 - targetPrefab: 4439941099814456201 - - targetObject: 8238489538756609962 - targetPrefab: 1717173489 - - targetObject: 937335414445983782 - targetPrefab: 1294787288 - - targetObject: -7511558181221131132 - targetPrefab: 2103881977 - - targetObject: -7511558181221131132 - targetPrefab: 1954089587 - - targetObject: -7511558181221131132 - targetPrefab: 1316690157 - - targetObject: -7511558181221131132 - targetPrefab: 1996143677 - - targetObject: -7511558181221131132 - targetPrefab: 925207497 - - targetObject: 4351601775851787701 - targetPrefab: 1720149715 - - targetObject: 8238489538756609962 - targetPrefab: 1420742576 - - targetObject: -7511558181221131132 - targetPrefab: 124250300 - - targetObject: 1466060218924807064 - targetPrefab: 1249864385 - - targetObject: 2751096909771140069 - targetPrefab: 1249864385 - - targetObject: -7511558181221131132 - targetPrefab: 428099456 - - targetObject: 4856842162814790411 - targetPrefab: 6044205050412544512 - - targetObject: 5975530834638872138 - targetPrefab: 7959770407137091214 - - targetObject: -7511558181221131132 - targetPrefab: 38498937 - - targetObject: 8238489538756609962 - targetPrefab: 1728042986 - - targetObject: -7511558181221131132 - targetPrefab: 749395700 - - targetObject: -7511558181221131132 - targetPrefab: 722786723 - - targetObject: -7511558181221131132 - targetPrefab: 124273105 - - targetObject: 8810932174823803713 - targetPrefab: 6146163849592780820 - - targetObject: 1466060218924807064 - targetPrefab: 4480648499976004208 - - targetObject: 2751096909771140069 - targetPrefab: 4480648499976004208 - - targetObject: -7511558181221131132 - targetPrefab: 1188236244 - - targetObject: 1466060218924807064 - targetPrefab: 1962599170 - - targetObject: 2751096909771140069 - targetPrefab: 1962599170 - - targetObject: 1466060218924807064 - targetPrefab: 1305776201 - - targetObject: 2751096909771140069 - targetPrefab: 1305776201 - - targetObject: -7511558181221131132 - targetPrefab: 383052033 - - targetObject: -7511558181221131132 - targetPrefab: 1470660570 - - targetObject: -7511558181221131132 - targetPrefab: 1794270741 - - targetObject: -7511558181221131132 - targetPrefab: 2119386629 - - targetObject: -7511558181221131132 - targetPrefab: 859579629 - - targetObject: 7006853779014437907 - targetPrefab: 515796176453664510 - - targetObject: -7511558181221131132 - targetPrefab: 1797517225 - - targetObject: -7511558181221131132 - targetPrefab: 1643263789 - - targetObject: 5395762849033877597 - targetPrefab: 789002245204939195 - - targetObject: 8407522312957124744 - targetPrefab: 1001622459989043154 - - targetObject: 1662342198976129257 - targetPrefab: 1001622459989043154 - - targetObject: -7511558181221131132 - targetPrefab: 364609004 - - targetObject: -7511558181221131132 - targetPrefab: 1972023585 - - targetObject: -7511558181221131132 - targetPrefab: 1617502299 - - targetObject: -7511558181221131132 - targetPrefab: 1557255132 - - targetObject: 1968900501911500709 - targetPrefab: 937910637 - - targetObject: 940995387610717004 - targetPrefab: 937910637 - - targetObject: 2708739958050211779 - targetPrefab: 1582278623 - - targetObject: -7511558181221131132 - targetPrefab: 1721066376 - - targetObject: -7511558181221131132 - targetPrefab: 1636463909 - - targetObject: -7511558181221131132 - targetPrefab: 936490290 - - targetObject: 937335414445983782 - targetPrefab: 210689158 - - targetObject: -7511558181221131132 - targetPrefab: 1000870841 - - targetObject: -7511558181221131132 - targetPrefab: 1288293805 - - targetObject: -7511558181221131132 - targetPrefab: 1333645958 - - targetObject: -7511558181221131132 - targetPrefab: 139770782 - - targetObject: 1968900501911500709 - targetPrefab: 172614115 - - targetObject: 940995387610717004 - targetPrefab: 172614115 - - targetObject: -7511558181221131132 - targetPrefab: 1427476862 - - targetObject: -7511558181221131132 - targetPrefab: 760334290 - - targetObject: 1466060218924807064 - targetPrefab: 414428781 - - targetObject: 2751096909771140069 - targetPrefab: 414428781 - - targetObject: 937335414445983782 - targetPrefab: 1307065648 - - targetObject: 1466060218924807064 - targetPrefab: 1918973202 - - targetObject: 2751096909771140069 - targetPrefab: 1918973202 - - targetObject: 2708739958050211779 - targetPrefab: 1369540354 - - targetObject: -7511558181221131132 - targetPrefab: 96005904 - - targetObject: 8238489538756609962 - targetPrefab: 1838514616 - - targetObject: -7511558181221131132 - targetPrefab: 1036092938 - - targetObject: 4351601775851787701 - targetPrefab: 91371483 - - targetObject: -7511558181221131132 - targetPrefab: 1502884311 - - targetObject: -7511558181221131132 - targetPrefab: 297529246 - - targetObject: -7511558181221131132 - targetPrefab: 15546807 - - targetObject: 2708739958050211779 - targetPrefab: 146729477 - - targetObject: -7511558181221131132 - targetPrefab: 1133696391 - - targetObject: -7511558181221131132 - targetPrefab: 785030037 - - targetObject: -7511558181221131132 - targetPrefab: 723913190 - - targetObject: -7511558181221131132 - targetPrefab: 15557432 - - targetObject: 8238489538756609962 - targetPrefab: 656808695 - - targetObject: -7511558181221131132 - targetPrefab: 25650784 - - targetObject: -7511558181221131132 - targetPrefab: 116188318 - - targetObject: -7511558181221131132 - targetPrefab: 14749639 - - targetObject: -7511558181221131132 - targetPrefab: 1586593148 - - targetObject: 4351601775851787701 - targetPrefab: 1768602428 - - targetObject: -7511558181221131132 - targetPrefab: 212338278 - - targetObject: -7511558181221131132 - targetPrefab: 2125416508 - - targetObject: 5717347135439830637 - targetPrefab: 896304098 - - targetObject: -7511558181221131132 - targetPrefab: 1629735784 - - targetObject: 937335414445983782 - targetPrefab: 1926166420 - - targetObject: -7511558181221131132 - targetPrefab: 20447147 - - targetObject: -7511558181221131132 - targetPrefab: 1837226873 - - targetObject: -7511558181221131132 - targetPrefab: 680367885 - - targetObject: 1466060218924807064 - targetPrefab: 428989207 - - targetObject: 2751096909771140069 - targetPrefab: 428989207 - - targetObject: -7511558181221131132 - targetPrefab: 580345162 - - targetObject: -7511558181221131132 - targetPrefab: 2113804250 - - targetObject: -7511558181221131132 - targetPrefab: 366681287 - - targetObject: 4635118799374185828 - targetPrefab: 6597279250610392207 - - targetObject: -7511558181221131132 - targetPrefab: 705210510 - - targetObject: -7511558181221131132 - targetPrefab: 1279360754 - - targetObject: 2708739958050211779 - targetPrefab: 734635744 - - targetObject: -7511558181221131132 - targetPrefab: 33295931 - - targetObject: -7511558181221131132 - targetPrefab: 1458777284 - - targetObject: 937335414445983782 - targetPrefab: 7708224261666798563 - - targetObject: -7511558181221131132 - targetPrefab: 1976503209 - - targetObject: -7511558181221131132 - targetPrefab: 1873800957 - - targetObject: 1466060218924807064 - targetPrefab: 1329794381 - - targetObject: 2751096909771140069 - targetPrefab: 1329794381 - - targetObject: -7511558181221131132 - targetPrefab: 1463594309 - targetObject: -7511558181221131132 targetPrefab: 353645666 - targetObject: -7511558181221131132 - targetPrefab: 1085798876 + targetPrefab: 364609004 - targetObject: -7511558181221131132 - targetPrefab: 802302015 + targetPrefab: 383052033 - targetObject: -7511558181221131132 - targetPrefab: 1299739207 + targetPrefab: 20447147 + - targetObject: 2751096909771140069 + targetPrefab: 1962599170 + - targetObject: 2751096909771140069 + targetPrefab: 4480648499976004208 + - targetObject: 4856842162814790411 + targetPrefab: 6044205050412544512 + - targetObject: -7511558181221131132 + targetPrefab: 580345162 + - targetObject: 3845294101582553977 + targetPrefab: 4439941099814456201 + - targetObject: 810790293382867686 + targetPrefab: 4439941099814456201 + - targetObject: -7511558181221131132 + targetPrefab: 705210510 + - targetObject: 940995387610717004 + targetPrefab: 4438766482650780789 + - targetObject: 6391950332602189361 + targetPrefab: 4439941099814456201 + - targetObject: -7511558181221131132 + targetPrefab: 732678856 + - targetObject: -7511558181221131132 + targetPrefab: 600479467 + - targetObject: -7511558181221131132 + targetPrefab: 749395700 - targetObject: -7511558181221131132 targetPrefab: 757440473 + - targetObject: -7511558181221131132 + targetPrefab: 760334290 + - targetObject: 1968900501911500709 + targetPrefab: 937910637 + - targetObject: 4351601775851787701 + targetPrefab: 832323181 + - targetObject: 7006853779014437907 + targetPrefab: 515796176453664510 + - targetObject: 2751096909771140069 + targetPrefab: 1305776201 + - targetObject: 7006853779014437907 + targetPrefab: 1049045427 + - targetObject: -7511558181221131132 + targetPrefab: 859579629 + - targetObject: 2751096909771140069 + targetPrefab: 428989207 + - targetObject: 2708739958050211779 + targetPrefab: 934922675 + - targetObject: -7511558181221131132 + targetPrefab: 936490290 + - targetObject: 5986860653123913771 + targetPrefab: 4439941099814456201 + - targetObject: 2751096909771140069 + targetPrefab: 1018401441 + - targetObject: 1662342198976129257 + targetPrefab: 1001622459989043154 + - targetObject: 940995387610717004 + targetPrefab: 172614115 - targetObject: 1466060218924807064 - targetPrefab: 298932333 + targetPrefab: 4480648499976004208 + - targetObject: -7511558181221131132 + targetPrefab: 1000870841 + - targetObject: -7511558181221131132 + targetPrefab: 1012354932 + - targetObject: -7511558181221131132 + targetPrefab: 116188318 + - targetObject: 1314192677750578227 + targetPrefab: 938385720 + - targetObject: -7511558181221131132 + targetPrefab: 1036092938 + - targetObject: -7511558181221131132 + targetPrefab: 33295931 + - targetObject: 4351601775851787701 + targetPrefab: 1058862682 + - targetObject: -7511558181221131132 + targetPrefab: 1085798876 + - targetObject: 1466060218924807064 + targetPrefab: 428989207 + - targetObject: 2751096909771140069 + targetPrefab: 1329794381 + - targetObject: 8238489538756609962 + targetPrefab: 656808695 + - targetObject: 2708739958050211779 + targetPrefab: 734635744 + - targetObject: -7511558181221131132 + targetPrefab: 428099456 + - targetObject: 2751096909771140069 + targetPrefab: 414428781 + - targetObject: 5717347135439830637 + targetPrefab: 896304098 + - targetObject: 5717347135439830637 + targetPrefab: 731244042 + - targetObject: 3561669902476781131 + targetPrefab: 7497062160985860503 + - targetObject: 5781856680037161349 + targetPrefab: 4439941099814456201 + - targetObject: -7511558181221131132 + targetPrefab: 864192418 + - targetObject: 940995387610717004 + targetPrefab: 937910637 + - targetObject: -7511558181221131132 + targetPrefab: 212338278 + - targetObject: -7511558181221131132 + targetPrefab: 1279360754 + - targetObject: -7511558181221131132 + targetPrefab: 14749639 + - targetObject: -7511558181221131132 + targetPrefab: 1288293805 + - targetObject: 5717347135439830637 + targetPrefab: 1288862496 + - targetObject: -7511558181221131132 + targetPrefab: 366681287 + - targetObject: -7511558181221131132 + targetPrefab: 1299739207 + - targetObject: 937335414445983782 + targetPrefab: 1307065648 + - targetObject: -7511558181221131132 + targetPrefab: 1316690157 + - targetObject: 8407522312957124744 + targetPrefab: 1001622459989043154 + - targetObject: -7511558181221131132 + targetPrefab: 1392345919 + - targetObject: -7511558181221131132 + targetPrefab: 1123331143 + - targetObject: 2751096909771140069 + targetPrefab: 1249864385 + - targetObject: 8238489538756609962 + targetPrefab: 1420742576 + - targetObject: -7511558181221131132 + targetPrefab: 1427476862 + - targetObject: 2708739958050211779 + targetPrefab: 1369540354 + - targetObject: -7511558181221131132 + targetPrefab: 1458777284 + - targetObject: 937335414445983782 + targetPrefab: 1294787288 + - targetObject: -7511558181221131132 + targetPrefab: 1463594309 + - targetObject: -7511558181221131132 + targetPrefab: 1470660570 + - targetObject: -7511558181221131132 + targetPrefab: 1502884311 + - targetObject: -7511558181221131132 + targetPrefab: 722786723 + - targetObject: 5717347135439830637 + targetPrefab: 1525135584 - targetObject: 2751096909771140069 targetPrefab: 298932333 - targetObject: -7511558181221131132 targetPrefab: 1538206739 + - targetObject: 1466060218924807064 + targetPrefab: 1329794381 - targetObject: -7511558181221131132 - targetPrefab: 651901189 + targetPrefab: 175467006 + - targetObject: -7511558181221131132 + targetPrefab: 1584083749 + - targetObject: -7511558181221131132 + targetPrefab: 1586593148 + - targetObject: 4351601775851787701 + targetPrefab: 633609066 + - targetObject: -7511558181221131132 + targetPrefab: 680367885 + - targetObject: 8810932174823803713 + targetPrefab: 6146163849592780820 + - targetObject: -7511558181221131132 + targetPrefab: 1617502299 + - targetObject: -7511558181221131132 + targetPrefab: 1629735784 + - targetObject: -7511558181221131132 + targetPrefab: 1643263789 + - targetObject: 145649568303227995 + targetPrefab: 4439941099814456201 + - targetObject: 2751096909771140069 + targetPrefab: 1918973202 - targetObject: 8810932174823803713 targetPrefab: 1669769486 + - targetObject: -7511558181221131132 + targetPrefab: 802302015 + - targetObject: -7511558181221131132 + targetPrefab: 1548013197 + - targetObject: -7511558181221131132 + targetPrefab: 785030037 - targetObject: 5717347135439830637 - targetPrefab: 1288862496 + targetPrefab: 302004181 + - targetObject: 1466060218924807064 + targetPrefab: 1918973202 + - targetObject: 1466060218924807064 + targetPrefab: 298932333 - targetObject: -7511558181221131132 - targetPrefab: 2045833766 - - targetObject: -7511558181221131132 - targetPrefab: 864192418 - - targetObject: -7511558181221131132 - targetPrefab: 1392345919 + targetPrefab: 1557255132 + - targetObject: 8238489538756609962 + targetPrefab: 1717173489 - targetObject: 4351601775851787701 - targetPrefab: 1058862682 + targetPrefab: 1720149715 + - targetObject: -7511558181221131132 + targetPrefab: 1721066376 + - targetObject: -7511558181221131132 + targetPrefab: 723913190 + - targetObject: 2708739958050211779 + targetPrefab: 146729477 + - targetObject: 4351601775851787701 + targetPrefab: 1768602428 + - targetObject: 937335414445983782 + targetPrefab: 7708224261666798563 + - targetObject: -7511558181221131132 + targetPrefab: 15557432 + - targetObject: -7511558181221131132 + targetPrefab: 1794270741 + - targetObject: -7511558181221131132 + targetPrefab: 1797517225 + - targetObject: -7511558181221131132 + targetPrefab: 1753375831 + - targetObject: 1466060218924807064 + targetPrefab: 414428781 + - targetObject: -7511558181221131132 + targetPrefab: 1837226873 + - targetObject: 8238489538756609962 + targetPrefab: 1838514616 + - targetObject: 1466060218924807064 + targetPrefab: 990092987 + - targetObject: 4351601775851787701 + targetPrefab: 1294116878969307432 + - targetObject: -7511558181221131132 + targetPrefab: 1873800957 + - targetObject: -7511558181221131132 + targetPrefab: 1133696391 + - targetObject: -7511558181221131132 + targetPrefab: 925207497 + - targetObject: 937335414445983782 + targetPrefab: 210689158 + - targetObject: -7511558181221131132 + targetPrefab: 1905064959 + - targetObject: 937335414445983782 + targetPrefab: 1926166420 + - targetObject: -7511558181221131132 + targetPrefab: 1188236244 + - targetObject: 2708739958050211779 + targetPrefab: 1582278623 + - targetObject: -7511558181221131132 + targetPrefab: 1954089587 + - targetObject: 5444317254943555344 + targetPrefab: 4953860686005405531 + - targetObject: 8489222910475806241 + targetPrefab: 4439941099814456201 + - targetObject: -7511558181221131132 + targetPrefab: 1972023585 + - targetObject: -7511558181221131132 + targetPrefab: 1976503209 + - targetObject: 1968900501911500709 + targetPrefab: 172614115 + - targetObject: -7511558181221131132 + targetPrefab: 1996143677 + - targetObject: -7511558181221131132 + targetPrefab: 1333645958 + - targetObject: -7511558181221131132 + targetPrefab: 1699737571 + - targetObject: -7511558181221131132 + targetPrefab: 15546807 + - targetObject: 1466060218924807064 + targetPrefab: 1962599170 + - targetObject: 4351601775851787701 + targetPrefab: 2024292607 + - targetObject: 8238489538756609962 + targetPrefab: 1728042986 - targetObject: -7511558181221131132 targetPrefab: 2033001482 - - targetObject: 260140876 - targetPrefab: 0 + - targetObject: -7511558181221131132 + targetPrefab: 2045833766 + - targetObject: 1466060218924807064 + targetPrefab: 1018401441 + - targetObject: -7511558181221131132 + targetPrefab: 651901189 + - targetObject: -7511558181221131132 + targetPrefab: 1636463909 + - targetObject: -7511558181221131132 + targetPrefab: 2103881977 + - targetObject: -7511558181221131132 + targetPrefab: 2113804250 + - targetObject: -7511558181221131132 + targetPrefab: 2119386629 + - targetObject: -7511558181221131132 + targetPrefab: 1488972618 + - targetObject: -7511558181221131132 + targetPrefab: 2125416508 + - targetObject: 2751096909771140069 + targetPrefab: 990092987 + - targetObject: 5717347135439830637 + targetPrefab: 492170616723644160 + - targetObject: 2708739958050211779 + targetPrefab: 1584295245487527435 m_Portals: [] diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.asset b/Assets/UdonSharp/Game Managers/GameManagerBase.asset index a2cd8c0..51780e3 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 11 + Data: 12 - Name: Entry: 7 Data: @@ -636,6 +636,60 @@ MonoBehaviour: - 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: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 44|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: _IsHostEnabled + - Name: $v + Entry: 7 + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _IsHostEnabled + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: Entry: 6 Data: @@ -647,7 +701,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -671,7 +725,7 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard @@ -695,7 +749,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index dc1357a..af340bc 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -1,12 +1,8 @@  -using System.Runtime.InteropServices; using UdonSharp; using UnityEngine; using VRC.SDK3.Data; -using VRC.SDK3.UdonNetworkCalling; using VRC.SDKBase; -using VRC.SDKBase.Midi; -using VRC.Udon.Common.Interfaces; public enum RoundType @@ -46,16 +42,17 @@ public class GameManagerBase : UdonSharpBehaviour [SerializeField] protected HostCardManager _HostCard = null; [SerializeField] protected CaseManager _CaseManager; [SerializeField] protected AudioManager _AudioManager; - [SerializeField] protected Microphone _PlayerMicrophone; - [SerializeField] protected Microphone _AudienceSilencer; + [SerializeField] protected Microphone _PlayerMicrophone = null; + [SerializeField] protected Microphone _AudienceSilencer = null; [Space] [SerializeField] private PositionMarker _HostPositionMarker; [SerializeField] private PositionMarker[] _PlayerPositionMarkers; [Space] [SerializeField] protected CameraControllerBase _CameraController; + [UdonSynced] private bool _Initialised = false; - private bool _Initialised = false; + private bool _IsHostEnabled = false; private bool _AllowInteractionFromHostCard = false; @@ -76,6 +73,26 @@ public class GameManagerBase : UdonSharpBehaviour base.OnOwnershipTransferred(Player); } + public void HostEnabled() + { + _IsHostEnabled = true; + + if (IsRoundInitialised()) + { + EnablePlayerMicrophone(true); + } + } + + public void HostDisabled() + { + _IsHostEnabled = false; + + if (IsRoundInitialised()) + { + EnablePlayerMicrophone(false); + } + } + public VRCPlayerApi GetHostOwner() { return _CaseManager.GetHostOwner(); @@ -107,11 +124,14 @@ public class GameManagerBase : UdonSharpBehaviour public virtual void InitialiseGameMode() { + _Initialised = true; + SetOwnershipOfObjects(_CaseManager.GetHostOwner()); _AllowInteractionFromHostCard = true; - SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnablePlayerMicrophone), true); + EnablePlayerMicrophone(true); + EnableAudienceSilencer(false); _HostPositionMarker.SetPlayer(_CaseManager.GetHostOwner().displayName); string[] WinningPlayers = _CaseManager.GetCurrentWinningPlayers(); @@ -129,12 +149,13 @@ public class GameManagerBase : UdonSharpBehaviour _PlayerPositionMarkers[i].SetPlayer(PlayerName); } - _Initialised = true; + RequestSerialization(); } public virtual void DeinitialiseGameMode() { - SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnablePlayerMicrophone), false); + EnablePlayerMicrophone(false); + EnableAudienceSilencer(true); _HostPositionMarker.ClearPlayer(); for (int i = 0; i < _PlayerPositionMarkers.Length; i++) @@ -143,6 +164,8 @@ public class GameManagerBase : UdonSharpBehaviour } _Initialised = false; + + RequestSerialization(); } public bool IsRoundInitialised() @@ -150,24 +173,28 @@ public class GameManagerBase : UdonSharpBehaviour return _Initialised; } - [NetworkCallable] public void EnablePlayerMicrophone(bool Enable) { - _PlayerMicrophone.gameObject.SetActive(Enable); + if (_PlayerMicrophone && _IsHostEnabled) + { + _PlayerMicrophone.EnableMicrophone(Enable); + } } - [NetworkCallable] public void EnableAudienceSilencer(bool Enable) { - _AudienceSilencer.gameObject.SetActive(Enable); + if (_AudienceSilencer && _IsHostEnabled) + { + _AudienceSilencer.EnableMicrophone(Enable); + } } public virtual void SetOwnershipOfObjects(VRCPlayerApi NewOwner) { Networking.SetOwner(NewOwner, _HostVideoLoadIndicator.gameObject); - Networking.SetOwner(NewOwner, _PlayerMicrophone.gameObject); - Networking.SetOwner(NewOwner, _AudienceSilencer.gameObject); + if (_PlayerMicrophone) Networking.SetOwner(NewOwner, _PlayerMicrophone.gameObject); + if (_AudienceSilencer) Networking.SetOwner(NewOwner, _AudienceSilencer.gameObject); } public virtual void LoadQuestionData(DataToken Data) { } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index 3873b61..390ee51 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 37 + Data: 38 - Name: Entry: 7 Data: @@ -636,6 +636,60 @@ MonoBehaviour: - 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: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 44|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: _IsHostEnabled + - Name: $v + Entry: 7 + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _IsHostEnabled + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: Entry: 6 Data: @@ -647,7 +701,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -671,7 +725,7 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard @@ -695,7 +749,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -719,13 +773,13 @@ MonoBehaviour: Data: _TiebreakerData - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TiebreakerData - Name: k__BackingField Entry: 7 - Data: 47|System.RuntimeType, mscorlib + Data: 50|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCUrl, VRCSDKBase @@ -734,7 +788,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 47 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -749,13 +803,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 49|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 52|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -764,7 +818,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -788,7 +842,7 @@ MonoBehaviour: Data: _GameHasBegun - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameHasBegun @@ -812,13 +866,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 53|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 56|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -842,13 +896,13 @@ MonoBehaviour: Data: _QuestionIndex - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionIndex - Name: k__BackingField Entry: 7 - Data: 55|System.RuntimeType, mscorlib + Data: 58|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -857,61 +911,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 55 - - 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: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 57|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: _QuestionStage - - Name: $v - Entry: 7 - Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _QuestionStage - - Name: k__BackingField - Entry: 9 - Data: 55 - - Name: k__BackingField - Entry: 9 - Data: 55 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -953,19 +953,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionSubstage + Data: _QuestionStage - Name: $v Entry: 7 Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionSubstage + Data: _QuestionStage - Name: k__BackingField Entry: 9 - Data: 55 + Data: 58 - Name: k__BackingField Entry: 9 - Data: 55 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1007,19 +1007,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionCorrectResponse + Data: _QuestionSubstage - Name: $v Entry: 7 Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionCorrectResponse + Data: _QuestionSubstage - Name: k__BackingField Entry: 9 - Data: 55 + Data: 58 - Name: k__BackingField Entry: 9 - Data: 55 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1061,25 +1061,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentQuestionType + Data: _QuestionCorrectResponse - Name: $v Entry: 7 Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentQuestionType + Data: _QuestionCorrectResponse - Name: k__BackingField - Entry: 7 - Data: 68|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: RoundSegmentType, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 58 - Name: k__BackingField Entry: 9 - Data: 55 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1094,13 +1088,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 70|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1121,31 +1115,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionsList + Data: _CurrentQuestionType - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionsList + Data: _CurrentQuestionType - Name: k__BackingField Entry: 7 - Data: 72|System.RuntimeType, mscorlib + Data: 71|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Data.DataList, VRCSDK3 + Data: RoundSegmentType, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 72 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -1154,10 +1148,16 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 73|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -1175,19 +1175,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentQuestion + Data: _QuestionsList - Name: $v Entry: 7 Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentQuestion + Data: _QuestionsList - Name: k__BackingField Entry: 7 Data: 75|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + Data: VRC.SDK3.Data.DataList, VRCSDK3 - Name: Entry: 8 Data: @@ -1229,10 +1229,64 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _BuzzInAllowed + Data: _CurrentQuestion - Name: $v Entry: 7 Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CurrentQuestion + - Name: k__BackingField + Entry: 7 + Data: 78|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 78 + - 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: 79|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: _BuzzInAllowed + - Name: $v + Entry: 7 + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BuzzInAllowed @@ -1256,13 +1310,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 78|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: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 82|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1286,13 +1340,13 @@ MonoBehaviour: Data: _PlayerBuzzInAllowed - Name: $v Entry: 7 - Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerBuzzInAllowed - Name: k__BackingField Entry: 7 - Data: 81|System.RuntimeType, mscorlib + Data: 84|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean[], mscorlib @@ -1301,61 +1355,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 81 - - 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: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 83|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: _BuzzedInPlayer - - Name: $v - Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _BuzzedInPlayer - - Name: k__BackingField - Entry: 9 - Data: 55 - - Name: k__BackingField - Entry: 9 - Data: 55 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1397,25 +1397,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FinalRoundPlayersSortedByScore + Data: _BuzzedInPlayer - Name: $v Entry: 7 Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FinalRoundPlayersSortedByScore + Data: _BuzzedInPlayer - Name: k__BackingField - Entry: 7 - Data: 88|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32[], mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 58 - Name: k__BackingField Entry: 9 - Data: 88 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1430,13 +1424,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 89|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1457,19 +1451,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TiebreakerPlayerNumbers + Data: _FinalRoundPlayersSortedByScore - Name: $v Entry: 7 - Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TiebreakerPlayerNumbers + Data: _FinalRoundPlayersSortedByScore - Name: k__BackingField - Entry: 9 - Data: 88 + Entry: 7 + Data: 91|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32[], mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 88 + Data: 91 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1511,16 +1511,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerPodiums + Data: _TiebreakerPlayerNumbers - Name: $v Entry: 7 Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _TiebreakerPlayerNumbers + - Name: k__BackingField + Entry: 9 + Data: 91 + - Name: k__BackingField + Entry: 9 + Data: 91 + - 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: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 96|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: _PlayerPodiums + - Name: $v + Entry: 7 + Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerPodiums - Name: k__BackingField Entry: 7 - Data: 95|System.RuntimeType, mscorlib + Data: 98|System.RuntimeType, mscorlib - Name: Entry: 1 Data: PlayerPodium[], Assembly-CSharp @@ -1544,13 +1598,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 97|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 100|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1559,7 +1613,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 98|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 101|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1583,13 +1637,13 @@ MonoBehaviour: Data: _VideoPlayer - Name: $v Entry: 7 - Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoPlayer - Name: k__BackingField Entry: 7 - Data: 100|System.RuntimeType, mscorlib + Data: 103|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CaseVideoSyncPlayer, Assembly-CSharp @@ -1613,14 +1667,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 102|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 105|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1629,7 +1683,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 103|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 106|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Props @@ -1638,7 +1692,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 104|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 107|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1662,13 +1716,13 @@ MonoBehaviour: Data: _ACMECrimenetComputer - Name: $v Entry: 7 - Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ACMECrimenetComputer - Name: k__BackingField Entry: 7 - Data: 106|System.RuntimeType, mscorlib + Data: 109|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ACMECrimenetComputer, Assembly-CSharp @@ -1692,14 +1746,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 110|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 108|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 111|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1723,13 +1777,13 @@ MonoBehaviour: Data: _VideoMusicClueSkateboard - Name: $v Entry: 7 - Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoMusicClueSkateboard - Name: k__BackingField Entry: 7 - Data: 110|System.RuntimeType, mscorlib + Data: 113|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VideoMusicClueSkateboard, Assembly-CSharp @@ -1753,14 +1807,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 114|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 112|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 115|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1784,13 +1838,13 @@ MonoBehaviour: Data: _DetectiveNoirEffect - Name: $v Entry: 7 - Data: 113|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _DetectiveNoirEffect - Name: k__BackingField Entry: 7 - Data: 114|System.RuntimeType, mscorlib + Data: 117|System.RuntimeType, mscorlib - Name: Entry: 1 Data: DetectiveNoirEffect, Assembly-CSharp @@ -1814,14 +1868,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 118|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 116|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 119|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1845,13 +1899,13 @@ MonoBehaviour: Data: _FilingCabinet - Name: $v Entry: 7 - Data: 117|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 120|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FilingCabinet - Name: k__BackingField Entry: 7 - Data: 118|System.RuntimeType, mscorlib + Data: 121|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FilingCabinet, Assembly-CSharp @@ -1875,14 +1929,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 119|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 120|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 123|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1906,13 +1960,13 @@ MonoBehaviour: Data: _Modem - Name: $v Entry: 7 - Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Modem - Name: k__BackingField Entry: 7 - Data: 122|System.RuntimeType, mscorlib + Data: 125|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Modem, Assembly-CSharp @@ -1936,14 +1990,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 123|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 126|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 124|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 127|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1967,13 +2021,13 @@ MonoBehaviour: Data: _ArrivalDisplays - Name: $v Entry: 7 - Data: 125|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 128|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ArrivalDisplays - Name: k__BackingField Entry: 7 - Data: 126|System.RuntimeType, mscorlib + Data: 129|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ArrivalDisplay[], Assembly-CSharp @@ -1997,14 +2051,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 127|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 130|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 128|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 131|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2028,13 +2082,13 @@ MonoBehaviour: Data: _LightningRoundAnimator - Name: $v Entry: 7 - Data: 129|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 132|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LightningRoundAnimator - Name: k__BackingField Entry: 7 - Data: 130|System.RuntimeType, mscorlib + Data: 133|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -2043,7 +2097,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 130 + Data: 133 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2058,14 +2112,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 131|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 134|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 132|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 135|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -2074,68 +2128,13 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 133|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 136|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Effects - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 134|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: _TheChaseAnimator - - Name: $v - Entry: 7 - Data: 135|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _TheChaseAnimator - - Name: k__BackingField - Entry: 9 - Data: 130 - - Name: k__BackingField - Entry: 9 - Data: 130 - - 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: 136|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 137|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -2159,25 +2158,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraControllerRound1 + Data: _TheChaseAnimator - Name: $v Entry: 7 Data: 138|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraControllerRound1 + Data: _TheChaseAnimator - Name: k__BackingField - Entry: 7 - Data: 139|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraControllerRound1, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 133 - Name: k__BackingField Entry: 9 - Data: 4 + Data: 133 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2189,14 +2182,20 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 140|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 139|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 140|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -2214,25 +2213,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _VideoPlayerTimer + Data: _CameraControllerRound1 - Name: $v Entry: 7 Data: 141|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _VideoPlayerTimer + Data: _CameraControllerRound1 - Name: k__BackingField Entry: 7 Data: 142|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Single, mscorlib + Data: CameraControllerRound1, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 142 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2264,6 +2263,61 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _VideoPlayerTimer + - Name: $v + Entry: 7 + Data: 144|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoPlayerTimer + - Name: k__BackingField + Entry: 7 + Data: 145|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 145 + - 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: 146|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 268d56b..5f298ff 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -107,8 +107,6 @@ public class GameManagerRound1 : GameManagerBase Display.Activate(false); } - SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), true); - _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.WhereInTheWorld); SendCustomEventDelayedSeconds(nameof(PlaySecondPartOfThemeMusic), 3.6666666666f); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index c3ce42d..bc864a1 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 31 + Data: 32 - Name: Entry: 7 Data: @@ -636,6 +636,60 @@ MonoBehaviour: - 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: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 44|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: _IsHostEnabled + - Name: $v + Entry: 7 + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _IsHostEnabled + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: Entry: 6 Data: @@ -647,7 +701,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -671,7 +725,7 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard @@ -695,7 +749,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -719,13 +773,13 @@ MonoBehaviour: Data: _PlayerPodiums - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerPodiums - Name: k__BackingField Entry: 7 - Data: 47|System.RuntimeType, mscorlib + Data: 50|System.RuntimeType, mscorlib - Name: Entry: 1 Data: PlayerPodiumRound2[], Assembly-CSharp @@ -749,13 +803,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 49|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 52|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -764,7 +818,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -788,13 +842,13 @@ MonoBehaviour: Data: _LocationBoard - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LocationBoard - Name: k__BackingField Entry: 7 - Data: 52|System.RuntimeType, mscorlib + Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 Data: LocationBoard, Assembly-CSharp @@ -818,13 +872,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 54|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 57|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -833,7 +887,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -857,13 +911,13 @@ MonoBehaviour: Data: _JailChain - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailChain - Name: k__BackingField Entry: 7 - Data: 57|System.RuntimeType, mscorlib + Data: 60|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailChain, Assembly-CSharp @@ -887,13 +941,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 58|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: 59|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -917,13 +971,13 @@ MonoBehaviour: Data: _JailPhone - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPhone - Name: k__BackingField Entry: 7 - Data: 61|System.RuntimeType, mscorlib + Data: 64|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailPhone, Assembly-CSharp @@ -947,13 +1001,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 62|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: 63|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -977,13 +1031,13 @@ MonoBehaviour: Data: _PlayerConfettiCannons - Name: $v Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerConfettiCannons - Name: k__BackingField Entry: 7 - Data: 65|System.RuntimeType, mscorlib + Data: 68|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.ParticleSystem[], UnityEngine.ParticleSystemModule @@ -992,7 +1046,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 65 + Data: 68 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1007,13 +1061,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 67|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1037,13 +1091,13 @@ MonoBehaviour: Data: _ArrivalDisplays - Name: $v Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ArrivalDisplays - Name: k__BackingField Entry: 7 - Data: 69|System.RuntimeType, mscorlib + Data: 72|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ArrivalDisplay[], Assembly-CSharp @@ -1067,13 +1121,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 71|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1097,13 +1151,13 @@ MonoBehaviour: Data: _JailPlayer - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPlayer - Name: k__BackingField Entry: 7 - Data: 73|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -1127,13 +1181,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 75|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1157,13 +1211,13 @@ MonoBehaviour: Data: _Location - Name: $v Entry: 7 - Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Location - Name: k__BackingField Entry: 7 - Data: 77|System.RuntimeType, mscorlib + Data: 80|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib @@ -1172,7 +1226,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 77 + Data: 80 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1187,19 +1241,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 82|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 80|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 83|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1223,13 +1277,13 @@ MonoBehaviour: Data: _Landmarks - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Landmarks - Name: k__BackingField Entry: 7 - Data: 82|System.RuntimeType, mscorlib + Data: 85|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -1238,7 +1292,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 82 + Data: 85 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1253,13 +1307,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 84|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 87|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1283,13 +1337,13 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 7 - Data: 86|System.RuntimeType, mscorlib + Data: 89|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -1298,61 +1352,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 86 - - 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: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 88|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: _CurrentPlayerCounter - - Name: $v - Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CurrentPlayerCounter - - Name: k__BackingField - Entry: 9 - Data: 86 - - Name: k__BackingField - Entry: 9 - Data: 86 + Data: 89 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1394,19 +1394,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Players + Data: _CurrentPlayerCounter - Name: $v Entry: 7 Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Players + Data: _CurrentPlayerCounter - Name: k__BackingField Entry: 9 - Data: 82 + Data: 89 - Name: k__BackingField Entry: 9 - Data: 82 + Data: 89 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1448,19 +1448,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _RoundIsOver + Data: _Players - Name: $v Entry: 7 Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _RoundIsOver + Data: _Players - Name: k__BackingField Entry: 9 - Data: 42 + Data: 85 - Name: k__BackingField Entry: 9 - Data: 42 + Data: 85 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1502,16 +1502,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraControllerRound2 + Data: _RoundIsOver - Name: $v Entry: 7 Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _RoundIsOver + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 9 + Data: 42 + - 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: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 100|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: _CameraControllerRound2 + - Name: $v + Entry: 7 + Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound2 - Name: k__BackingField Entry: 7 - Data: 99|System.RuntimeType, mscorlib + Data: 102|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound2, Assembly-CSharp @@ -1535,7 +1589,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1560,7 +1614,7 @@ MonoBehaviour: Data: _PlayingJailCall - Name: $v Entry: 7 - Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayingJailCall @@ -1584,7 +1638,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 105|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1609,71 +1663,16 @@ MonoBehaviour: Data: _PanelToReveal_Cache - Name: $v Entry: 7 - Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PanelToReveal_Cache - Name: k__BackingField Entry: 9 - Data: 86 + Data: 89 - Name: k__BackingField Entry: 9 - Data: 86 - - 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: 104|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: COLOR_STANDARD - - Name: $v - Entry: 7 - Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_STANDARD - - Name: k__BackingField - Entry: 7 - Data: 106|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 106 + Data: 89 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1710,19 +1709,74 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_RED + Data: COLOR_STANDARD - Name: $v Entry: 7 Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_STANDARD + - Name: k__BackingField + Entry: 7 + Data: 109|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Color, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 109 + - 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: 110|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: COLOR_RED + - Name: $v + Entry: 7 + Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_RED - Name: k__BackingField Entry: 9 - Data: 106 + Data: 109 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 109 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1737,7 +1791,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1762,16 +1816,16 @@ MonoBehaviour: Data: COLOR_YELLOW - Name: $v Entry: 7 - Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 113|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_YELLOW - Name: k__BackingField Entry: 9 - Data: 106 + Data: 109 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 109 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1786,7 +1840,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 114|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1811,16 +1865,16 @@ MonoBehaviour: Data: COLOR_GREEN - Name: $v Entry: 7 - Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_GREEN - Name: k__BackingField Entry: 9 - Data: 106 + Data: 109 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 109 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1835,7 +1889,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 116|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index bd12286..d52a559 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -79,8 +79,6 @@ public class GameManagerRound2 : GameManagerBase Display.Activate(true); } - SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), true); - _CameraControllerRound2.InitialiseCameras(); _CameraControllerRound2.DisableAllSwitchers(); _CameraControllerRound2.SwitchToModemCamera(); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset index 6b3cc7f..4d02da5 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 31 + Data: 32 - Name: Entry: 7 Data: @@ -636,6 +636,60 @@ MonoBehaviour: - 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: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 44|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: _IsHostEnabled + - Name: $v + Entry: 7 + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _IsHostEnabled + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: Entry: 6 Data: @@ -647,7 +701,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -671,7 +725,7 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard @@ -695,7 +749,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -719,13 +773,13 @@ MonoBehaviour: Data: _Maps - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Maps - Name: k__BackingField Entry: 7 - Data: 47|System.RuntimeType, mscorlib + Data: 50|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FloorMap[], Assembly-CSharp @@ -749,13 +803,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 49|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 52|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -764,7 +818,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -788,13 +842,13 @@ MonoBehaviour: Data: _Markers - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Markers - Name: k__BackingField Entry: 7 - Data: 52|System.RuntimeType, mscorlib + Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FloorMapMarker[], Assembly-CSharp @@ -818,13 +872,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 57|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -848,13 +902,13 @@ MonoBehaviour: Data: _CaptureCarmenNewspaper - Name: $v Entry: 7 - Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaptureCarmenNewspaper - Name: k__BackingField Entry: 7 - Data: 56|System.RuntimeType, mscorlib + Data: 59|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CaptureCarmenNewspaper, Assembly-CSharp @@ -878,13 +932,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -908,13 +962,13 @@ MonoBehaviour: Data: _NewspaperPublicDisplay - Name: $v Entry: 7 - Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _NewspaperPublicDisplay - Name: k__BackingField Entry: 7 - Data: 60|System.RuntimeType, mscorlib + Data: 63|System.RuntimeType, mscorlib - Name: Entry: 1 Data: NewspaperDisplay, Assembly-CSharp @@ -938,13 +992,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 61|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: 62|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -968,13 +1022,13 @@ MonoBehaviour: Data: _TimerPublicDisplay - Name: $v Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TimerPublicDisplay - Name: k__BackingField Entry: 7 - Data: 64|System.RuntimeType, mscorlib + Data: 67|System.RuntimeType, mscorlib - Name: Entry: 1 Data: TimerDisplay, Assembly-CSharp @@ -998,13 +1052,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1028,13 +1082,13 @@ MonoBehaviour: Data: _Scoreboard - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Scoreboard - Name: k__BackingField Entry: 7 - Data: 68|System.RuntimeType, mscorlib + Data: 71|System.RuntimeType, mscorlib - Name: Entry: 1 Data: SimpleEnable, Assembly-CSharp @@ -1058,13 +1112,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 73|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1088,13 +1142,13 @@ MonoBehaviour: Data: _TimerCameraOverlays - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TimerCameraOverlays - Name: k__BackingField Entry: 7 - Data: 72|System.RuntimeType, mscorlib + Data: 75|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraOverlay[], Assembly-CSharp @@ -1116,60 +1170,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 74|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: _NewspaperCameraOverlays - - Name: $v - Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _NewspaperCameraOverlays - - Name: k__BackingField - Entry: 9 - Data: 72 - - Name: k__BackingField - Entry: 9 - Data: 33 - - 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: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -1199,16 +1199,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _EndingPlayer + Data: _NewspaperCameraOverlays - Name: $v Entry: 7 Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _NewspaperCameraOverlays + - Name: k__BackingField + Entry: 9 + Data: 75 + - Name: k__BackingField + Entry: 9 + Data: 33 + - 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: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 80|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: _EndingPlayer + - Name: $v + Entry: 7 + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _EndingPlayer - Name: k__BackingField Entry: 7 - Data: 79|System.RuntimeType, mscorlib + Data: 82|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -1232,13 +1286,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 84|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1262,13 +1316,13 @@ MonoBehaviour: Data: _CurrentlyActiveMap - Name: $v Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentlyActiveMap - Name: k__BackingField Entry: 7 - Data: 83|System.RuntimeType, mscorlib + Data: 86|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ContinentMap, Assembly-CSharp @@ -1277,7 +1331,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 84|System.RuntimeType, mscorlib + Data: 87|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -1298,19 +1352,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 89|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 87|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 90|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1334,16 +1388,16 @@ MonoBehaviour: Data: _ActiveMarker - Name: $v Entry: 7 - Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ActiveMarker - Name: k__BackingField Entry: 9 - Data: 84 + Data: 87 - Name: k__BackingField Entry: 9 - Data: 84 + Data: 87 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1358,19 +1412,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 93|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 91|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 94|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1392,69 +1446,69 @@ MonoBehaviour: - Name: $k Entry: 1 Data: _StageIndex - - Name: $v - Entry: 7 - Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _StageIndex - - Name: k__BackingField - Entry: 9 - Data: 84 - - Name: k__BackingField - Entry: 9 - Data: 84 - - 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: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 94|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: _ContinentData - Name: $v Entry: 7 Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _StageIndex + - Name: k__BackingField + Entry: 9 + Data: 87 + - Name: k__BackingField + Entry: 9 + Data: 87 + - 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: _ContinentData + - Name: $v + Entry: 7 + Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ContinentData - Name: k__BackingField Entry: 7 - Data: 96|System.RuntimeType, mscorlib + Data: 99|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -1463,7 +1517,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 96 + Data: 99 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1478,7 +1532,8 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 97|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 @@ -1502,13 +1557,13 @@ MonoBehaviour: Data: _GameStatus - Name: $v Entry: 7 - Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameStatus - Name: k__BackingField Entry: 7 - Data: 99|System.RuntimeType, mscorlib + Data: 102|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameStatus, Assembly-CSharp @@ -1517,62 +1572,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 84 - - 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: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 101|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: _RunTimer - - Name: $v - Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _RunTimer - - Name: k__BackingField - Entry: 9 - Data: 42 - - Name: k__BackingField - Entry: 9 - Data: 42 + Data: 87 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1615,19 +1615,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Timer + Data: _RunTimer - Name: $v Entry: 7 Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Timer + Data: _RunTimer - Name: k__BackingField Entry: 9 - Data: 84 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 84 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1670,19 +1670,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _SuccessCounter + Data: _Timer - Name: $v Entry: 7 Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _SuccessCounter + Data: _Timer - Name: k__BackingField Entry: 9 - Data: 84 + Data: 87 - Name: k__BackingField Entry: 9 - Data: 84 + Data: 87 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1701,19 +1701,13 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 Data: 110|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 111|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - Name: Entry: 13 Data: @@ -1731,19 +1725,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FailureCounter + Data: _SuccessCounter - Name: $v Entry: 7 - Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FailureCounter + Data: _SuccessCounter - Name: k__BackingField Entry: 9 - Data: 84 + Data: 87 - Name: k__BackingField Entry: 9 - Data: 84 + Data: 87 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1758,20 +1752,81 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 114|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 113|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 115|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 114|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _FailureCounter + - Name: $v + Entry: 7 + Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FailureCounter + - Name: k__BackingField + Entry: 9 + Data: 87 + - Name: k__BackingField + Entry: 9 + Data: 87 + - 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: 116|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 117|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 118|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1795,13 +1850,13 @@ MonoBehaviour: Data: _CameraControllerRound3 - Name: $v Entry: 7 - Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 119|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound3 - Name: k__BackingField Entry: 7 - Data: 117|System.RuntimeType, mscorlib + Data: 120|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound3, Assembly-CSharp @@ -1823,61 +1878,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 118|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: _VideoPlayerTimer - - Name: $v - Entry: 7 - Data: 119|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _VideoPlayerTimer - - Name: k__BackingField - Entry: 7 - Data: 120|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Single, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 120 - - 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: 121|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], @@ -1897,6 +1897,61 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _VideoPlayerTimer + - Name: $v + Entry: 7 + Data: 122|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoPlayerTimer + - Name: k__BackingField + Entry: 7 + Data: 123|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 123 + - 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: 124|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 69c0789..4344cfe 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -123,8 +123,6 @@ public class GameManagerRound3 : GameManagerBase Overlay.EnableOverlayElements(false); } - SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), false); - _CameraControllerRound3.InitialiseCameras(); _CameraControllerRound3.PlayIFeelGood(true); DeinitialiseGameplayCameraFollowers(); diff --git a/Assets/UdonSharp/Microphone.asset b/Assets/UdonSharp/Microphone.asset index 690fa2c..ad8cc2e 100644 --- a/Assets/UdonSharp/Microphone.asset +++ b/Assets/UdonSharp/Microphone.asset @@ -19,7 +19,7 @@ MonoBehaviour: sourceCsScript: {fileID: 11500000, guid: 0fa4104b3414f05428aa283f01b2ca53, type: 3} scriptVersion: 2 compiledVersion: 2 - behaviourSyncMode: 2 + behaviourSyncMode: 4 hasInteractEvent: 0 scriptID: 1032960944844727064 serializationData: @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 3 + Data: 4 - Name: Entry: 7 Data: @@ -164,16 +164,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _EnteredPlayers + Data: _Enabled - Name: $v Entry: 7 Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _EnteredPlayers + Data: _Enabled - Name: k__BackingField Entry: 7 Data: 10|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 10 + - 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: 11|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 12|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: _QueuedPlayers + - Name: $v + Entry: 7 + Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _QueuedPlayers + - Name: k__BackingField + Entry: 7 + Data: 14|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCPlayerApi[], VRCSDKBase @@ -182,7 +242,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 10 + Data: 14 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -197,7 +257,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 11|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Microphone.cs b/Assets/UdonSharp/Microphone.cs index 09082a7..3c2dd96 100644 --- a/Assets/UdonSharp/Microphone.cs +++ b/Assets/UdonSharp/Microphone.cs @@ -1,69 +1,109 @@  -using System; using UdonSharp; using UnityEngine; using VRC.SDKBase; +using VRC.Udon.Common; -[UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)] +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class Microphone : UdonSharpBehaviour { [SerializeField] private float _MikedVoiceDistanceNear = 30.0f; [SerializeField] private float _MikedVoiceDistanceFar = 60.0f; - private VRCPlayerApi[] _EnteredPlayers = new VRCPlayerApi[MAX_PLAYERS]; + [UdonSynced] private bool _Enabled = false; + + private VRCPlayerApi[] _QueuedPlayers = new VRCPlayerApi[MAX_PLAYERS]; + private const int MAX_PLAYERS = 100; private const float DEFAULT_VOICE_DISTANCE_NEAR = 0.0f; private const float DEFAULT_VOICE_DISTANCE_FAR = 25.0f; - private const int MAX_PLAYERS = 100; + + public override void OnDeserialization(DeserializationResult Result) + { + _EnableMicrophone_Synced(); + + base.OnDeserialization(Result); + } public override void OnPlayerTriggerEnter(VRCPlayerApi Player) { - Player.SetVoiceDistanceNear(_MikedVoiceDistanceNear); - Player.SetVoiceDistanceFar(_MikedVoiceDistanceFar); - - for (int i = 0; i < _EnteredPlayers.Length; i++) + for (int i = 0; i < _QueuedPlayers.Length; i++) { - if (_EnteredPlayers[i] == null) + if (_QueuedPlayers[i] == null) { - _EnteredPlayers[i] = Player; + _QueuedPlayers[i] = Player; break; } } + if (_Enabled) + { + Player.SetVoiceDistanceNear(_MikedVoiceDistanceNear); + Player.SetVoiceDistanceFar(_MikedVoiceDistanceFar); + } + base.OnPlayerTriggerEnter(Player); } public override void OnPlayerTriggerExit(VRCPlayerApi Player) { - Player.SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); - Player.SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); - - for (int i = 0; i < _EnteredPlayers.Length; i++) + for (int i = 0; i < _QueuedPlayers.Length; i++) { - if (_EnteredPlayers[i] == Player) + if (_QueuedPlayers[i] == Player) { - _EnteredPlayers[i] = null; + _QueuedPlayers[i] = null; break; } } + if (_Enabled) + { + Player.SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); + Player.SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); + } + base.OnPlayerTriggerExit(Player); } - - public void OnDisable() + public override void OnPlayerJoined(VRCPlayerApi Player) { - for (int i = 0; i < _EnteredPlayers.Length; i++) + Player.SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); + Player.SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); + + base.OnPlayerJoined(Player); + } + + public override void OnPlayerLeft(VRCPlayerApi Player) + { + Player.SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); + Player.SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); + + base.OnPlayerLeft(Player); + } + + + public void EnableMicrophone(bool Enable) + { + if (Networking.IsOwner(gameObject)) { - if (_EnteredPlayers[i] != null && _EnteredPlayers[i].IsValid()) + _Enabled = Enable; + _EnableMicrophone_Synced(); + RequestSerialization(); + } + } + private void _EnableMicrophone_Synced() + { + for (int i = 0; i < _QueuedPlayers.Length; i++) + { + if (_QueuedPlayers[i] != null) { - _EnteredPlayers[i].SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); - _EnteredPlayers[i].SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); + _QueuedPlayers[i].SetVoiceDistanceNear(_Enabled ? _MikedVoiceDistanceNear : DEFAULT_VOICE_DISTANCE_NEAR); + _QueuedPlayers[i].SetVoiceDistanceFar(_Enabled ? _MikedVoiceDistanceFar : DEFAULT_VOICE_DISTANCE_FAR); + break; } - _EnteredPlayers[i] = null; } } } diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: -- 2.39.5