From eabb7f95e47fcadd50de782ddb0780acd89cd9db Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Sat, 2 May 2026 20:12:58 -0400 Subject: [PATCH] Microphones now work locally, which doesn't seem to work. Experimenting. --- .../Scenes/witwics/OcclusionCullingData.asset | 604 +++++++++--------- .../Game Managers/GameManagerBase.cs | 2 + .../Game Managers/GameManagerRound1.cs | 2 - .../Game Managers/GameManagerRound2.cs | 2 - .../Game Managers/GameManagerRound3.cs | 2 - Assets/UdonSharp/Microphone.asset | 6 +- Assets/UdonSharp/Microphone.cs | 93 +-- .../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 +- 14 files changed, 349 insertions(+), 376 deletions(-) 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.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index 638d48a..af340bc 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -131,6 +131,7 @@ public class GameManagerBase : UdonSharpBehaviour _AllowInteractionFromHostCard = true; EnablePlayerMicrophone(true); + EnableAudienceSilencer(false); _HostPositionMarker.SetPlayer(_CaseManager.GetHostOwner().displayName); string[] WinningPlayers = _CaseManager.GetCurrentWinningPlayers(); @@ -154,6 +155,7 @@ public class GameManagerBase : UdonSharpBehaviour public virtual void DeinitialiseGameMode() { EnablePlayerMicrophone(false); + EnableAudienceSilencer(true); _HostPositionMarker.ClearPlayer(); for (int i = 0; i < _PlayerPositionMarkers.Length; i++) 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.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.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 33d58e0..ba1a623 100644 --- a/Assets/UdonSharp/Microphone.asset +++ b/Assets/UdonSharp/Microphone.asset @@ -290,19 +290,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _EnteredPlayers + Data: _LocalOverlapCounter - Name: $v Entry: 7 Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _EnteredPlayers + Data: _LocalOverlapCounter - Name: k__BackingField Entry: 7 Data: 19|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDKBase.VRCPlayerApi[], VRCSDKBase + Data: System.Int32, mscorlib - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Microphone.cs b/Assets/UdonSharp/Microphone.cs index bbaab43..0cf1e45 100644 --- a/Assets/UdonSharp/Microphone.cs +++ b/Assets/UdonSharp/Microphone.cs @@ -2,6 +2,7 @@ using UdonSharp; using UnityEngine; using VRC.SDKBase; +using VRC.Udon.Common; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] @@ -14,31 +15,25 @@ public class Microphone : UdonSharpBehaviour [UdonSynced] private bool _MicrophoneEnabled = false; - private VRCPlayerApi[] _EnteredPlayers = new VRCPlayerApi[MAX_PLAYERS]; + private int _LocalOverlapCounter = 0; 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) { - for (int i = 0; i < _EnteredPlayers.Length; i++) + if (Player == Networking.LocalPlayer) { - if (_EnteredPlayers[i] == null) - { - _EnteredPlayers[i] = Player; - break; - } - } - - if (_MicrophoneEnabled && _LocalPlayerIsAllowedToSetMicrophone()) - { - Debug.Log("[Microphone] Microphone " + gameObject.name + " is now changing volume settings for player " + Player.displayName); - - Player.SetVoiceDistanceNear(_MikedVoiceDistanceNear); - Player.SetVoiceDistanceFar(_MikedVoiceDistanceFar); + _LocalOverlapCounter++; + _UpdateMicrophoneEffect(); } base.OnPlayerTriggerEnter(Player); @@ -46,24 +41,10 @@ public class Microphone : UdonSharpBehaviour public override void OnPlayerTriggerExit(VRCPlayerApi Player) { - if (Player != null && Player.IsValid()) + if (Player == Networking.LocalPlayer) { - for (int i = 0; i < _EnteredPlayers.Length; i++) - { - if (_EnteredPlayers[i] == Player) - { - _EnteredPlayers[i] = null; - break; - } - } - - if (_MicrophoneEnabled && _LocalPlayerIsAllowedToSetMicrophone()) - { - Debug.Log("[Microphone] Microphone " + gameObject.name + " is now changing volume settings for player " + Player.displayName); - - Player.SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); - Player.SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); - } + _LocalOverlapCounter--; + _UpdateMicrophoneEffect(); } base.OnPlayerTriggerExit(Player); @@ -71,21 +52,21 @@ public class Microphone : UdonSharpBehaviour public override void OnPlayerJoined(VRCPlayerApi Player) { - Player.SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); - Player.SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); + if (Player == Networking.LocalPlayer) + { + Networking.LocalPlayer.SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); + Networking.LocalPlayer.SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); + } base.OnPlayerJoined(Player); } public override void OnPlayerLeft(VRCPlayerApi Player) { - for (int i = 0; i < _EnteredPlayers.Length; i++) + if (Player == Networking.LocalPlayer) { - if (_EnteredPlayers[i] == Player) - { - _EnteredPlayers[i] = null; - break; - } + Networking.LocalPlayer.SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); + Networking.LocalPlayer.SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); } base.OnPlayerLeft(Player); @@ -94,30 +75,22 @@ public class Microphone : UdonSharpBehaviour public void EnableMicrophone(bool Enable) { - _MicrophoneEnabled = Enable; - - Debug.Log("[Microphone] Microphone is now " + (Enable ? "en" : "dis") + "abled"); - - if (_LocalPlayerIsAllowedToSetMicrophone()) + if (Networking.IsOwner(gameObject)) { - for (int i = 0; i < _EnteredPlayers.Length; i++) - { - if (_EnteredPlayers[i] != null && _EnteredPlayers[i].IsValid()) - { - Debug.Log("[Microphone] Microphone " + gameObject.name + " is now " + (_MicrophoneEnabled ? "en" : "dis") + "abled; changing volume settings for player " + _EnteredPlayers[i].displayName); - - _EnteredPlayers[i].SetVoiceDistanceNear(_MicrophoneEnabled ? _MikedVoiceDistanceNear : DEFAULT_VOICE_DISTANCE_NEAR); - _EnteredPlayers[i].SetVoiceDistanceFar(_MicrophoneEnabled ? _MikedVoiceDistanceFar : DEFAULT_VOICE_DISTANCE_FAR); - } - } + _MicrophoneEnabled = Enable; + _EnableMicrophone_Synced(); + RequestSerialization(); } - - RequestSerialization(); + } + private void _EnableMicrophone_Synced() + { + _UpdateMicrophoneEffect(); } - private bool _LocalPlayerIsAllowedToSetMicrophone() + private void _UpdateMicrophoneEffect() { - return _PermissionsPanel.IsPlayerHost(Networking.LocalPlayer) && Networking.IsOwner(gameObject); + Networking.LocalPlayer.SetVoiceDistanceNear((_MicrophoneEnabled && _LocalOverlapCounter > 0) ? _MikedVoiceDistanceNear : DEFAULT_VOICE_DISTANCE_NEAR); + Networking.LocalPlayer.SetVoiceDistanceFar((_MicrophoneEnabled && _LocalOverlapCounter > 0) ? _MikedVoiceDistanceFar : DEFAULT_VOICE_DISTANCE_FAR); } } diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: