diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 4edf2a5..70dc262 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -65,6 +65,7 @@ + @@ -130,6 +131,7 @@ + diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 16647cd..328f4eb 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -1536,6 +1536,96 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &59893113 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 59893114} + - component: {fileID: 59893116} + - component: {fileID: 59893115} + m_Layer: 0 + m_Name: All Players Assign Starter Points Timed Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &59893114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 59893113} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1882024111} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &59893115 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 59893113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: b84f3dc1edf53b846a172badddd49737, + type: 2} + programSource: {fileID: 11400000, guid: 1fc8e4389a71e5640b656e2c7fbabeed, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &59893116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 59893113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c74cc2036e37f74b874180a8ad0235f, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 59893115} + _CameraController: {fileID: 1524477936} + _SwitchFunctions: + - SwitchToAllPlayersCamera + _TimeBetweenCuts: + - 2 + _Loop: 1 + _LoopPoint: 0 + _FirstLoopCallbackObject: {fileID: 1524477936} + _FirstLoopCallbackFunction: ActivateHostAllPlayersCameraSwitcher --- !u!1 &59980717 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4890657577075576849, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -27543,7 +27633,7 @@ PrefabInstance: - target: {fileID: 4864630081371981118, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} propertyPath: m_Size - value: 0.055648055 + value: 0.054976325 objectReference: {fileID: 0} - target: {fileID: 4864630081371981118, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} @@ -32696,11 +32786,364 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 2969882400421288751, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1505012996412345085, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6445205270346311860, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8977109817004147847, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4386384075398485474, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2888037719168153736, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3462461190055913414, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3736987984960363364, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3493779430914120031, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 487242206886541527, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7774085157572165666, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 564606899942058985, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2981548147642198113, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 235551936818157113, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7176344159805374430, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6836934077588422963, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 9069814132220458577, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3146260931465986478, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5134564694786376964, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6296787482405892853, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5337141382341883700, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7987222996567612107, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 230268675029734762, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1180746375788270361, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7568263298984594256, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4922254248050895132, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7257645082127026710, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 855975179379529304, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4685079387466738708, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2509907884247730628, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4278294416394918735, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6038418771478975488, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6519673503178386284, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7060528423475343284, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6346479766109009468, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8909709920541811498, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 482505145312816729, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5388067776929518776, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6697260481432596013, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2572991608127440622, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 9017053648738604584, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 98723684001300960, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2415363498324129286, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3475558635769294213, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 133986656556800602, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 860750294196164220, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7165114894525852693, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2500472070598397703, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6674903660598654400, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3161993084823916952, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8388572901395246617, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7077871655475766209, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4277681710175590359, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 913541320183934054, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8373773850014533485, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3855838028837021941, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3748966126308667168, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8253948893178334064, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5369401041742473017, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1446864553743118434, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 798819547122979402, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8449548351241360901, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8196928918521661753, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5444463047985818603, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3184616226152735037, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7782815077458724174, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1366920061392258285, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2751393249218260827, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7906671412964905795, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2882770706746396214, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 193627551080430888, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6678638180516960491, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1639011629911826746, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8815557770235093850, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7133546705891452271, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1959271595632634191, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5427799271365820154, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 237986810760803473, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 477846089373594488, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3197331374753611691, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7005388266686561504, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3821860405083819675, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6002450406304304295, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7635127636783788891, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8731496854613744402, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 912028323663322608, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8557187188621064354, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2624988213397709308, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7686843096946280569, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1303286324524415835, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2006515666221662690, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5256892032054558136, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5611958872422432912, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4830771486736947185, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5961496339600124559, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4343758993267789267, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1358273331383159008, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6030350703339748341, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5521603009356814069, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1979138681802663797, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7466912228203672537, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7118602388983077669, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5529934045371575366, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7322778631553552063, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5494936355332628756, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1170750637939109613, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7506781912331200378, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5201952489578046220, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4763280380544414769, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5507079272261882736, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6072159882253768129, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1255698696157644172, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3511016065962082016, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 716785183018039891, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3867767933697703499, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1310528856328308700, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 256379845907129524, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2051267082569614915, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5760943452388294814, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2768074354095961931, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5326473744712746161, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5524256700441185016, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1862312077573066047, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8413171028451445363, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8050982873133063349, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1287464451121857954, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1549050927588159196, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8338300292619922875, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3984616038383198578, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4738100788793541022, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2630555056470768945, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6392531579399647586, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8469018587683384392, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 9191177440750115309, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7881659132892714145, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7613183757071400370, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3869715489732888034, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8806244259390085509, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7889366371492276303, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2610445696141464944, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2810348328009191578, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3764596084727973834, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 412420810022028745, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7110272767979465297, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7807214686781887576, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 564023671656343449, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5132446197101656515, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2844537944810694428, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4046273385659195465, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6491467086575547145, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3700708355762951575, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1899254121299668889, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5497746819056778457, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 153644020222765213, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 203426457990214771, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8777300212015048381, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3322717307679155768, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1295893939172431065, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3459333377006087247, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3243879516860903366, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1208862781794156684, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6578855853632868186, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8054691379550027069, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 9062586489424115942, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2231453637918195619, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 166488759539826561, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8416735266736393632, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5165519590231699123, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5164086953801407151, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6957481846390836973, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2418983369182787986, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7894493244644850990, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5663698847325749278, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7257211338211533365, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2249309917170579294, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5847192995378695944, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5908278861097409895, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1186267968458814722, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4519044737130626461, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1268280294142287376, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8354208905612536168, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2592871740692301771, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7362689199296611535, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6925606918008105281, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6426931815538630960, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1700397727734666858, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2704901352148493900, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7375825754419939954, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4097175893595280617, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2783669310979466919, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8229480506333499714, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8060153153609205163, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 393656373572503837, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5050755907944012903, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1044284272446094953, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3278398392658937366, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8477878610112134787, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6597641069785259454, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4335508790051723835, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 9141949880525453044, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4081453466872986276, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1105874884475237309, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4955174017317296569, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3296738789272990420, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7689253027853769172, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1504631107119136853, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7236401705492593010, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8451424082982191940, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7569736644108240746, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2277150012571308756, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8339436502238929433, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4487095156459452934, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3499568187699645740, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5222068986878315630, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4670889103342701437, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4898766649684483368, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6412175108557839222, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2358378437892658775, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3017690673774741429, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6400916404232616447, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4563413379977034570, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 9042811469928571805, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2233295185580130194, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5447995213679799995, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2359775482911942948, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4574464318199429030, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6363057101610804339, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4157766775217365986, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2730250627553543010, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5085936650965663745, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7580832433140696462, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 449790357280601493, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6540813075589382466, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2313153099190628991, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 793902081580529411, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5860008189289640683, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6688130572359737634, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6561687948548573984, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5305018200114671598, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1850458533435339960, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2984446516449092305, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7045625198437078890, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1125663142039588231, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5075799183843389688, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6848361772847921021, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6721835820344575524, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 54339086295838349, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2848717493791358294, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4944853171032174943, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2832324263987461412, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 256581437648572046, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 485757801124185534, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6670788768137605242, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4098925456345873383, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6519173317089096762, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2683705449394117495, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6671530172928110230, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3720202804210793762, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4485153032206038948, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8266766500507526108, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2005682733498254743, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7432503563270339536, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1079601578218281302, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6617412854519517564, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7611297391889462366, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8440171676685439201, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6938451414518102115, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2179810273908282002, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4952998286565214390, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3751140523497044893, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4883053149362597627, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6368057768228298246, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 9210564797108642423, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3530450799833686847, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4760560610418152093, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5562464118905138930, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3554031521215421543, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7434880282318026318, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1838330592156948017, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 896963823071358950, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7189312150493258098, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2206502370690173531, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3242460142338865132, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1175376963029210727, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 42542813633825096, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1392014694490602622, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 882097299278175638, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 9190028148991756985, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2354690141706324161, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6776117839163396376, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 647340914607155060, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4895505663525268513, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6973729929453855608, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8827223281723962849, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8913674991816076669, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3604722271102016397, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3560120839577352157, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1320832170817934473, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6586281409986849807, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6138755939873385247, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6464124392926272442, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4113512685930339028, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1869710739695261046, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6356510212550283522, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5546942659200011345, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1300354784033784524, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7037759111895679996, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3264092929192812665, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8181151895688994528, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5392706179048908926, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2089718206281081457, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8434407635049419487, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8617975536011792134, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7973118218717000857, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3706032983502557906, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2743430767574340131, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3012092833367293450, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3144718282017089781, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2615479894334007093, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 134978423163310833, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 2962925234829204839, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7964316252645718257, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3592140615280975651, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1799821264556048336, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5944645151053701386, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1682538744686597650, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1918881377901305473, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3781425593161812831, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1104330219787252642, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5658651342296438225, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7853780623425956185, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5702949786941874011, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 615470047957769281, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8627898167326548180, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6007464332999943653, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5508787644099931213, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6955651490990400406, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8303066067938824593, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8818606574437383818, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4596389856709236182, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 1615581567561920074, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4407022833956081533, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4081641959253526067, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5945019087994418534, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8083843208949881570, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8356417923500913287, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 3250675403823820639, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 4823127788067443333, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 7500636993089997479, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 5125300869095716221, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 6426465793565693655, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 8801940340690603809, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} + - {fileID: 976640931214142318, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 3495390273979718087, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} - insertIndex: 0 + insertIndex: -1 addedObject: {fileID: 1368898087} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0238c8b9ea16264f9feb540d3654bf3, type: 3} @@ -33710,6 +34153,90 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1081892970} m_PrefabAsset: {fileID: 0} +--- !u!1 &508235242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 508235243} + - component: {fileID: 508235245} + - component: {fileID: 508235244} + m_Layer: 0 + m_Name: Glass Shatter Collision + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &508235243 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 508235242} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.886, y: 0, z: -0.052} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1468254143} + - {fileID: 761529275} + m_Father: {fileID: 1427476863} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &508235244 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 508235242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: a942fafc9ed9f9b40a6e66bf0d241ff3, + type: 2} + programSource: {fileID: 11400000, guid: 4c076b0731838c8429acd6c503fb2c3c, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &508235245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 508235242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61cdcf3155f7a724fb1b9692617560ec, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 508235244} + _AudioManager: {fileID: 1947493795} --- !u!1 &509296276 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8094191378400714075, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -35378,12 +35905,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 552861270} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: 8.889002, y: 0, z: -3.595002} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1968710945} + m_Father: {fileID: 1882024111} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &552861272 MonoBehaviour: @@ -40311,18 +40838,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a14cb14e50950304eab77b70f4649c38, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &674142368 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5423613212279373759, guid: 700c7675bc7fcf547a888725c3536e38, - type: 3} - m_PrefabInstance: {fileID: 1559839983} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 674142360} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &676638910 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, @@ -43891,6 +44406,112 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 2.7434733, y: 5, z: 0.11430004} m_Center: {x: -1.3717198, y: 2.5, z: -0.057151217} +--- !u!1 &761529274 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 761529275} + - component: {fileID: 761529276} + - component: {fileID: 761529278} + - component: {fileID: 761529277} + m_Layer: 0 + m_Name: Shatter Execute + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &761529275 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761529274} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.67, z: -0.264} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 508235243} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &761529276 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761529274} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3.75, y: 2.54, z: 1.0023762} + m_Center: {x: 0.00000002856244, y: 0, z: -0.1878225} +--- !u!114 &761529277 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761529274} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 8055943f2cba94741a35b99a3625b7f0, + type: 2} + programSource: {fileID: 11400000, guid: 2d43b6d98e535384a8151aa170de0def, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &761529278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761529274} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e08ce9bec1b325428a0e59cffc80965, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 761529277} + _Notify: {fileID: 508235244} + _EnterEventName: ShatterEnter + _ExitEventName: --- !u!1 &762731330 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3638020402484674725, guid: be33bc7f6c414e6409becfa348b9310d, @@ -51022,6 +51643,7 @@ MonoBehaviour: - {fileID: 1993364535} - {fileID: 1589630268} _CameraConsole: {fileID: 674142366} + _PotatoModeImage: {fileID: 1968514085} --- !u!222 &967689116 CanvasRenderer: m_ObjectHideFlags: 0 @@ -64926,7 +65548,8 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1311764232} _CameraController: {fileID: 1355919010} - _SwitchToCameraTimer: {fileID: 35514607} + _EnterSwitchFunction: ActivateHostAllPlayersCameraSwitcher + _ExitSwitchFunction: --- !u!65 &1311764234 BoxCollider: m_ObjectHideFlags: 0 @@ -66273,7 +66896,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -520} + m_AnchoredPosition: {x: 320, y: -200} m_SizeDelta: {x: 640, y: 320} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1333952429 @@ -67835,7 +68458,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 45474.12} + m_SizeDelta: {x: 0, y: 45518.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1368898088 MonoBehaviour: @@ -67901,7 +68524,8 @@ MonoBehaviour: | SamsterBirdies | https://freesound.org/s/581404/ | CC0\r\nBrain Research Department | Wetscherinin | Wikimedia Commons | CC-BY 4.0 International\r\nTrojan Horse - Terra Mitica Benidorm | https://www.flickr.com/photos/youngun/7623601276 - | CC-BY-ND 2.0\r\n\r\n\r\n\r\n\r\nOriginal + | CC-BY-ND 2.0\r\nGlass Break Shatter; + Impacts.mp3 | PNMCarrieRailfan | https://freesound.org/s/682051/ | CC-BY-NC 4.0\r\n\r\n\r\n\r\n\r\nOriginal Series Credits\r\n\r\nSenior Producer\r\nHoward J. Blumenthal\r\nJonathan @@ -70018,12 +70642,32 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: f4209ba9c393af2458ad4629a4196850, + type: 3} + insertIndex: -1 + addedObject: {fileID: 508235243} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: f4209ba9c393af2458ad4629a4196850, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1488972619} m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f4209ba9c393af2458ad4629a4196850, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1427476873} - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f4209ba9c393af2458ad4629a4196850, type: 3} insertIndex: -1 addedObject: {fileID: 1427476868} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f4209ba9c393af2458ad4629a4196850, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1427476872} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f4209ba9c393af2458ad4629a4196850, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1427476871} m_SourcePrefab: {fileID: 100100000, guid: f4209ba9c393af2458ad4629a4196850, type: 3} --- !u!4 &1427476863 stripped Transform: @@ -70056,8 +70700,71 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 6.000003, y: 5, z: 0.11430121} - m_Center: {x: -3.0000052, y: 2.5, z: -0.057150137} + m_Size: {x: 2.047098, y: 5, z: 0.11430121} + m_Center: {x: -1.023572, y: 2.5, z: -0.05713692} +--- !u!65 &1427476871 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1427476864} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3.910427, y: 2.2000933, z: 0.11430121} + m_Center: {x: -3.901303, y: 3.8999534, z: -0.057135567} +--- !u!65 &1427476872 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1427476864} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3.9043527, y: 0.5033138, z: 0.11430121} + m_Center: {x: -3.8915007, y: 0.2516569, z: -0.05712961} +--- !u!65 &1427476873 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1427476864} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.25082913, y: 5, z: 0.11430121} + m_Center: {x: -5.874636, y: 2.5, z: -0.057131473} --- !u!1 &1428133775 GameObject: m_ObjectHideFlags: 0 @@ -71407,6 +72114,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1466541185} m_CullTransparentMesh: 1 +--- !u!1 &1468254142 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1468254143} + - component: {fileID: 1468254144} + - component: {fileID: 1468254146} + - component: {fileID: 1468254145} + m_Layer: 0 + m_Name: Shatter Prepare + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1468254143 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468254142} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.67, z: 0.571} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 508235243} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1468254144 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468254142} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3.75, y: 2.54, z: 0.7356629} + m_Center: {x: 0.000000018444602, y: 0, z: -0.13783118} +--- !u!114 &1468254145 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468254142} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 8055943f2cba94741a35b99a3625b7f0, + type: 2} + programSource: {fileID: 11400000, guid: 2d43b6d98e535384a8151aa170de0def, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1468254146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468254142} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e08ce9bec1b325428a0e59cffc80965, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1468254145} + _Notify: {fileID: 508235244} + _EnterEventName: PrepareEnter + _ExitEventName: PrepareExit --- !u!1 &1470552272 GameObject: m_ObjectHideFlags: 0 @@ -72745,6 +73558,100 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1488972618 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1427476863} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_LocalRotation.w + value: -8.659561e-17 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_ScaleInLightmap + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - target: {fileID: -7511558181221131132, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - target: {fileID: 919132149155446097, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_Name + value: SM_Round1WindowTrim + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 09d1d9f6a31381048ad412c72c4a1620, type: 3} +--- !u!4 &1488972619 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + m_PrefabInstance: {fileID: 1488972618} + m_PrefabAsset: {fileID: 0} --- !u!1 &1489648462 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6458581458612866833, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -77006,7 +77913,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 10 + value: 20 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -77424,6 +78331,7 @@ MonoBehaviour: HostCameraTrigger: {fileID: 1968710950} HostAndAllPlayersTimerToggle: {fileID: 552861273} HostAndIndividualPlayersTimerToggle: {fileID: 458165862} + AllPlayersAssignStarterPointsTimerToggle: {fileID: 59893116} MapToHostAndAllPlayersTimerToggle: {fileID: 1108468553} LightningStartToHostAndAllPlayersTimerToggle: {fileID: 1573395194} CorrectToHostAndAllPlayersTimerToggle: {fileID: 1170815126} @@ -93741,7 +94649,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 552861271} - {fileID: 458165860} + - {fileID: 59893114} - {fileID: 1108468551} - {fileID: 1573395196} - {fileID: 1170815124} @@ -96080,6 +96990,7 @@ MonoBehaviour: _LightSwitch: {fileID: 8300000, guid: c00d231b20e91fb4e862d9038821d7f8, type: 3} _PhoneRing: {fileID: 8300000, guid: e204469f7d81f814faa906180db7f455, type: 3} _TimerEnd: {fileID: 8300000, guid: 9c9e0cef11278c843b24b1eecdc17f05, type: 3} + _GlassShatter: {fileID: 8300000, guid: cbee3e7df548f184990e00cdb32e5742, type: 3} _CrookTheme_Contessa: {fileID: 8300000, guid: 82bb08241eeb0cf40a74d97c1e51b444, type: 3} _CrookTheme_DoubleTrouble: {fileID: 8300000, guid: e97b7d3dc5f0bfe46a77d46398bb2bb6, @@ -96999,7 +97910,7 @@ GameObject: - component: {fileID: 1968514085} - component: {fileID: 1968514084} m_Layer: 22 - m_Name: Button + m_Name: Potato Mode Button m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -97069,7 +97980,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 674142368} + - m_Target: {fileID: 967689114} m_TargetAssemblyTypeName: m_MethodName: SendCustomEvent m_Mode: 5 @@ -97150,8 +98061,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 552861271} + m_Children: [] m_Father: {fileID: 72003558} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1968710948 @@ -97224,7 +98134,8 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1968710949} _CameraController: {fileID: 1524477936} - _SwitchToCameraTimer: {fileID: 552861273} + _EnterSwitchFunction: ActivateHostAllPlayersCameraSwitcher + _ExitSwitchFunction: --- !u!1 &1970434647 GameObject: m_ObjectHideFlags: 0 @@ -117506,6 +118417,22 @@ MonoBehaviour: ID: 1303 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 508235242} + ID: 1304 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 761529274} + ID: 1305 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1468254142} + ID: 1306 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 59893113} + ID: 1307 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 87f32da..673cd57 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index 829fa66..e5bc19b 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/OcclusionCullingData.asset b/Assets/Scenes/witwics/OcclusionCullingData.asset index 2e7b9e2..8b9bdf5 100644 --- a/Assets/Scenes/witwics/OcclusionCullingData.asset +++ b/Assets/Scenes/witwics/OcclusionCullingData.asset @@ -7,7 +7,7 @@ OcclusionCullingData: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: OcclusionCullingData - m_PVSData: 120000d6902a8d40602900000000a04100000000000020c20000a0c10000a0c10000a0410000a04100002042200000005001000000000000010000006001000055000000700200000000000000000000700a0000a7000000a00100007100000000000000000000000000000000000000000000000000000000000000010000005002000000000000900100000100000001000000010000007001000080010000d00b0000000000000000000000000000000000000000000000000000542032302e3020534f20352e3020534820302e323530204246203130302046203020435320302e30202d20332e332e3232204620302030204f4720300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f000000000000000000000000010000000000000000000000000000003aba2740000000000000000000000000000000002d000000000000000000000009b2d38d100887e008a6f012b7901388301384311197300aa57042315113b880188dd01bc3a01c5031089110088f700882e00890600aa9e11a373209808011a0c1118410088930088f70108ad0089031099680219f40089c11080752080b42219320088010088460088570208330090f1111815010947009a3500a9360099800088410088320088f81100dc1099320081431128180108df00883300982000881000993f0088200099300000000000000000000000000000000000000ffff0000ffffffff000000000000000000000000f0f4c8c194c295bf86eb6dc1100b9f41ae470d4184eb6dc1c2f5c8c10000a0bf666676c13c0a9f4100000036cdccc4411f85adc1503e4abf35338fc11f85adc1375c1341cfccd841d6a30041c85278bf36338fc1d8a30041f07a1041d0ccd841fc4264c100806bb60ae62bc1941ee23fe514dd3d99e8e83fca2f92c191c2753ed6a3b04074da8cc10ad7233feb517841ca2f92c191c2753e2a5c8fc074da8cc10ad7233fd6a3b040b1ed44c10082b739e7bb154100a0e2ba3fcddd3d15e3a641c4dea0c0e014dd3da082144112ba973d5474a3407b216641a85d99bf74be1b8c8309e03faf2901410000a040afc16e41e20d84c0748f93bddb552041309a49be3797ef3e62365f41a26891c0dc14dd3d73bf8241a12f68c0ae47ea3f48228c414adb81c050cedd3df0ac2d4177d24bc0b1a9da3ff7a53b4113f45cc0e414dd3d200f6641405ba93d5474a34092df9a4173f144c1e414dd3dcc549a41cc405bc05474a34003bca741e4d074c000000000fc124841045d26410000a0401cd2d541c2f5c8c180c295bfb3c2c2413e0a9f41ac470d41e7d6c241b2d8514086ebb1be08cd9c410115064148e19440769cc54101cea440f61203ba04c5ab41e409c140d1b80840fdd3b241c2f5c8c100000041666676c13e0a9f4100000041cdccc441ca2fa2c153b89e3f2a5c8fc074da9cc185ebd13fd6a3b040ca2faac153b8de3f53b87ec074daa4c1c3f50840d6a3c04096cb64c1e414dd3d07822dc130a39bc05474a3402c22eac0ca2f9ac1a4703d3f53b87ec074da94c185eb913fd6a3c040f3a79bc0e414dd3d27722dc1629ae13e5474a340b29104c1ec81c83ee414dd3d903505c1cefcee3f5474a340fbe290c0f69a86c0e414dd3d2620dec0ba631ac05474a340292551c0224f2ec0df14dd3d495a16c01aca1ac0383c753f2930f6bfb96899bfe414dd3dc7e790c01685ee3f5474a340ac9cee3f79d8bfbfbc14dd3d025906c0d0adb23eac8b1b40200f193ef84eb2bfd2b23f3f5a03fcbfd0bf29bf62340140e894cebee74213c0df14dd3d355b50c0be7bffbf383c753f001935c0a507bf3f506b963f6c59a8c03b7ed73fe17a0240cc8b97c06f4eb43f4f6b963f511189c00189d23fe27a02400fb971c08b3fb53f52a60840b99488c025aed13f80eb3f4006ad72c0ca2fa2c153b89e3fd6a3b04074da9cc185ebd13feb517841ca2faac153b8de3fd6a3c04074daa4c1c3f50840f6288041cd2f9ac1a4703d3fd4a3c04071da94c185eb913ff628804163d8ecc01c36793f80029c416a2096c07c771d40a8e89f418c0fedc0a30d064073939e41ce1ce7c0b3ed174069b19f413d4de6c049a912402a5a9e41cd1de0c05989244075629f413c60d3c09b61194024299d4135bccec0ab412b40929d9e41d00adcc09d8c1840f18a9d41c966d7c0ad6c2a405fff9e41fd30b4c09b611940ebb69b41fe60b1c0ab412b407f6f9d41dbd2f2c0dc5ed73f1e459f4159ccebc0fc1efb3fcee69f413998f1c04846f33f3f379f41b791eac034830b40efd89f418973c9c09b61194009949c414a0fc6c0ab412b40bd3b9e4127d39bc0a30d06401bd09a41feb197c0b3ed1740f75b9c41581d97c0dc5ed73fcdea9a41a28f91c0fc1efb3f12289c415928d8c09ca21b3fd69d8d41c75fbec08bdba43fe4919241ec23d7c0fb188f3fd3688e41cc11c1c0dd93a33fcd658f41cda4b8c09ca21b3f353a8c413bdc9ec08bdba43f432e914160a0b7c0fb188f3f32058d41408ea1c0dd93a33f2c028e41e4abf7c09ca21b3f78018f4152e3ddc08bdba43f86f5934179a7f6c0fb188f3f75cc8f415995e0c0dd93a33f6fc99041fc5798c04846f33ff00c9b41438692c034830b40f1359c41fedabcc09b61194001fb9b413f76bbc0ab412b40b7d19d416b86abc09d8c1840124c9b41acffa8c0ae6c2a40b20d9d4125d2a2c049a912403a2e9b414f5a9ec05a892440eaaa9c416268afbfa63ca43f32525041c9ba8bbf6c24f73ffcc85441b492aebf72d7aa3f136f504194a39fbfd2bcbb3ff74c5241b1c8aebe74711b3f24cb60415e1866be343c3d3f08a96241501fb2bedc3b0e3f42ae6041b6a38dbdb4059a3f0c25654157f32fbfce32004009405b414230d1beb0a62940bdb55f417c6b83bfdc3b0e3fcdd15541c77b3fbfb4059a3f97485a41d49582bf74711b3fafee5541674d67bf343c3d3f93cc574105482ebf72d7aa3fea5c5b41c36910bfd2bcbb3fce3a5d4140f32fbfa63ca43f09405b411e30d1be6c24f73fd3b65f41b492aebf35800340136f504194a39fbfe5f20b40f74c52416268afbfce32004032525041c9ba8bbfb1a62940fcc85441437d2bc035efe83e91133a41fb0ae6bfe8de2540843148417e6b83bfa63ca43fcfd15541cb7b3fbf6c24f73f99485a41cc9582bf72d7aa3fb0ee5541574d67bfd2bcbb3f94cc574105482ebf74711b3fea5c5b41c36910bf343c3d3fce3a5d4140f32fbfdc3b0e3f09405b411e30d1beb4059a3fd3b65f41b1c8aebe72d7aa3f24cb60415e1866bed2bcbb3f08a96241501fb2bea63ca43f42ae6041b6a38dbd6c24f73f0c256541cc9582bf35800340b0ee5541574d67bfe5f20b4094cc57417e6b83bfce320040cfd15541cb7b3fbfb1a6294099485a41a44f64c0208edd3f7f2d2d41d2054bc04a0c2640f57f3341501fb2bece32004042ae6041b6a38dbdb1a629400c256541b1c8aebe3580034024cb60415e1866bee5f20b4008a96241ce1f46c0208edd3f49b73441fad52cc04a0c2640bf093b41b492aebf74711b3f136f504194a39fbf343c3d3ff74c52416268afbfdc3b0e3f32525041c9ba8bbfb4059a3ffcc8544100000000000000004f0000001b000000470000004d000000120000003500000052000000000000004e00000009000000170000001900000030000000260000004b0000004c00000027000000140000000e0000001f000000110000001e0000002500000034000000180000002b000000320000003b000000080000004100000022000000490000002e0000003900000028000000360000002900000021000000330000002a000000380000002f000000310000003e000000480000004a0000004500000046000000420000000700000006000000050000000400000016000000150000000100000020000000240000001a000000400000003f0000003c0000003d0000003a000000440000004300000050000000510000005300000054000000130000000d0000000c0000000f000000100000000a0000000b0000000200000003000000230000001d0000001c000000370000002c0000002d000000000000000000000000000000e00b0000000000000000000000000000000020c20000a0c10000a0c10000a0410000a04100002042a77d0000101a0000c01b00001b000000501b000001801d000000a03e2d00010050000000b0060000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000055550000aaaa0040090000000c00000041000000030000000000000000000000ff3f000055550000aaaa008015000000070000000000000000000000000000000000000000005555ffff0000ab2a00601c0000000600000055000000040000000000000000000000ff5f5555ffff0000ab2a008022000000080000005600000003000000000000000000000000005555ffffaa2a5555007e2a000000060000004300000008000000000000000000000000005555aaaa55550080008030000000070000003b0000000a000000000000000000000000005555aaaaff7faaaa0080370000000b0000001d00000006000000000000000000000000000000aaaaaaaaffff008042000000090000002c0000000c00000000000000000000000000aaaaffff5555ffff00804b0000000e00000069000000040000000000000000000000ff7f00000040000055d500c0590000000700000066000000050000000000000000000000ff7fff3fffff0000561500c0600000000100000067000000050000000000000000000000ff7fff3f564daa1600bc00b261000000070000003f0000000a0000000000000000000000ff7faa4e0080aa16555500b2680000000600000066000000040000000000000000000000ffb3ff3fffff5515555500c06e0000000900000000000000000000000000000000000000ffbf0000ffff00005555ffff770000000400000053000000050000000000000000000000ff7fff7faaaaaa16003000a07b0000000500000052000000060000000000000000000000ff81ff7faaaaaa16ab2a00b28000000009000000350000000c0000000000000000000000ff7fff7faaaaaa2a555500b2890000000a000000270000000d0000000000000000000000ff7faaaa00ccaa16ab6a00b2930000000200000029000000090000000000000000000000ff81aaaa55b1aa32ab4e00a095000000070000005f000000060000000000000000000000ff7faa4e55555555aaaa00a09c000000040000005e000000060000000000000000000000ff8baa4e55555555559500b2a00000000500000040000000020000000000000000000000ffb3ff3f55555555aaaa00c0a50000000b00000000000000000000000000000000000000ffbf000055555555ffffffffb00000000400000040000000020000000000000000000000ff9faa4e55555495aaaa00b2b4000000040000004c000000070000000000000000000000ff7f5555005c555555950086b80000000c00000003000000210000000000000000000000ff7f555555955555aaaa00b2c40000000700000048000000020000000000000000000000ffb35555ffff5555aaaaffffcb0000000600000039000000090000000000000000000000ff7f5495aaaa5555008000a0d1000000020000002b000000050000000000000000000000ff7faaa6aaaaaa56556100a0d3000000090000005b000000060000000000000000000000ff9f5495aaaa5555aaaa00b2dc00000004000000000000002b0000000000000000000000ff815495aaaaff7f00a800a0e000000003000000020000000a0000000000000000000000ff815495aaaaaa96aaaa00a0e3000000090000001d000000120000000000000000000000ff81aa4eaaaaaaaa00bc00b2ec0000000800000057000000060000000000000000000000ff7fff3fffff54bd55d500a0f4000000070000006e000000030000000000000000000000ff9fff3f5555aaaa55d500c0fb0000000800000000000000000000000000000000000000ff7f0000555554d5ffff00c0030100000800000048000000040000000000000000000000ff9f5555ffffaaaa55d5ffff0b0100000900000000000000000000000000000000000000ff7f5555ffff54d5ffffffff140100000700000015000000120000000000000000000000ff81aaaa00ccaa6aaaaa00a01b010000030000002d000000040000000000000000000000ff8154b100ccaa6a009000a01e0100000900000063000000060000000000000000000000ff9faaaa00ccaa6aaaaa00b227010000030000001b000000040000000000000000000000ff8154b900ccff97aaaa00a02a010000060000006a000000040000000000000000000000ff81aaaa00c0aaaa00bc00b2300100000600000048000000070000000000000000000000ff81aaaa00ccaaaa00bc00b200000000000000000000000000000060ff3f0100aaaa0000555500000000002055550200ff3f0000aa2a00000000002055550400ff3f00005555aa2a0000002055550500ff3f0000ff7f55550000002055550600ff3f0000aaaaff7f000000a0aaaa070055550000ff3f0000ffffff930000000055550000ff3f0000ffffff1300000000ff3f0000aaaa0000ffffff5300000000aaaa00005555000000000040ff3f0000aaaa0000555500000000002055550200ff5fff3faa2a00000000002055550300ff7fff5faa2a00000000002055550400ff7dff3f5555aa2a0000002055550500ff7fff3fff7f55550000002055550600ff7fff3faaaaff7f000000a0aaaa070055550000ff7fff3f00000060ff7f0900aa2a0000ff3f000000000060ff7f0900aaaaaa2aaa3e000000000060ff7f0a00aa1200005555ff3fffffff930000000055550000ff7fff3fffffff1300000000ff7fff3faaaa0000000000a0aa2a0400ffff5555ff5f000000000060ff5f0300aa2a0000ffff55550000000055550000ff3f0000aa2a00000000000055550100ff5fff3faa2a0000ffffff9300000000ffff5555ff5f0000ffffff33ffff0000ff5f0000aa2a0000ffffff5300000000aa2a0000ffff555500000040ff5f0200aa2a0000ffff5555000000a0aa2a0400ffff5555ff7dff5f0000000055550100ff7fff5faa2a000000000060ff7f0a00aa120000ffff5555ffffff9300000000ffff5555ff7fff5fffffff33ffff0000ff7fff5faa2a000000000080aa2a0200ffff5555ff5f000000000080aa2a0300ffff5555ff7dff5f0000000055550000ff3f00005555aa2a0000000055550100ff7dff3f5555aa2a000000a055550500aaaa5555ff7d0000000000a055550800ffffaaaaff7d0000ffffff33ffff0000ff7d00005555aa2affffff53000000005555aa2affff5555000000a0ff7f0600aaaa5555ff7f00000000000055550000ff3f0000ff7f55550000000055550100ff7fff3fff7f555500000020aaaa0800ff7f0000ff7f55550000008055550400aaaa5555ff7d0000ffffff5300000000ff7f5555aaaa555500000080ff7f0500aaaa5555ff7f00000000000055550000ff3f0000aaaaff7f0000000055550100ff7fff3faaaaff7f000000a0aaaa0700aaaa5555ff7f000000000020aaaa0800ff7f0000aaaaff7f00000060ff7f1a00ffa7aaa25495aa8affffff5300000000aaaaff7faaaa555500000080aaaa000055550000ff3f000000000080aaaa010055550000ff7fff3f00000080aaaa0600aaaa5555ff7f000000000020aaaa0800ff7f0000ffffaaaa00000060ff7f090054d5aaaaff3f000000000060ff7f220054d5a9beaaaaff3f00000060ff7f2400ffff54d55555000000000060ff7f2600ffff54d5aaaa5555ffffff1300000000ff7f0000ffffaaaaffffffb3ffff0000aaaa0000ff7f0000ffffff5300000000ffffaaaaaaaa000000000000aaaa0500ff7f0000ff7f555500000000aaaa0600ff7f0000aaaaff7f00000000aaaa0700ff7f0000ffffaaaa0000008055550400ffffaaaaff7d000000000060ff7f220054d5a9beffffaaaa00000060ff7f2600ffff54d5ffffaaaaffffffb3ffff0000ffffaaaaff7f0000ffffff33ffff0000ff7f0000ffff5555ffffff5300000000ffff5555ffffaaaa00000060ffbf0e0055550000ff3f000000000020ff3f0a00ffbfff7f5515000000000020ff3f0b00ffb1ff7fffbbaa1600000020ff3f0d00ffbfffb35555551500000060ffbf170054d55555ff3f000000000020ff3f1600ffbfffb3aaaa5555000000a054d52400ff3f0000ffbfff7f00000020ff3f2200ff9fff7f54d554bd00000020ff3f2300ffbfff9f54d5aaaa00000040ff7f0100aa2a0000ff3f000000000040ff7f0100aaaaaa2aaa3e000000000040ff7f070054d5aaaaff3f0000ffffff9300000000ff3f0000ffbfff7fffffff1300000000ffbfff7f54d5000000000000ff3f0900ffbfff7f5515000000000060ffbf0e0055150000ffffff3f000000a055150d00ffffff3fffbfffb900000040ff7f0100aa1200005555ff3f00000040ff7f0300aa120000ffff5555ffffff9300000000ffffff3fffbfff7fffffff33ffff0000ffbfff7f5515000000000000ff3f0900ffb1ff7fffbbaa1600000020ff7f0f00ff9fff7f552daa1600000020ff7f1000ffb1ff9faa2aaa1600000020ff7f1100ffb1ff7f5555aa2a000000a0555514005555aa4eff89ff7f000000a0555515005555aa4effb1ff8b000000a055551900ff5b5555ff85ff7f000000a055551a00ff7f5555ffb1ff7f00000000ff3f0900ffbfffb3555555150000008055150a00ffffff3fffbfffb900000060ffbf0e0055555515ffffff3f000000a0555516005555ff3fffbfffb3000000a055551b00ffff5555ffbfffb3ffffff33ffff0000ffbfffb35555551500000040ffbf090055550000ff3f000000000040ffbf0a0055150000ffffff3f00000040ffbf0d0055555515ffffff3f000000a05555170055550000ffffffbf000000a055551b00ffff5555ffffffbfffffff9300000000ffff0000ffffffbfffffff1300000000ffffffbf55550000ffffff33ffff0000ffffffbf55550000ffffff73ffff000055550000ffff000000000000ff7f0c00ff9fff7f552daa1600000060ff9f1000aa2aaa16aaaaff7f00000060ff9f1100ff2faa2aaaaaff7f00000020aaaa1200ff9fff7fff2faa16000000a0aa2a110054995491ff9fff81000000a0aa2a1100aaaaff7fffb1ff9f00000040ff9f0f00aa2aaa16aaaaff7f00000000ff7f0c00ffb1ff9faa2aaa1600000020aaaa1200ffb1ff9faa2aaa1600000000ff7f0c00ffb1ff7f5555aa2a00000080aa2a100054995491ff9fff8100000080aa2a1000aaaaff7fffb1ff9f00000040ff9f0f00ff2faa2aaaaaff7f00000020aaaa1300ff9fff81aa4eaa3200000020aaaa1200ffb1ff9f5555aa2a000000a055551a005495ff7fffb1ff7f000000a055551c00ffa75495ff9fff7f000000a055551e00aaaa5495ffb1ff9f00000040ff9f1300aa4eaa3254b1aaaa00000000aaaa0f00ff9fff7fff2faa1600000000aaaa1000ffb1ff9faa2aaa1600000000aaaa1100ffb1ff9f5555aa2a000000a0aa6a2800ffcb54b1ff9fff81000000a0aa6a270054adaaaaff9fff81000000a0aa6a2900ffcbaaaaffb1ff9f00000000aaaa1c00ff9fff7faa6aaa6600000000aaaa1d00ff9fff7f5461aa5600000000aaaa1e00ffb1ff9faa6a555500000060ff9f1200aa4eaa3254b1aaaa00000000aaaa1100ff9fff81aa4eaa3200000080549515005555aa4eff9fff8b00000060ff9f1800aaaa54955555aa4e0000002055551900ff85ff7fff5f55550000002055551900ff85ff815495ff5f0000002055551a00ff9fff81aaaa5495000000a0aaaa21005555aa4eff9fff810000008055550c005555aa4eff89ff7f000000a0549514005555aa4eff9fff8b000000a0549518005555aa4effb1ff9f0000002055551a00ffb1ff8b549555550000008055550c005555aa4effb1ff8b00000000ff3f0900ffbfffb3aaaa555500000060ffbf1700aaaa55555555ff3f0000002055551b00ffbfffb3aaaa5555000000a0aaaa23005555ff3fffbfffb30000008055550d005555ff3fffbfffb300000040ffbf090054d55555ff3f000000000040ffbf1600aaaa55555555ff3f0000002055551b00ffffffbfaaaa555500000040ffbf230054d5aaaa5555ff3f00000040ffbf2400ffff54d5555500000000002055552500ffffffbf54d5aaaa0000002055552600ffffffbfffff54d50000008055550e0055550000ffffffbfffffff1300000000ffffffbfffff5555ffffffb3ffff000055550000ffffffbfffffff73ffff0000ffff55555555000000000040ff9f1400aaaa54955555aa4e00000080549515005555aa4effb1ff9f0000002055551a00ffb1ff9faaaa5495000000a0aaaa21005555aa4effb1ff9f000000a054951a00ff5b5555ff85ff810000000055551400ff85ff7fff5f55550000000055551400ff85ff815495ff5f0000008055550c00ff5b5555ff85ff7f0000002054951c00ff9fff7fff7b55550000002054951e00ffb1ff9faaaa55550000008054951900ff5b5555ff85ff810000002054951f00ff9fff81ffa7ff7f0000000055551400ff9fff81aaaa54950000000055551500ffb1ff8b549555550000000055551800ffb1ff9faaaa5495000000a0aaaa2100aa825555ff9fff81000000a0aaaa210054955555ffb1ff9f0000008055550c00ff7f5555ffb1ff7f00000080555511005495ff7fffb1ff7f00000040ff7f0600ffa7aaa25495aa8a0000000055551600ffbfffb3aaaa55550000000055551700ffffffbfaaaa5555000000a0aaaa2500ffff5555ffffffb30000008055550d00ffff5555ffbfffb30000008055550e00ffff5555ffffffbfffffff33ffff0000ffffffb3aaaa5555ffffff73ffff0000aaaa5555ffff55550000000054951a00ff9fff7fff7b555500000060ff9f1e00ff7f5555aaaa5495000000a0ff7f1f00aaaaaa9aff9fff8100000020aaaa1200ff9fff7faa6aaa6600000020aaaa2700ff9fff81ff7faa6a0000008055551100ffa75495ff9fff7f00000060ff9f1e005461aa56aaaaaaa600000020aaaa1200ff9fff7f5461aa560000000054951a00ffb1ff9faaaa555500000040ff9f1c00ff7f5555aaaa549500000040ff9f1d005461aa56aaaaaaa600000040ff9f1f00ffa7ff7faaaa549500000040ff9f2000aaaaaa96aaaa5495000000a0aaaa2100aaaa5495ffb1ff9f00000020aaaa1200ffb1ff9faa6a555500000020aaaa2900ffb1ff9faaaaaa6a0000008055551100aaaa5495ffb1ff9f0000000054951a00ff9fff81ffa7ff7f00000080ff7f1c00aaaaaa9aff9fff8100000060ff9f1e00ffa7ff7faaaa549500000020aaaa2700ff9fff81ff8fff7f00000060ff9f1e00aaaaaa96aaaa5495000000a0aaaa2100aaaa5495ff9fff8100000020aaaa2700ff9fff81aaaaaa9600000080aaaa14005555aa4eff9fff8100000080aaaa18005555aa4effb1ff9f00000080aaaa1a00aa825555ff9fff8100000080aaaa1a0054955555ffb1ff9f00000080aaaa1e00aaaa5495ffb1ff9f00000080aaaa2000aaaa5495ff9fff8100000020aaaa2b00ff9fff8154b5aaaa00000020aaaa2b00ffb1ff9fffbbaaaa00000020aaaa2c00ff9fff81ffbb54b900000000ff3f0900ff9fff7f54d554bd00000060ff9f230054d554bd5555ff3f000000a054d524005555ff3fff9fff7f00000060ff9f250054d554bdffff5555000000a054d52600ffff5555ff9fff7f00000040ff7f070054d5a9beaaaaff3f00000040ff7f080054d5a9beffffaaaaffffff33ffff0000ff9fff7f54d554bd00000000ff3f0900ffbfff9f54d5aaaa00000060ffbf170054d5aaaa5555ff3f00000040ff9f220054d554bd5555ff3f000000a054d524005555ff3fffbfff9f0000002055552500ffbfffb354bdaaaa0000002055552500ffbfff9f54d554bd00000080aaaa16005555ff3fffbfffb300000060ffbf1700ffff54d5555500000000008054d50900ff3f0000ffbfff7f0000008054d522005555ff3fff9fff7f0000008054d523005555ff3fffbfff9f0000002055552600ffbfff7fffff54d500000040ff7f0700ffff54d555550000ffffff1300000000ffbfff7fffff54d5ffffffb3ffff000055550000ffbfff7f00000040ff9f220054d554bdffff5555000000a054d52600ffff5555ffffff9f0000000055552300ffbfffb354bdaaaa0000000055552300ffbfff9f54d554bd0000000055551700ffffffbf54d5aaaa00000080aaaa1b00ffff5555ffffffb3ffffff33ffff0000ffffff9f54d5aaaaffffff73ffff000054d5aaaaffff55550000008054d52200ffff5555ff9fff7f0000008054d52500ffff5555ffffff9f0000000055551700ffffffbfffff54d50000000055552400ffbfff7fffff54d500000040ff7f0700ffff54d5aaaa555500000040ff7f0800ffff54d5ffffaaaaffffffb3ffff0000ffff5555ffffff7fffffff33ffff0000ffffff7fffff54d5ffffff73ffff0000ffff54d5ffff555500000080aa6a120054adaaaaff9fff8100000060ff9f2900aaaaaa6affbfaaaa00000060ff9f2900ff9f5485ffcbffbf000000a0aaaa2b0054b5aaaaff9fff8100000000aaaa1c00ff9fff81ff7faa6a00000000aaaa1f00ff9fff81ff8fff7f00000000aaaa2000ff9fff81aaaaaa9600000080aa6a1200ffcb54b1ff9fff8100000060ff9f2900ff7faa6affbf54b100000060ff9f2900ff8faa6affcbffbf00000040ff9f2700aaaaaa6affbfaaaa00000040ff9f2700ff9f5485ffcbffbf00000080aa6a1200ffcbaaaaffb1ff9f00000040ff9f2800ff7faa6affbf54b100000040ff9f2800ff8faa6affcbffbf00000040ff9f2a00aaaaff97ffcb54b9000000a0aaaa2b00ffbfaaaaffb1ff9f000000a0aaaa2c00ffcbffbfffb1ff9f00000000aaaa1e00ffb1ff9faaaaaa6a00000060ff9f2900aaaaff97ffcb54b9000000a0aaaa2c0054bd54b9ff9fff9d000000a0aaaa2c00ffcb54bdff9fff8100000040ff9f2c00ffbbaaaaffbfaaaa00000020ffbf2c00ffb1ff9fffbbaaaa00000080aaaa270054b5aaaaff9fff8100000080aaaa2900ffbfaaaaffb1ff9f00000000aaaa2100ff9fff8154b5aaaa00000000aaaa2100ffb1ff9fffbbaaaa00000060ff9f2b00ffbbaaaaffbfaaaa00000000ffbf2b00ffb1ff9fffbbaaaa00000080aaaa2900ffcbffbfffb1ff9f00000080aaaa2a0054bd54b9ff9fff9d00000080aaaa2a00ffcb54bdff9fff8100000000aaaa2100ff9fff81ffbb54b929407ae83773415eae7b25f7ff8308b7b7fbded4f4027bd5519d3581c694123c0d9d9ddff1dd225cadfe941ef3104fdf5c739f3755f36edfd594dfadb62a4f3f73433f7ceb1f1171f37eb7be9e41f7003f6ed533fffcfafbbe224c1f0d352ffc43edf43aefffb0aaef9c9dfdf00cf3c03231334cf37437ae8f12bdfee7823a2f38bcf67aaff3afabb32ff7ddff10333ff3f432202f4e2b3f7fabefba8eaffbfaf77ffee7ff0fbff338dcf3ddfffcf0e0ae2fff33332feafc30cfcdb0ffcccfdcf7b78fbfafffff3df3f10ff3cc3cff3c73e6fcfec3fbf3fffffdffcfccfdff9cfffffef3f33737f3defcffbffdccfc3fb3ffd8bffffff3fff8ffcf03a9003b01b20100000e19232c343f4d5a646f7a828b949f08131a262f333e475159616a757e870a1219202a333b43484c545a616972060a10161d2123292b31353a4041000000000000000000000000000000a0c1000000000000a0c100000000000020c1000020c10000a0410000000000002041000000000000a0410000a0410000000000000000000020c1000000000000a0c1000000000000f0c10000000000002041000020410000a0c10000a0c100000000084080707008120ec7c62418000205c36573316d4a898442d148904a0a4623212a2d188c4844229124129a84a82449894a0bc6a2c178401a918644d2d068349a8dc613424952a70d63d15830188d4683d188341a92c642a3e17c349bcd46340a6d3627556ac35a30188d0563c1683c1e90462422692c2c8b8546c3d16c3c9b50a8142aa14e924d6a7342b158ac156bc158301e8f48443291542a968585b2b068341fd022240a9542a513ea8452b144a555a9c42a31168cc7e321914c2492056551595416958a6541c158321a0e27b4588c46219128542aa14e27d5e97452a9562c9648b42aad4aac12abb4603c200fc823f288482612098552a92c288bcaa2b25860169a0ce703fa8016a18528240a8d16a15009753aa14e27d409853a9d4e27d56a255a954aac5229f2984c2492896422a15416150aa552c164349c4e8703fa7c3e8b5068115a2c46a151e8843a9d5027d449853aa14e27d549b562ad58a25589557a441e11896432a1541695052693e9703a1fd007f4f98016a1d022145a8c46a351e8743aa14e28116b22994826928c26d3f92c428bd062141a854ea8d30935914c321a4ee7035a844221d14975524d248bd049753aa90000000000000000 + m_PVSData: 120000d6c18b7e64002900000000a04100000000000020c20000a0c10000a0c10000a0410000a04100002042200000005001000000000000010000006001000055000000700200000000000000000000700a0000a7000000a00100007400000000000000000000000000000000000000000000000000000000000000010000005002000000000000900100000100000001000000010000007001000080010000d00b0000000000000000000000000000000000000000000000000000542032302e3020534f20352e3020534820302e323530204246203130302046203020435320302e30202d20332e332e3232204620302030204f4720300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f000000000000000000000000010000000000000000000000000000003aba2740000000000000000000000000000000002c000000000000000000000086a0188eb0d38570088d700aa9c012b2501b818010947009a3500a843009a6800a2ae12233811b87a0088e10093f720cce101d83600881f0088520088d000926c21ab24013ba3009808011a0c1099f100884600883500887a0088e32099680219e40081cf1098150188a90080b42219320088010088480088591109230099030088f10098120081431129360100e310881400880600998300906d1109f300882000893100890f0088200099330080000000000000000000000000000ffff0000ffffffff000000000000000000000000f0f4c8c194c295bf86eb6dc1100b9f41ae470d4184eb6dc1c2f5c8c10000a0bf666676c13c0a9f4100000036cdccc4411f85adc1503e4abf35338fc11f85adc1375c1341cfccd841d6a30041c85278bf36338fc1d8a30041f07a1041d0ccd841fc4264c100806bb60ae62bc1941ee23fe514dd3d99e8e83fb1ed44c10082b739e7bb154100a0e2ba3fcddd3d15e3a641a85d99bf74be1b8c8309e03faf2901410000a040afc16e41c4dea0c0e014dd3da082144112ba973d5474a3407b216641ca2f92c191c2753e2a5c8fc074da8cc10ad7233fd6a3b040ca2f92c191c2753ed6a3b04074da8cc10ad7233feb517841e20d84c0748f93bddb552041309a49be3797ef3e62365f41a26891c0dc14dd3d73bf8241a12f68c0ae47ea3f48228c414adb81c050cedd3df0ac2d4177d24bc0b1a9da3ff7a53b4173f144c1e414dd3dcc549a41cc405bc05474a34003bca74113f45cc0e414dd3d200f6641405ba93d5474a34092df9a41e4d074c000000000fc124841045d26410000a0401cd2d541c2f5c8c180c295bfb3c2c2413e0a9f41ac470d41e7d6c241b2d8514086ebb1be08cd9c410115064148e19440769cc54101cea440f61203ba04c5ab41e409c140d1b80840fdd3b241c2f5c8c100000041666676c13e0a9f4100000041cdccc441ca2fa2c153b89e3f2a5c8fc074da9cc185ebd13fd6a3b040ca2faac153b8de3f53b87ec074daa4c1c3f50840d6a3c04096cb64c1e414dd3d07822dc130a39bc05474a3402c22eac0ca2f9ac1a4703d3f53b87ec074da94c185eb913fd6a3c040f3a79bc0e414dd3d27722dc1629ae13e5474a340b29104c1ec81c83ee414dd3d903505c1cefcee3f5474a340fbe290c0f69a86c0e414dd3d2620dec0ba631ac05474a340292551c0224f2ec0df14dd3d495a16c01aca1ac0383c753f2930f6bf79d8bfbfbc14dd3d025906c0d0adb23eac8b1b40200f193ef84eb2bfd2b23f3f5a03fcbfd0bf29bf62340140e894cebee74213c0df14dd3d355b50c0be7bffbf383c753f001935c0b96899bfe414dd3dc7e790c01685ee3f5474a340ac9cee3fa507bf3f506b963f6c59a8c03b7ed73fe17a0240cc8b97c06f4eb43f4f6b963f511189c00189d23fe27a02400fb971c08b3fb53f52a60840b99488c025aed13f80eb3f4006ad72c0ca2fa2c153b89e3fd6a3b04074da9cc185ebd13feb517841ca2faac153b8de3fd6a3c04074daa4c1c3f50840f6288041cd2f9ac1a4703d3fd4a3c04071da94c185eb913ff6288041d00adcc09d8c1840f18a9d41c966d7c0ad6c2a405fff9e41581d97c0dc5ed73fcdea9a41a28f91c0fc1efb3f12289c41fedabcc09b61194001fb9b413f76bbc0ab412b40b7d19d4125d2a2c049a912403a2e9b414f5a9ec05a892440eaaa9c41e4abf7c09ca21b3f78018f4152e3ddc08bdba43f86f5934179a7f6c0fb188f3f75cc8f415995e0c0dd93a33f6fc9904163d8ecc01c36793f80029c416a2096c07c771d40a8e89f4127d39bc0a30d06401bd09a41feb197c0b3ed1740f75b9c41fd30b4c09b611940ebb69b41fe60b1c0ab412b407f6f9d415928d8c09ca21b3fd69d8d41c75fbec08bdba43fe4919241ec23d7c0fb188f3fd3688e41cc11c1c0dd93a33fcd658f418c0fedc0a30d064073939e41ce1ce7c0b3ed174069b19f416b86abc09d8c1840124c9b41acffa8c0ae6c2a40b20d9d413d4de6c049a912402a5a9e41cd1de0c05989244075629f413c60d3c09b61194024299d4135bccec0ab412b40929d9e41fc5798c04846f33ff00c9b41438692c034830b40f1359c41cda4b8c09ca21b3f353a8c413bdc9ec08bdba43f432e914160a0b7c0fb188f3f32058d41408ea1c0dd93a33f2c028e41dbd2f2c0dc5ed73f1e459f4159ccebc0fc1efb3fcee69f413998f1c04846f33f3f379f41b791eac034830b40efd89f418973c9c09b61194009949c414a0fc6c0ab412b40bd3b9e41a44f64c0208edd3f7f2d2d41d2054bc04a0c2640f57f3341437d2bc035efe83e91133a41fb0ae6bfe8de254084314841d49582bf74711b3fafee5541674d67bf343c3d3f93cc57417c6b83bfdc3b0e3fcdd15541c77b3fbfb4059a3f97485a41501fb2bedc3b0e3f42ae6041b6a38dbdb4059a3f0c256541b1c8aebe74711b3f24cb60415e1866be343c3d3f08a96241b1c8aebe72d7aa3f24cb60415e1866bed2bcbb3f08a96241501fb2bea63ca43f42ae6041b6a38dbd6c24f73f0c2565416268afbfce32004032525041c9ba8bbfb1a62940fcc85441b492aebf35800340136f504194a39fbfe5f20b40f74c5241cc9582bf72d7aa3fb0ee5541574d67bfd2bcbb3f94cc57417e6b83bfa63ca43fcfd15541cb7b3fbf6c24f73f99485a4157f32fbfce32004009405b414230d1beb0a62940bdb55f41b492aebf74711b3f136f504194a39fbf343c3d3ff74c52416268afbfdc3b0e3f32525041c9ba8bbfb4059a3ffcc854416268afbfa63ca43f32525041c9ba8bbf6c24f73ffcc85441b492aebf72d7aa3f136f504194a39fbfd2bcbb3ff74c5241ce1f46c0208edd3f49b73441fad52cc04a0c2640bf093b4105482ebf74711b3fea5c5b41c36910bf343c3d3fce3a5d4140f32fbfdc3b0e3f09405b411e30d1beb4059a3fd3b65f41cc9582bf35800340b0ee5541574d67bfe5f20b4094cc57417e6b83bfce320040cfd15541cb7b3fbfb1a6294099485a41b1c8aebe3580034024cb60415e1866bee5f20b4008a96241501fb2bece32004042ae6041b6a38dbdb1a629400c25654140f32fbfa63ca43f09405b411e30d1be6c24f73fd3b65f4105482ebf72d7aa3fea5c5b41c36910bfd2bcbb3fce3a5d41000000000000000027000000430000001500000032000000490000001a00000051000000420000000d0000001600000014000000180000002f0000003f0000003d000000500000004f0000001b0000002300000002000000410000002b0000000a000000220000004e0000000500000000000000040000000100000031000000330000003e000000340000004c0000003c0000002500000021000000240000002c000000290000002a00000035000000370000003600000044000000400000004d00000007000000060000000e0000000300000011000000170000001e000000200000001f0000003000000026000000280000003b00000038000000450000004600000048000000470000004a0000004b0000003a000000390000005200000053000000540000000b0000000c00000009000000080000001900000012000000130000001c0000001d0000000f000000100000002e0000002d000000000000000000000000000000e00b0000000000000000000000000000000020c20000a0c10000a0c10000a0410000a04100002042a7780000c0190000701b00001b000000001b000001201d000000a03e2c0001005000000080060000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000055550000aaaa0040090000000c0000004b000000030000000000000000000000ff3f000055550000aaaa008015000000070000000000000000000000000000000000000000005555ffff0000ab2a00601c000000060000005f000000040000000000000000000000ff5f5555ffff0000ab2a008022000000080000005f00000003000000000000000000000000005555ffffaa2a5555007e2a000000060000004d00000008000000000000000000000000005555aaaa5555008000803000000007000000440000000a000000000000000000000000005555aaaaff7faaaa0080370000000b0000002400000006000000000000000000000000000000aaaaaaaaffff00804200000009000000350000000c00000000000000000000000000aaaaffff5555ffff00804b0000000e0000006b000000040000000000000000000000ff7f00000040000055d500c0590000000700000069000000050000000000000000000000ff7fff3fffff0000561500c060000000010000006a000000050000000000000000000000ff7fff3f564daa1600bc00b26100000007000000490000000a0000000000000000000000ff7faa4e0080aa16555500b2680000000600000069000000040000000000000000000000ffb3ff3fffff5515555500c06e0000000900000000000000000000000000000000000000ffbf0000ffff00005555ffff770000000400000060000000050000000000000000000000ff7fff7faaaaaa16003000a07b0000000500000060000000060000000000000000000000ff81ff7faaaaaa16ab2a00b280000000090000003d0000000c0000000000000000000000ff7fff7faaaaaa2a555500b2890000000a0000002f0000000d0000000000000000000000ff7faaaa00ccaa16ab6a00b2930000000200000031000000090000000000000000000000ff81aaaa55b1aa32ab4e00a0950000000700000058000000060000000000000000000000ff7faa4e55555555aaaa00a09c0000000400000059000000060000000000000000000000ff8baa4e55555555559500b2a0000000050000004a000000020000000000000000000000ffb3ff3f55555555aaaa00c0a50000000b00000000000000000000000000000000000000ffbf000055555555ffffffffb0000000040000004a000000020000000000000000000000ff9faa4e55555495aaaa00b2b4000000040000000c000000070000000000000000000000ff7f5555005c555555950086b80000000c00000004000000210000000000000000000000ff7f555555955555aaaa00b2c40000000700000072000000020000000000000000000000ffb35555ffff5555aaaaffffcb0000000600000041000000090000000000000000000000ff7f5495aaaa5555008000a0d10000000200000033000000050000000000000000000000ff7faaa6aaaaaa56556100a0d30000000800000065000000060000000000000000000000ff9f5495aaaa5555aaaa00b2db00000006000000000000002b0000000000000000000000ff815495aaaaff7faaaa00a0e10000000900000024000000120000000000000000000000ff81aa4eaaaaaaaa00bc00b2ea0000000800000054000000060000000000000000000000ff7fff3fffff54bd55d500a0f20000000700000070000000030000000000000000000000ff9fff3f5555aaaa55d500c0f90000000800000000000000000000000000000000000000ff7f0000555554d5ffff00c0010100000800000053000000040000000000000000000000ff9f5555ffffaaaa55d5ffff090100000900000000000000000000000000000000000000ff7f5555ffff54d5ffffffff12010000070000001a000000120000000000000000000000ff81aaaa00ccaa6aaaaa00a0190100000300000022000000040000000000000000000000ff8154b100ccaa6a009000a01c010000090000005c000000060000000000000000000000ff9faaaa00ccaa6aaaaa00b2250100000300000055000000040000000000000000000000ff8154b900ccff97aaaa00a028010000060000006c000000040000000000000000000000ff81aaaa00c0aaaa00bc00b22e0100000600000052000000070000000000000000000000ff81aaaa00ccaaaa00bc00b200000060ff3f0100aaaa0000555500000000002055550200ff3f0000aa2a00000000002055550400ff3f00005555aa2a0000002055550500ff3f0000ff7f55550000002055550600ff3f0000aaaaff7f000000a0aaaa070055550000ff3f0000ffffff930000000055550000ff3f0000ffffff1300000000ff3f0000aaaa0000ffffff5300000000aaaa00005555000000000040ff3f0000aaaa0000555500000000002055550200ff5fff3faa2a00000000002055550300ff7fff5faa2a00000000002055550400ff7dff3f5555aa2a0000002055550500ff7fff3fff7f55550000002055550600ff7fff3faaaaff7f000000a0aaaa070055550000ff7fff3f00000060ff7f0900aa2a0000ff3f000000000060ff7f0900aaaaaa2aaa3e000000000060ff7f0a00aa1200005555ff3fffffff930000000055550000ff7fff3fffffff1300000000ff7fff3faaaa0000000000a0aa2a0400ffff5555ff5f000000000060ff5f0300aa2a0000ffff55550000000055550000ff3f0000aa2a00000000000055550100ff5fff3faa2a0000ffffff9300000000ffff5555ff5f0000ffffff33ffff0000ff5f0000aa2a0000ffffff5300000000aa2a0000ffff555500000040ff5f0200aa2a0000ffff5555000000a0aa2a0400ffff5555ff7dff5f0000000055550100ff7fff5faa2a000000000060ff7f0a00aa120000ffff5555ffffff9300000000ffff5555ff7fff5fffffff33ffff0000ff7fff5faa2a000000000080aa2a0200ffff5555ff5f000000000080aa2a0300ffff5555ff7dff5f0000000055550000ff3f00005555aa2a0000000055550100ff7dff3f5555aa2a000000a055550500aaaa5555ff7d0000000000a055550800ffffaaaaff7d0000ffffff33ffff0000ff7d00005555aa2affffff53000000005555aa2affff5555000000a0ff7f0600aaaa5555ff7f00000000000055550000ff3f0000ff7f55550000000055550100ff7fff3fff7f555500000020aaaa0800ff7f0000ff7f55550000008055550400aaaa5555ff7d0000ffffff5300000000ff7f5555aaaa555500000080ff7f0500aaaa5555ff7f00000000000055550000ff3f0000aaaaff7f0000000055550100ff7fff3faaaaff7f000000a0aaaa0700aaaa5555ff7f000000000020aaaa0800ff7f0000aaaaff7f00000060ff7f1a00ffa7aaa25495aa8affffff5300000000aaaaff7faaaa555500000080aaaa000055550000ff3f000000000080aaaa010055550000ff7fff3f00000080aaaa0600aaaa5555ff7f000000000020aaaa0800ff7f0000ffffaaaa00000060ff7f090054d5aaaaff3f000000000060ff7f210054d5a9beaaaaff3f00000060ff7f2300ffff54d55555000000000060ff7f2500ffff54d5aaaa5555ffffff1300000000ff7f0000ffffaaaaffffffb3ffff0000aaaa0000ff7f0000ffffff5300000000ffffaaaaaaaa000000000000aaaa0500ff7f0000ff7f555500000000aaaa0600ff7f0000aaaaff7f00000000aaaa0700ff7f0000ffffaaaa0000008055550400ffffaaaaff7d000000000060ff7f210054d5a9beffffaaaa00000060ff7f2500ffff54d5ffffaaaaffffffb3ffff0000ffffaaaaff7f0000ffffff33ffff0000ff7f0000ffff5555ffffff5300000000ffff5555ffffaaaa00000060ffbf0e0055550000ff3f000000000020ff3f0a00ffbfff7f5515000000000020ff3f0b00ffb1ff7fffbbaa1600000020ff3f0d00ffbfffb35555551500000060ffbf170054d55555ff3f000000000020ff3f1600ffbfffb3aaaa5555000000a054d52300ff3f0000ffbfff7f00000020ff3f2100ff9fff7f54d554bd00000020ff3f2200ffbfff9f54d5aaaa00000040ff7f0100aa2a0000ff3f000000000040ff7f0100aaaaaa2aaa3e000000000040ff7f070054d5aaaaff3f0000ffffff9300000000ff3f0000ffbfff7fffffff1300000000ffbfff7f54d5000000000000ff3f0900ffbfff7f5515000000000060ffbf0e0055150000ffffff3f000000a055150d00ffffff3fffbfffb900000040ff7f0100aa1200005555ff3f00000040ff7f0300aa120000ffff5555ffffff9300000000ffffff3fffbfff7fffffff33ffff0000ffbfff7f5515000000000000ff3f0900ffb1ff7fffbbaa1600000020ff7f0f00ff9fff7f552daa1600000020ff7f1000ffb1ff9faa2aaa1600000020ff7f1100ffb1ff7f5555aa2a000000a0555514005555aa4eff89ff7f000000a0555515005555aa4effb1ff8b000000a055551900ff5b5555ff85ff7f000000a055551a00ff7f5555ffb1ff7f00000000ff3f0900ffbfffb3555555150000008055150a00ffffff3fffbfffb900000060ffbf0e0055555515ffffff3f000000a0555516005555ff3fffbfffb3000000a055551b00ffff5555ffbfffb3ffffff33ffff0000ffbfffb35555551500000040ffbf090055550000ff3f000000000040ffbf0a0055150000ffffff3f00000040ffbf0d0055555515ffffff3f000000a05555170055550000ffffffbf000000a055551b00ffff5555ffffffbfffffff9300000000ffff0000ffffffbfffffff1300000000ffffffbf55550000ffffff33ffff0000ffffffbf55550000ffffff73ffff000055550000ffff000000000000ff7f0c00ff9fff7f552daa1600000060ff9f1000aa2aaa16aaaaff7f00000060ff9f1100ff2faa2aaaaaff7f00000020aaaa1200ff9fff7fff2faa16000000a0aa2a110054995491ff9fff81000000a0aa2a1100aaaaff7fffb1ff9f00000040ff9f0f00aa2aaa16aaaaff7f00000000ff7f0c00ffb1ff9faa2aaa1600000020aaaa1200ffb1ff9faa2aaa1600000000ff7f0c00ffb1ff7f5555aa2a00000080aa2a100054995491ff9fff8100000080aa2a1000aaaaff7fffb1ff9f00000040ff9f0f00ff2faa2aaaaaff7f00000020aaaa1300ff9fff81aa4eaa3200000020aaaa1200ffb1ff9f5555aa2a000000a055551a005495ff7fffb1ff7f000000a055551c00ffa75495ff9fff7f000000a055551e00aaaa5495ffb1ff9f00000040ff9f1300aa4eaa3254b1aaaa00000000aaaa0f00ff9fff7fff2faa1600000000aaaa1000ffb1ff9faa2aaa1600000000aaaa1100ffb1ff9f5555aa2a000000a0aa6a2700ffcb54b1ff9fff81000000a0aa6a260054adaaaaff9fff81000000a0aa6a2800ffcbaaaaffb1ff9f00000000aaaa1c00ff9fff7faa6aaa6600000000aaaa1d00ff9fff7f5461aa5600000000aaaa1e00ffb1ff9faa6a555500000060ff9f1200aa4eaa3254b1aaaa00000000aaaa1100ff9fff81aa4eaa3200000080549515005555aa4eff9fff8b00000060ff9f1800aaaa54955555aa4e0000002055551900ff85ff7fff5f55550000002055551900ff85ff815495ff5f0000002055551a00ff9fff81aaaa5495000000a0aaaa20005555aa4eff9fff810000008055550c005555aa4eff89ff7f000000a0549514005555aa4eff9fff8b000000a0549518005555aa4effb1ff9f0000002055551a00ffb1ff8b549555550000008055550c005555aa4effb1ff8b00000000ff3f0900ffbfffb3aaaa555500000060ffbf1700aaaa55555555ff3f0000002055551b00ffbfffb3aaaa5555000000a0aaaa22005555ff3fffbfffb30000008055550d005555ff3fffbfffb300000040ffbf090054d55555ff3f000000000040ffbf1600aaaa55555555ff3f0000002055551b00ffffffbfaaaa555500000040ffbf220054d5aaaa5555ff3f00000040ffbf2300ffff54d5555500000000002055552400ffffffbf54d5aaaa0000002055552500ffffffbfffff54d50000008055550e0055550000ffffffbfffffff1300000000ffffffbfffff5555ffffffb3ffff000055550000ffffffbfffffff73ffff0000ffff55555555000000000040ff9f1400aaaa54955555aa4e00000080549515005555aa4effb1ff9f0000002055551a00ffb1ff9faaaa5495000000a0aaaa20005555aa4effb1ff9f000000a054951a00ff5b5555ff85ff810000000055551400ff85ff7fff5f55550000000055551400ff85ff815495ff5f0000008055550c00ff5b5555ff85ff7f0000002054951c00ff9fff7fff7b55550000002054951e00ffb1ff9faaaa55550000008054951900ff5b5555ff85ff810000002054951f00ff9fff81ffa7ff7f0000000055551400ff9fff81aaaa54950000000055551500ffb1ff8b549555550000000055551800ffb1ff9faaaa5495000000a0aaaa2000aa825555ff9fff81000000a0aaaa200054955555ffb1ff9f0000008055550c00ff7f5555ffb1ff7f00000080555511005495ff7fffb1ff7f00000040ff7f0600ffa7aaa25495aa8a0000000055551600ffbfffb3aaaa55550000000055551700ffffffbfaaaa5555000000a0aaaa2400ffff5555ffffffb30000008055550d00ffff5555ffbfffb30000008055550e00ffff5555ffffffbfffffff33ffff0000ffffffb3aaaa5555ffffff73ffff0000aaaa5555ffff55550000000054951a00ff9fff7fff7b555500000060ff9f1e00ff7f5555aaaa5495000000a0ff7f1f00aaaaaa9aff9fff8100000020aaaa1200ff9fff7faa6aaa6600000020aaaa2600ff9fff81ff7faa6a0000008055551100ffa75495ff9fff7f00000060ff9f1e005461aa56aaaaaaa600000020aaaa1200ff9fff7f5461aa560000000054951a00ffb1ff9faaaa555500000040ff9f1c00ff7f5555aaaa549500000040ff9f1d005461aa56aaaaaaa600000040ff9f1f00aaaaff7faaaa5495000000a0aaaa2000aaaa5495ffb1ff9f00000020aaaa1200ffb1ff9faa6a555500000020aaaa2800ffb1ff9faaaaaa6a0000008055551100aaaa5495ffb1ff9f0000000054951a00ff9fff81ffa7ff7f00000080ff7f1c00aaaaaa9aff9fff8100000060ff9f1e00aaaaff7faaaa5495000000a0aaaa2000aaaa5495ff9fff8100000020aaaa2600ff9fff81ff8fff7f00000020aaaa2600ff9fff81aaaaff9300000080aaaa14005555aa4eff9fff8100000080aaaa18005555aa4effb1ff9f00000080aaaa1a00aa825555ff9fff8100000080aaaa1a0054955555ffb1ff9f00000080aaaa1e00aaaa5495ffb1ff9f00000080aaaa1f00aaaa5495ff9fff8100000020aaaa2a00ff9fff8154b5aaaa00000020aaaa2a00ffb1ff9fffbbaaaa00000020aaaa2b00ff9fff81ffbb54b900000000ff3f0900ff9fff7f54d554bd00000060ff9f220054d554bd5555ff3f000000a054d523005555ff3fff9fff7f00000060ff9f240054d554bdffff5555000000a054d52500ffff5555ff9fff7f00000040ff7f070054d5a9beaaaaff3f00000040ff7f080054d5a9beffffaaaaffffff33ffff0000ff9fff7f54d554bd00000000ff3f0900ffbfff9f54d5aaaa00000060ffbf170054d5aaaa5555ff3f00000040ff9f210054d554bd5555ff3f000000a054d523005555ff3fffbfff9f0000002055552400ffbfffb354bdaaaa0000002055552400ffbfff9f54d554bd00000080aaaa16005555ff3fffbfffb300000060ffbf1700ffff54d5555500000000008054d50900ff3f0000ffbfff7f0000008054d521005555ff3fff9fff7f0000008054d522005555ff3fffbfff9f0000002055552500ffbfff7fffff54d500000040ff7f0700ffff54d555550000ffffff1300000000ffbfff7fffff54d5ffffffb3ffff000055550000ffbfff7f00000040ff9f210054d554bdffff5555000000a054d52500ffff5555ffffff9f0000000055552200ffbfffb354bdaaaa0000000055552200ffbfff9f54d554bd0000000055551700ffffffbf54d5aaaa00000080aaaa1b00ffff5555ffffffb3ffffff33ffff0000ffffff9f54d5aaaaffffff73ffff000054d5aaaaffff55550000008054d52100ffff5555ff9fff7f0000008054d52400ffff5555ffffff9f0000000055551700ffffffbfffff54d50000000055552300ffbfff7fffff54d500000040ff7f0700ffff54d5aaaa555500000040ff7f0800ffff54d5ffffaaaaffffffb3ffff0000ffff5555ffffff7fffffff33ffff0000ffffff7fffff54d5ffffff73ffff0000ffff54d5ffff555500000080aa6a120054adaaaaff9fff8100000060ff9f2800aaaaaa6affbfaaaa00000060ff9f2800ff9f5485ffcbffbf000000a0aaaa2a0054b5aaaaff9fff8100000000aaaa1c00ff9fff81ff7faa6a00000000aaaa1f00ff9fff81ff8fff7f00000000aaaa1f00ff9fff81aaaaff9300000080aa6a1200ffcb54b1ff9fff8100000060ff9f2800ff7faa6affbf54b100000060ff9f2800ff8faa6affcbffbf00000040ff9f2600aaaaaa6affbfaaaa00000040ff9f2600ff9f5485ffcbffbf00000080aa6a1200ffcbaaaaffb1ff9f00000040ff9f2700ff7faa6affbf54b100000040ff9f2700ff8faa6affcbffbf00000040ff9f2900aaaaff97ffcb54b9000000a0aaaa2a00ffbfaaaaffb1ff9f000000a0aaaa2b00ffcbffbfffb1ff9f00000000aaaa1e00ffb1ff9faaaaaa6a00000060ff9f2800aaaaff97ffcb54b9000000a0aaaa2b0054bd54b9ff9fff9d000000a0aaaa2b00ffcb54bdff9fff8100000040ff9f2b00ffbbaaaaffbfaaaa00000020ffbf2b00ffb1ff9fffbbaaaa00000080aaaa260054b5aaaaff9fff8100000080aaaa2800ffbfaaaaffb1ff9f00000000aaaa2000ff9fff8154b5aaaa00000000aaaa2000ffb1ff9fffbbaaaa00000060ff9f2a00ffbbaaaaffbfaaaa00000000ffbf2a00ffb1ff9fffbbaaaa00000080aaaa2800ffcbffbfffb1ff9f00000080aaaa290054bd54b9ff9fff9d00000080aaaa2900ffcb54bdff9fff8100000000aaaa2000ff9fff81ffbb54b929407ae83773415eae7b25f7ff8308b7b7fbded4f4027bd5519d3581c694123c0d9d9ddff1dd225cadfe941ef3104fdf5c739f3755f37edfd594dfadb62a4f3f73433f7ceb1f1171f377ebeb19740ff0e3563df3cfafbfef2bc2f4d150f3fe43edf43aefffb0aaef9c9dfdf00cf3c03231334cf374378e12bdfee7823a2f38bcf67aaff3afabb32ff7ddff10333ff3f4322f4e2b3f7fabefba8eaffbfaf77ffee7ff0fbff338dcf3ddfffcf0e0fe33332feafc30cfcdb0ffcccfdcf7b78fbfafffff3df3f10f3fff3c73e6fcfec3fbf3fffffdffcfccfdff9cfff3f33737f3defcffbffdccff33fb8ffdfbfff3fff8ffcf030000a8003a01ac0100000e19232c343f4d5a646f7a828b939e08131a252e333e474f57606a737f880811181e292f383d42494e565f656b03081015161a1f26292e323500000000000000000000000000000000000000000000000000a0c1000000000000a0c100000000000020c1000020c10000a0410000000000002041000000000000a0410000a0410000000000000000000020c1000000000000a0c1000000000000f0c10000000000002041000020410000a0c10000a0c100000000084080707008120ec7a62418000205c36573296d48898442d1488c480a462311222d188c4844229124129a4488244185480bc6a2c178401a918644d2d068349acf46e3019d2428d386b1682c188c46a3c168441a0d4963a1d170349bcd2624026d36a6146ab35a30188d0563c1683c1e90462422692c2c8b8546c3d16c3c1b108804229d4c920d6a633aad562bd56ac158301e8f48443291542a968585b2b068340b50084402914c27d329b50a915424d28ac458301e8f8744329148169445655159542a96050563c968381cd06221128142211089743299522693299552ad56a1908aa422ad482bd282f1803c208fc82322994824144aa5b2a02c2a8bca62815968329c056811028540a20508443a994c2793e9643a9d4c269329a552855424d28a448a3c261389642299482895458542a95430190da7d3e12c40a00568b110814420d3c9643a994ea6d4c974329952a6946aa55a8554a415e91179442492c98452595416984ca6c3e92c40a00508b41089442290c9643a994ea1d54432914c24194da6b3002d400b114804329d4ca6d34432c968389d0508040a9952a6d444b200995226530a000000000000000000 m_Scenes: - indexRenderers: 0 sizeRenderers: 85 @@ -16,173 +16,173 @@ OcclusionCullingData: scene: 234ac6652f2be3943b8974a3fcbaba1f m_StaticRenderers: - targetObject: -7511558181221131132 - targetPrefab: 297529246 + targetPrefab: 124273105 - targetObject: -7511558181221131132 - targetPrefab: 1972023585 - - targetObject: 1466060218924807064 - targetPrefab: 1249864385 - - targetObject: 2751096909771140069 - targetPrefab: 1249864385 - - targetObject: 1968900501911500709 - targetPrefab: 937910637 - - targetObject: 940995387610717004 - targetPrefab: 937910637 - - targetObject: 1968900501911500709 - targetPrefab: 172614115 - - targetObject: 940995387610717004 - targetPrefab: 172614115 - - targetObject: -7511558181221131132 - targetPrefab: 2119386629 - - targetObject: -7511558181221131132 - targetPrefab: 1976503209 - - targetObject: 1466060218924807064 - targetPrefab: 990092987 - - targetObject: 2751096909771140069 - targetPrefab: 990092987 - - targetObject: 1466060218924807064 - targetPrefab: 4480648499976004208 - - targetObject: 2751096909771140069 - targetPrefab: 4480648499976004208 - - targetObject: 8810932174823803713 - targetPrefab: 1669769486 - - targetObject: 1466060218924807064 - targetPrefab: 1018401441 - - targetObject: 2751096909771140069 - targetPrefab: 1018401441 - - targetObject: 4351601775851787701 - targetPrefab: 1768602428 - - targetObject: -7511558181221131132 - targetPrefab: 267965641 - - targetObject: 8810932174823803713 - targetPrefab: 6146163849592780820 - - targetObject: -7511558181221131132 - targetPrefab: 1586593148 - - targetObject: 1968900501911500709 - targetPrefab: 4438766482650780789 - - targetObject: 940995387610717004 - targetPrefab: 4438766482650780789 - - targetObject: -7511558181221131132 - targetPrefab: 102513283 - - targetObject: -7511558181221131132 - targetPrefab: 1617502299 - - targetObject: -7511558181221131132 - targetPrefab: 1123331143 - - targetObject: -7511558181221131132 - targetPrefab: 1188236244 - - targetObject: 2708739958050211779 - targetPrefab: 1584295245487527435 - - targetObject: 1466060218924807064 - targetPrefab: 428989207 - - targetObject: 2751096909771140069 - targetPrefab: 428989207 - - targetObject: 4351601775851787701 - targetPrefab: 91371483 + targetPrefab: 1470660570 - targetObject: 2708739958050211779 targetPrefab: 1369540354 - - targetObject: -7511558181221131132 - targetPrefab: 600479467 - - targetObject: 4351601775851787701 - targetPrefab: 832323181 - - targetObject: 4856842162814790411 - targetPrefab: 6044205050412544512 - - targetObject: 7006853779014437907 - targetPrefab: 515796176453664510 - targetObject: -7511558181221131132 targetPrefab: 651901189 - targetObject: -7511558181221131132 - targetPrefab: 139770782 - - targetObject: -7511558181221131132 - targetPrefab: 1427476862 - - targetObject: 2708739958050211779 - targetPrefab: 734635744 - - targetObject: -7511558181221131132 - targetPrefab: 577030235 - - targetObject: 4351601775851787701 - targetPrefab: 1058862682 - - targetObject: -7511558181221131132 - targetPrefab: 1463594309 + targetPrefab: 808969077 - targetObject: -7511558181221131132 targetPrefab: 2128415471 + - targetObject: 1968900501911500709 + targetPrefab: 172614115 + - targetObject: 940995387610717004 + targetPrefab: 172614115 + - targetObject: 1466060218924807064 + targetPrefab: 1329794381 + - targetObject: 2751096909771140069 + targetPrefab: 1329794381 + - targetObject: -7511558181221131132 + targetPrefab: 139770782 - targetObject: 1466060218924807064 targetPrefab: 1918973202 - targetObject: 2751096909771140069 targetPrefab: 1918973202 - - targetObject: 5395762849033877597 - targetPrefab: 1984717371 - - targetObject: -7511558181221131132 - targetPrefab: 723913190 - - targetObject: 5444317254943555344 - targetPrefab: 4953860686005405531 - - targetObject: -7511558181221131132 - targetPrefab: 1584083749 - - targetObject: -7511558181221131132 - targetPrefab: 124273105 - - targetObject: -7511558181221131132 - targetPrefab: 1279360754 - targetObject: 4351601775851787701 - targetPrefab: 633609066 + targetPrefab: 1294116878969307432 + - targetObject: -7511558181221131132 + targetPrefab: 1463594309 + - targetObject: 1466060218924807064 + targetPrefab: 428989207 + - targetObject: 2751096909771140069 + targetPrefab: 428989207 + - targetObject: -7511558181221131132 + targetPrefab: 353645666 + - targetObject: 1466060218924807064 + targetPrefab: 1018401441 + - targetObject: 2751096909771140069 + targetPrefab: 1018401441 + - targetObject: -7511558181221131132 + targetPrefab: 102513283 + - targetObject: 2708739958050211779 + targetPrefab: 146729477 - targetObject: 4351601775851787701 targetPrefab: 2024292607 - - targetObject: 4351601775851787701 - targetPrefab: 1720149715 + - targetObject: -7511558181221131132 + targetPrefab: 723913190 + - targetObject: -7511558181221131132 + targetPrefab: 1123331143 - targetObject: 5395762849033877597 targetPrefab: 789002245204939195 - targetObject: -7511558181221131132 - targetPrefab: 353645666 - - targetObject: 7006853779014437907 - targetPrefab: 1049045427 + targetPrefab: 297529246 - targetObject: -7511558181221131132 - targetPrefab: 1557255132 - - targetObject: -7511558181221131132 - targetPrefab: 808969077 + targetPrefab: 1586593148 - targetObject: 1466060218924807064 - targetPrefab: 1305776201 + targetPrefab: 1249864385 - targetObject: 2751096909771140069 - targetPrefab: 1305776201 + targetPrefab: 1249864385 - targetObject: -7511558181221131132 - targetPrefab: 366681287 - - targetObject: 1466060218924807064 - targetPrefab: 1329794381 - - targetObject: 2751096909771140069 - targetPrefab: 1329794381 + targetPrefab: 1972023585 + - targetObject: 1968900501911500709 + targetPrefab: 937910637 + - targetObject: 940995387610717004 + targetPrefab: 937910637 + - targetObject: 4351601775851787701 + targetPrefab: 1058862682 + - targetObject: 4351601775851787701 + targetPrefab: 633609066 + - targetObject: 8810932174823803713 + targetPrefab: 1669769486 + - targetObject: 4351601775851787701 + targetPrefab: 832323181 + - targetObject: 4351601775851787701 + targetPrefab: 1720149715 - targetObject: -7511558181221131132 - targetPrefab: 1470660570 - - targetObject: -7511558181221131132 - targetPrefab: 859579629 - - targetObject: 1466060218924807064 - targetPrefab: 298932333 - - targetObject: 2751096909771140069 - targetPrefab: 298932333 + targetPrefab: 1299739207 + - targetObject: 2708739958050211779 + targetPrefab: 934922675 - targetObject: -7511558181221131132 targetPrefab: 1873800957 - targetObject: -7511558181221131132 - targetPrefab: 2045833766 - - targetObject: 2708739958050211779 - targetPrefab: 146729477 + targetPrefab: 859579629 + - targetObject: -7511558181221131132 + targetPrefab: 600479467 + - targetObject: 4351601775851787701 + targetPrefab: 91371483 + - targetObject: -7511558181221131132 + targetPrefab: 1584083749 + - targetObject: 1466060218924807064 + targetPrefab: 414428781 + - targetObject: 2751096909771140069 + targetPrefab: 414428781 + - targetObject: 5444317254943555344 + targetPrefab: 4953860686005405531 - targetObject: -7511558181221131132 targetPrefab: 580345162 - - targetObject: -7511558181221131132 - targetPrefab: 2134288141 - - targetObject: -7511558181221131132 - targetPrefab: 1299739207 - - targetObject: -7511558181221131132 - targetPrefab: 1629735784 - - targetObject: -7511558181221131132 - targetPrefab: 749395700 + - targetObject: 4856842162814790411 + targetPrefab: 6044205050412544512 - targetObject: 2708739958050211779 targetPrefab: 1582278623 + - targetObject: -7511558181221131132 + targetPrefab: 2134288141 + - targetObject: 5395762849033877597 + targetPrefab: 1984717371 + - targetObject: -7511558181221131132 + targetPrefab: 1188236244 + - targetObject: 1968900501911500709 + targetPrefab: 4438766482650780789 + - targetObject: 940995387610717004 + targetPrefab: 4438766482650780789 + - targetObject: 8810932174823803713 + targetPrefab: 6146163849592780820 + - targetObject: 1466060218924807064 + targetPrefab: 1962599170 + - targetObject: 2751096909771140069 + targetPrefab: 1962599170 + - targetObject: 7006853779014437907 + targetPrefab: 515796176453664510 + - targetObject: -7511558181221131132 + targetPrefab: 577030235 + - targetObject: -7511558181221131132 + targetPrefab: 1427476862 + - targetObject: -7511558181221131132 + targetPrefab: 2119386629 + - targetObject: -7511558181221131132 + targetPrefab: 1629735784 + - targetObject: -7511558181221131132 + targetPrefab: 2045833766 + - targetObject: 4351601775851787701 + targetPrefab: 1768602428 - targetObject: -7511558181221131132 targetPrefab: 760334290 - targetObject: 2708739958050211779 - targetPrefab: 934922675 + targetPrefab: 1584295245487527435 + - targetObject: -7511558181221131132 + targetPrefab: 1279360754 - targetObject: 1466060218924807064 - targetPrefab: 414428781 + targetPrefab: 298932333 - targetObject: 2751096909771140069 - targetPrefab: 414428781 - - targetObject: 4351601775851787701 - targetPrefab: 1294116878969307432 + targetPrefab: 298932333 - targetObject: 1466060218924807064 - targetPrefab: 1962599170 + targetPrefab: 1305776201 - targetObject: 2751096909771140069 - targetPrefab: 1962599170 + targetPrefab: 1305776201 + - targetObject: -7511558181221131132 + targetPrefab: 267965641 + - targetObject: 1466060218924807064 + targetPrefab: 990092987 + - targetObject: 2751096909771140069 + targetPrefab: 990092987 + - targetObject: 7006853779014437907 + targetPrefab: 1049045427 + - targetObject: -7511558181221131132 + targetPrefab: 366681287 + - targetObject: -7511558181221131132 + targetPrefab: 1617502299 + - targetObject: 2708739958050211779 + targetPrefab: 734635744 + - targetObject: -7511558181221131132 + targetPrefab: 749395700 + - targetObject: -7511558181221131132 + targetPrefab: 1976503209 + - targetObject: 1466060218924807064 + targetPrefab: 4480648499976004208 + - targetObject: 2751096909771140069 + targetPrefab: 4480648499976004208 + - targetObject: -7511558181221131132 + targetPrefab: 1557255132 m_Portals: [] diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index f926908..ddc5d94 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index 63dfc08..cbdb3f5 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index 4f18dd8..f826426 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index 1c2dc3d..5353093 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index 2236d84..a761574 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index 0349377..c3cdb2a 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimerSwitchTrigger.asset b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimerSwitchTrigger.asset index ef3c734..5d561ca 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimerSwitchTrigger.asset +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimerSwitchTrigger.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 2 + Data: 3 - Name: Entry: 7 Data: @@ -116,25 +116,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _SwitchToCameraTimer + Data: _EnterSwitchFunction - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _SwitchToCameraTimer + Data: _EnterSwitchFunction - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraTimedSwitcher, Assembly-CSharp + Data: System.String, mscorlib - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -171,6 +171,60 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ExitSwitchFunction + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ExitSwitchFunction + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 13|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimerSwitchTrigger.cs b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimerSwitchTrigger.cs index 2226896..548b5bd 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimerSwitchTrigger.cs +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimerSwitchTrigger.cs @@ -8,14 +8,18 @@ using VRC.SDKBase; public class CameraTimerSwitchTrigger : UdonSharpBehaviour { [SerializeField] private CameraControllerBase _CameraController; - [SerializeField] private CameraTimedSwitcher _SwitchToCameraTimer; + [SerializeField] private string _EnterSwitchFunction = ""; + [SerializeField] private string _ExitSwitchFunction = ""; public override void OnPlayerTriggerEnter(VRCPlayerApi Player) { if (Networking.GetOwner(_CameraController.gameObject) == Networking.LocalPlayer) { - _SwitchToCameraTimer.Activate = true; + if (_EnterSwitchFunction != "") + { + _CameraController.SendCustomEvent(_EnterSwitchFunction); + } } base.OnPlayerTriggerEnter(Player); @@ -25,7 +29,10 @@ public class CameraTimerSwitchTrigger : UdonSharpBehaviour { if (Networking.GetOwner(_CameraController.gameObject) == Networking.LocalPlayer) { - _SwitchToCameraTimer.Activate = false; + if (_ExitSwitchFunction != "") + { + _CameraController.SendCustomEvent(_ExitSwitchFunction); + } } base.OnPlayerTriggerExit(Player); diff --git a/Assets/UdonSharp/Cameras/CameraControllerBase.asset b/Assets/UdonSharp/Cameras/CameraControllerBase.asset index 82a8489..2378d00 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerBase.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerBase.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 2 + Data: 3 - Name: Entry: 7 Data: @@ -171,6 +171,60 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ActiveSwitcher + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ActiveSwitcher + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraTimedSwitcher, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 13|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/Cameras/CameraControllerBase.cs b/Assets/UdonSharp/Cameras/CameraControllerBase.cs index 0fe5730..11cac01 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerBase.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerBase.cs @@ -14,6 +14,8 @@ public class CameraControllerBase : UdonSharpBehaviour [UdonSynced] private int _ActiveCamera = -1; + private CameraTimedSwitcher _ActiveSwitcher = null; + public override void OnDeserialization(DeserializationResult Result) { @@ -45,6 +47,27 @@ public class CameraControllerBase : UdonSharpBehaviour } } + public void ActivateCameraSwitcher(CameraTimedSwitcher Switcher = null) + { + if (_ActiveSwitcher == Switcher) + { + return; + } + + if (_ActiveSwitcher != null) + { + _ActiveSwitcher.Activate = false; + } + + _ActiveSwitcher = Switcher; + + if (_ActiveSwitcher != null) + { + _ActiveSwitcher.Activate = true; + } + + } + public virtual void DisableAllTriggers() { Debug.LogError("[CameraControllerBase] This function has not been reimplemented, or is called from a child class."); diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset index 83306be..b2d860d 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 32 + Data: 34 - Name: Entry: 7 Data: @@ -176,25 +176,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player1Camera + Data: _ActiveSwitcher - Name: $v Entry: 7 Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player1Camera + Data: _ActiveSwitcher - Name: k__BackingField Entry: 7 Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Camera, UnityEngine.CoreModule + Data: CameraTimedSwitcher, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 12 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -206,28 +206,13 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 14|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -245,19 +230,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player2Camera + Data: Player1Camera - Name: $v Entry: 7 - Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player2Camera + Data: Player1Camera - Name: k__BackingField - Entry: 9 - Data: 12 + Entry: 7 + Data: 15|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Camera, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -272,10 +263,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 17|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -299,19 +299,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player3Camera + Data: Player2Camera - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player3Camera + Data: Player2Camera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -353,19 +353,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostCamera + Data: Player3Camera - Name: $v Entry: 7 Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HostCamera + Data: Player3Camera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -407,19 +407,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: PrimaryFocusCamera + Data: HostCamera - Name: $v Entry: 7 Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: PrimaryFocusCamera + Data: HostCamera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -461,19 +461,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: VideoPlayerCamera + Data: PrimaryFocusCamera - Name: $v Entry: 7 Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: VideoPlayerCamera + Data: PrimaryFocusCamera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -515,16 +515,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostCameraTrigger + Data: VideoPlayerCamera - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayerCamera + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 9 + Data: 15 + - 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: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 33|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: HostCameraTrigger + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostCameraTrigger - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraTimerSwitchTrigger, Assembly-CSharp @@ -548,13 +602,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 34|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 37|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -563,7 +617,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -587,19 +641,13 @@ MonoBehaviour: Data: HostAndAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostAndAllPlayersTimerToggle - Name: k__BackingField - Entry: 7 - Data: 37|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraTimedSwitcher, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -617,13 +665,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 39|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 41|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -632,7 +680,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 40|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -656,13 +704,13 @@ MonoBehaviour: Data: HostAndIndividualPlayersTimerToggle - Name: $v Entry: 7 - Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostAndIndividualPlayersTimerToggle - Name: k__BackingField Entry: 9 - Data: 37 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -680,13 +728,67 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 43|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 45|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: AllPlayersAssignStarterPointsTimerToggle + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: AllPlayersAssignStarterPointsTimerToggle + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 48|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -710,13 +812,13 @@ MonoBehaviour: Data: MapToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: MapToHostAndAllPlayersTimerToggle - Name: k__BackingField Entry: 9 - Data: 37 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -734,13 +836,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 51|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -764,13 +866,13 @@ MonoBehaviour: Data: LightningStartToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LightningStartToHostAndAllPlayersTimerToggle - Name: k__BackingField Entry: 9 - Data: 37 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -788,13 +890,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -818,13 +920,13 @@ MonoBehaviour: Data: CorrectToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: CorrectToHostAndAllPlayersTimerToggle - Name: k__BackingField Entry: 9 - Data: 37 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -842,13 +944,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 51|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: 52|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 57|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -872,13 +974,13 @@ MonoBehaviour: Data: IncorrectToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: IncorrectToHostAndAllPlayersTimerToggle - Name: k__BackingField Entry: 9 - Data: 37 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -896,13 +998,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 60|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -926,13 +1028,13 @@ MonoBehaviour: Data: ThinkAboutItTimerToggle - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: ThinkAboutItTimerToggle - Name: k__BackingField Entry: 9 - Data: 37 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -950,13 +1052,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -980,13 +1082,13 @@ MonoBehaviour: Data: BuzzedInPlayerTimerToggle - Name: $v Entry: 7 - Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: BuzzedInPlayerTimerToggle - Name: k__BackingField Entry: 9 - Data: 37 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -1004,79 +1106,10 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 60|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: 61|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: _CameraAnimator - - Name: $v - Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CameraAnimator - - Name: k__BackingField - Entry: 7 - Data: 63|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 63 - - 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: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 65|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - Name: Entry: 7 Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1100,25 +1133,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player1CameraAnchor + Data: _CameraAnimator - Name: $v Entry: 7 Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player1CameraAnchor + Data: _CameraAnimator - Name: k__BackingField Entry: 7 Data: 68|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraAnchor, Assembly-CSharp + Data: UnityEngine.Animator, UnityEngine.AnimationModule - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 68 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1169,16 +1202,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player2CameraAnchor + Data: Player1CameraAnchor - Name: $v Entry: 7 Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player2CameraAnchor + Data: Player1CameraAnchor - Name: k__BackingField - Entry: 9 - Data: 68 + Entry: 7 + Data: 73|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraAnchor, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -1196,283 +1235,13 @@ MonoBehaviour: 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: Player3CameraAnchor - - Name: $v - Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: Player3CameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 68 - - Name: k__BackingField - Entry: 9 - Data: 4 - - 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 - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 77|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: HostCameraAnchor - - Name: $v - Entry: 7 - Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: HostCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 68 - - Name: k__BackingField - Entry: 9 - Data: 4 - - 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: DefaultWideShotCameraAnchor - - Name: $v - Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: DefaultWideShotCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 68 - - Name: k__BackingField - Entry: 9 - Data: 4 - - 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: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 83|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: VideoPlayerCameraAnchor - - Name: $v - Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: VideoPlayerCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 68 - - Name: k__BackingField - Entry: 9 - Data: 4 - - 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: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 86|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: OpeningCameraAnchor - - Name: $v - Entry: 7 - Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: OpeningCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 68 - - Name: k__BackingField - Entry: 9 - Data: 4 - - 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: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 89|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 75|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1481,7 +1250,340 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 90|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 76|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: Player2CameraAnchor + - Name: $v + Entry: 7 + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player2CameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 73 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 79|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: Player3CameraAnchor + - Name: $v + Entry: 7 + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player3CameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 73 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 82|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: HostCameraAnchor + - Name: $v + Entry: 7 + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HostCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 73 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 85|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: DefaultWideShotCameraAnchor + - Name: $v + Entry: 7 + Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: DefaultWideShotCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 73 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 88|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: VideoPlayerCameraAnchor + - Name: $v + Entry: 7 + Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 73 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 91|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: OpeningCameraAnchor + - Name: $v + Entry: 7 + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: OpeningCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 73 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 94|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 95|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1505,13 +1607,13 @@ MonoBehaviour: Data: AllPlayersViewCameraAnchor - Name: $v Entry: 7 - Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: AllPlayersViewCameraAnchor - Name: k__BackingField Entry: 9 - Data: 68 + Data: 73 - Name: k__BackingField Entry: 9 Data: 4 @@ -1529,13 +1631,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 93|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 98|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1559,13 +1661,13 @@ MonoBehaviour: Data: VideoMusicClueCameraAnchor - Name: $v Entry: 7 - Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: VideoMusicClueCameraAnchor - Name: k__BackingField Entry: 9 - Data: 68 + Data: 73 - Name: k__BackingField Entry: 9 Data: 4 @@ -1583,13 +1685,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 96|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 101|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1613,13 +1716,13 @@ MonoBehaviour: Data: ACMECrimenetComputerCameraAnchor - Name: $v Entry: 7 - Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: ACMECrimenetComputerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 68 + Data: 73 - Name: k__BackingField Entry: 9 Data: 4 @@ -1637,13 +1740,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 99|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 104|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1667,13 +1771,13 @@ MonoBehaviour: Data: FilingCabinetCameraAnchor - Name: $v Entry: 7 - Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: FilingCabinetCameraAnchor - Name: k__BackingField Entry: 9 - Data: 68 + Data: 73 - Name: k__BackingField Entry: 9 Data: 4 @@ -1691,14 +1795,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 106|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 102|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 107|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1722,13 +1826,13 @@ MonoBehaviour: Data: ModemCameraAnchor - Name: $v Entry: 7 - Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: ModemCameraAnchor - Name: k__BackingField Entry: 9 - Data: 68 + Data: 73 - Name: k__BackingField Entry: 9 Data: 4 @@ -1746,14 +1850,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 105|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 110|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1777,13 +1881,13 @@ MonoBehaviour: Data: _PlayOpening - Name: $v Entry: 7 - Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayOpening - Name: k__BackingField Entry: 7 - Data: 107|System.RuntimeType, mscorlib + Data: 112|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -1792,7 +1896,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 107 + Data: 112 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1807,20 +1911,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 109|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 114|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 110|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 115|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1844,16 +1948,16 @@ MonoBehaviour: Data: _PlayOpeningDoorway - Name: $v Entry: 7 - Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayOpeningDoorway - Name: k__BackingField Entry: 9 - Data: 107 + Data: 112 - Name: k__BackingField Entry: 9 - Data: 107 + Data: 112 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1868,20 +1972,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 113|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 118|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 114|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 119|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs index 62fc5c3..49adf07 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs @@ -21,6 +21,7 @@ public class CameraControllerRound1 : CameraControllerBase [Space] [SerializeField] public CameraTimedSwitcher HostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher HostAndIndividualPlayersTimerToggle; + [SerializeField] public CameraTimedSwitcher AllPlayersAssignStarterPointsTimerToggle; [SerializeField] public CameraTimedSwitcher MapToHostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher LightningStartToHostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher CorrectToHostAndAllPlayersTimerToggle; @@ -208,99 +209,49 @@ public class CameraControllerRound1 : CameraControllerBase public void ActivateHostAllPlayersCameraSwitcher() { ActivateAllPlayersCamera(); - HostAndAllPlayersTimerToggle.Activate = true; - HostAndIndividualPlayersTimerToggle.Activate = false; - MapToHostAndAllPlayersTimerToggle.Activate = false; - LightningStartToHostAndAllPlayersTimerToggle.Activate = false; - CorrectToHostAndAllPlayersTimerToggle.Activate = false; - IncorrectToHostAndAllPlayersTimerToggle.Activate = false; - ThinkAboutItTimerToggle.Activate = false; - BuzzedInPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(HostAndAllPlayersTimerToggle); } public void ActivateHostIndividualPlayersCameraSwitcher() { - HostAndAllPlayersTimerToggle.Activate = false; - HostAndIndividualPlayersTimerToggle.Activate = true; - MapToHostAndAllPlayersTimerToggle.Activate = false; - LightningStartToHostAndAllPlayersTimerToggle.Activate = false; - CorrectToHostAndAllPlayersTimerToggle.Activate = false; - IncorrectToHostAndAllPlayersTimerToggle.Activate = false; - ThinkAboutItTimerToggle.Activate = false; - BuzzedInPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(HostAndIndividualPlayersTimerToggle); + } + + public void ActivateAllPlayersAssignStarterPointsCameraSwitcher() + { + ActivateAllPlayersCamera(); + ActivateCameraSwitcher(AllPlayersAssignStarterPointsTimerToggle); } public void ActivateMapToHostAllPlayersCameraSwitcher() { - HostAndAllPlayersTimerToggle.Activate = false; - HostAndIndividualPlayersTimerToggle.Activate = false; - MapToHostAndAllPlayersTimerToggle.Activate = true; - LightningStartToHostAndAllPlayersTimerToggle.Activate = false; - CorrectToHostAndAllPlayersTimerToggle.Activate = false; - IncorrectToHostAndAllPlayersTimerToggle.Activate = false; - ThinkAboutItTimerToggle.Activate = false; - BuzzedInPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(MapToHostAndAllPlayersTimerToggle); } public void ActivateLightningStartToHostAllPlayersCameraSwitcher() { ActivateWideShotCamera(); - HostAndAllPlayersTimerToggle.Activate = false; - HostAndIndividualPlayersTimerToggle.Activate = false; - MapToHostAndAllPlayersTimerToggle.Activate = false; - LightningStartToHostAndAllPlayersTimerToggle.Activate = true; - CorrectToHostAndAllPlayersTimerToggle.Activate = false; - IncorrectToHostAndAllPlayersTimerToggle.Activate = false; - ThinkAboutItTimerToggle.Activate = false; - BuzzedInPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(LightningStartToHostAndAllPlayersTimerToggle); } public void ActivateCorrectAnswerToHostAllPlayersCameraSwitcher() { - HostAndAllPlayersTimerToggle.Activate = false; - HostAndIndividualPlayersTimerToggle.Activate = false; - MapToHostAndAllPlayersTimerToggle.Activate = false; - LightningStartToHostAndAllPlayersTimerToggle.Activate = false; - CorrectToHostAndAllPlayersTimerToggle.Activate = true; - IncorrectToHostAndAllPlayersTimerToggle.Activate = false; - ThinkAboutItTimerToggle.Activate = false; - BuzzedInPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(CorrectToHostAndAllPlayersTimerToggle); } public void ActivateIncorrectAnswerToHostAllPlayersCameraSwitcher() { - HostAndAllPlayersTimerToggle.Activate = false; - HostAndIndividualPlayersTimerToggle.Activate = false; - MapToHostAndAllPlayersTimerToggle.Activate = false; - LightningStartToHostAndAllPlayersTimerToggle.Activate = false; - CorrectToHostAndAllPlayersTimerToggle.Activate = false; - IncorrectToHostAndAllPlayersTimerToggle.Activate = true; - ThinkAboutItTimerToggle.Activate = false; - BuzzedInPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(IncorrectToHostAndAllPlayersTimerToggle); } public void ActivateThinkAboutItCameraSwitcher() { - HostAndAllPlayersTimerToggle.Activate = false; - HostAndIndividualPlayersTimerToggle.Activate = false; - MapToHostAndAllPlayersTimerToggle.Activate = false; - LightningStartToHostAndAllPlayersTimerToggle.Activate = false; - CorrectToHostAndAllPlayersTimerToggle.Activate = false; - IncorrectToHostAndAllPlayersTimerToggle.Activate = false; - ThinkAboutItTimerToggle.Activate = true; - BuzzedInPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(ThinkAboutItTimerToggle); } public void ActivateBuzzedInPlayerCameraSwitcher() { - HostAndAllPlayersTimerToggle.Activate = false; - HostAndIndividualPlayersTimerToggle.Activate = false; - MapToHostAndAllPlayersTimerToggle.Activate = false; - LightningStartToHostAndAllPlayersTimerToggle.Activate = false; - CorrectToHostAndAllPlayersTimerToggle.Activate = false; - IncorrectToHostAndAllPlayersTimerToggle.Activate = false; - ThinkAboutItTimerToggle.Activate = false; - BuzzedInPlayerTimerToggle.Activate = true; + ActivateCameraSwitcher(BuzzedInPlayerTimerToggle); } @@ -349,14 +300,7 @@ public class CameraControllerRound1 : CameraControllerBase public override void DisableAllSwitchers() { - HostAndAllPlayersTimerToggle.Activate = false; - HostAndIndividualPlayersTimerToggle.Activate = false; - MapToHostAndAllPlayersTimerToggle.Activate = false; - LightningStartToHostAndAllPlayersTimerToggle.Activate = false; - CorrectToHostAndAllPlayersTimerToggle.Activate = false; - IncorrectToHostAndAllPlayersTimerToggle.Activate = false; - ThinkAboutItTimerToggle.Activate = false; - BuzzedInPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(null); } diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset index 86bf84d..426730d 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 26 + Data: 27 - Name: Entry: 7 Data: @@ -176,25 +176,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player1Camera + Data: _ActiveSwitcher - Name: $v Entry: 7 Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player1Camera + Data: _ActiveSwitcher - Name: k__BackingField Entry: 7 Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Camera, UnityEngine.CoreModule + Data: CameraTimedSwitcher, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 12 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -206,28 +206,13 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 14|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -245,19 +230,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player2Camera + Data: Player1Camera - Name: $v Entry: 7 - Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player2Camera + Data: Player1Camera - Name: k__BackingField - Entry: 9 - Data: 12 + Entry: 7 + Data: 15|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Camera, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -272,10 +263,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 17|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -299,19 +299,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostAndWinnerCamera + Data: Player2Camera - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HostAndWinnerCamera + Data: Player2Camera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -353,19 +353,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: LocationBoardCamera + Data: HostAndWinnerCamera - Name: $v Entry: 7 Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: LocationBoardCamera + Data: HostAndWinnerCamera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -407,19 +407,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: PrimaryFocusCamera + Data: LocationBoardCamera - Name: $v Entry: 7 Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: PrimaryFocusCamera + Data: LocationBoardCamera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -461,19 +461,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: VideoPlayerCamera + Data: PrimaryFocusCamera - Name: $v Entry: 7 Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: VideoPlayerCamera + Data: PrimaryFocusCamera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -515,16 +515,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostAndAllPlayersCameraTrigger + Data: VideoPlayerCamera - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayerCamera + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 9 + Data: 15 + - 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: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 33|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: HostAndAllPlayersCameraTrigger + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostAndAllPlayersCameraTrigger - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraTimerSwitchTrigger, Assembly-CSharp @@ -548,13 +602,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 34|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 37|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -563,7 +617,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -587,13 +641,13 @@ MonoBehaviour: Data: HostAndWinnerCameraTrigger - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostAndWinnerCameraTrigger - Name: k__BackingField Entry: 7 - Data: 37|System.RuntimeType, mscorlib + Data: 40|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraSwitchTrigger, Assembly-CSharp @@ -617,13 +671,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -647,19 +701,13 @@ MonoBehaviour: Data: HostAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostAllPlayersTimerToggle - Name: k__BackingField - Entry: 7 - Data: 41|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraTimedSwitcher, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -677,13 +725,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 43|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 45|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -692,7 +740,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 44|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -716,13 +764,13 @@ MonoBehaviour: Data: HostPlayersAndWideShotTimerToggle - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostPlayersAndWideShotTimerToggle - Name: k__BackingField Entry: 9 - Data: 41 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -740,13 +788,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -770,13 +818,13 @@ MonoBehaviour: Data: Player1AndLocationBoardTimerToggle - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player1AndLocationBoardTimerToggle - Name: k__BackingField Entry: 9 - Data: 41 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -794,13 +842,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -824,13 +872,13 @@ MonoBehaviour: Data: Player2AndLocationBoardTimerToggle - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player2AndLocationBoardTimerToggle - Name: k__BackingField Entry: 9 - Data: 41 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -848,13 +896,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -878,13 +926,13 @@ MonoBehaviour: Data: LocationBoardAndShortHostTimerToggle - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationBoardAndShortHostTimerToggle - Name: k__BackingField Entry: 9 - Data: 41 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -902,13 +950,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -932,13 +980,13 @@ MonoBehaviour: Data: LocationBoardAndLongHostTimerToggle - Name: $v Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationBoardAndLongHostTimerToggle - Name: k__BackingField Entry: 9 - Data: 41 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -956,13 +1004,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 58|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: 59|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -986,13 +1034,13 @@ MonoBehaviour: Data: LocationBoardAndWinningPlayerTimerToggle - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationBoardAndWinningPlayerTimerToggle - Name: k__BackingField Entry: 9 - Data: 41 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -1010,13 +1058,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 64|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1040,13 +1088,13 @@ MonoBehaviour: Data: VideoPlayerToWinningPlayerTimerToggle - Name: $v Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: VideoPlayerToWinningPlayerTimerToggle - Name: k__BackingField Entry: 9 - Data: 41 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -1064,13 +1112,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 67|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1094,13 +1142,13 @@ MonoBehaviour: Data: Player1CameraAnchor - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player1CameraAnchor - Name: k__BackingField Entry: 7 - Data: 67|System.RuntimeType, mscorlib + Data: 69|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraAnchor, Assembly-CSharp @@ -1124,13 +1172,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 69|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 71|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1139,7 +1187,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 72|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1163,13 +1211,13 @@ MonoBehaviour: Data: Player2CameraAnchor - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player2CameraAnchor - Name: k__BackingField Entry: 9 - Data: 67 + Data: 69 - Name: k__BackingField Entry: 9 Data: 4 @@ -1187,13 +1235,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 73|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 75|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1217,13 +1265,13 @@ MonoBehaviour: Data: HostAndWinnerCameraAnchor - Name: $v Entry: 7 - Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostAndWinnerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 67 + Data: 69 - Name: k__BackingField Entry: 9 Data: 4 @@ -1241,13 +1289,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 75|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: 76|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1271,13 +1319,13 @@ MonoBehaviour: Data: LocationBoardCameraAnchor - Name: $v Entry: 7 - Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationBoardCameraAnchor - Name: k__BackingField Entry: 9 - Data: 67 + Data: 69 - Name: k__BackingField Entry: 9 Data: 4 @@ -1295,13 +1343,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 79|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1325,13 +1373,13 @@ MonoBehaviour: Data: ModemCameraAnchor - Name: $v Entry: 7 - Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: ModemCameraAnchor - Name: k__BackingField Entry: 9 - Data: 67 + Data: 69 - Name: k__BackingField Entry: 9 Data: 4 @@ -1349,13 +1397,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 81|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: 82|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 84|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1379,13 +1427,13 @@ MonoBehaviour: Data: VideoPlayerCameraAnchor - Name: $v Entry: 7 - Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: VideoPlayerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 67 + Data: 69 - Name: k__BackingField Entry: 9 Data: 4 @@ -1403,13 +1451,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 84|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: 85|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 87|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1433,13 +1481,13 @@ MonoBehaviour: Data: WideShotCameraAnchor - Name: $v Entry: 7 - Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: WideShotCameraAnchor - Name: k__BackingField Entry: 9 - Data: 67 + Data: 69 - Name: k__BackingField Entry: 9 Data: 4 @@ -1457,13 +1505,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 88|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 90|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1472,7 +1520,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 89|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 91|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1496,13 +1544,13 @@ MonoBehaviour: Data: AllPlayersCameraAnchor - Name: $v Entry: 7 - Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: AllPlayersCameraAnchor - Name: k__BackingField Entry: 9 - Data: 67 + Data: 69 - Name: k__BackingField Entry: 9 Data: 4 @@ -1520,13 +1568,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 92|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs index c23f43f..927468b 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs @@ -137,98 +137,42 @@ public class CameraControllerRound2 : CameraControllerBase public void ActivateHostAllPlayersCameraSwitcher() { - HostAllPlayersTimerToggle.Activate = true; - HostPlayersAndWideShotTimerToggle.Activate = false; - Player1AndLocationBoardTimerToggle.Activate = false; - Player2AndLocationBoardTimerToggle.Activate = false; - LocationBoardAndShortHostTimerToggle.Activate = false; - LocationBoardAndLongHostTimerToggle.Activate = false; - LocationBoardAndWinningPlayerTimerToggle.Activate = false; - VideoPlayerToWinningPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(HostAllPlayersTimerToggle); } public void ActivateHostPlayersAndWideShotCameraSwitcher() { - HostAllPlayersTimerToggle.Activate = false; - HostPlayersAndWideShotTimerToggle.Activate = true; - Player1AndLocationBoardTimerToggle.Activate = false; - Player2AndLocationBoardTimerToggle.Activate = false; - LocationBoardAndShortHostTimerToggle.Activate = false; - LocationBoardAndLongHostTimerToggle.Activate = false; - LocationBoardAndWinningPlayerTimerToggle.Activate = false; - VideoPlayerToWinningPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(HostPlayersAndWideShotTimerToggle); } public void ActivatePlayer1AndLocationBoardCameraSwitcher() { - HostAllPlayersTimerToggle.Activate = false; - HostPlayersAndWideShotTimerToggle.Activate = false; - Player1AndLocationBoardTimerToggle.Activate = true; - Player2AndLocationBoardTimerToggle.Activate = false; - LocationBoardAndShortHostTimerToggle.Activate = false; - LocationBoardAndLongHostTimerToggle.Activate = false; - LocationBoardAndWinningPlayerTimerToggle.Activate = false; - VideoPlayerToWinningPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(Player1AndLocationBoardTimerToggle); } public void ActivatePlayer2AndLocationBoardCameraSwitcher() { - HostAllPlayersTimerToggle.Activate = false; - HostPlayersAndWideShotTimerToggle.Activate = false; - Player1AndLocationBoardTimerToggle.Activate = false; - Player2AndLocationBoardTimerToggle.Activate = true; - LocationBoardAndShortHostTimerToggle.Activate = false; - LocationBoardAndLongHostTimerToggle.Activate = false; - LocationBoardAndWinningPlayerTimerToggle.Activate = false; - VideoPlayerToWinningPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(Player2AndLocationBoardTimerToggle); } public void ActivateLocationBoardAndShortHostCameraSwitcher() { - HostAllPlayersTimerToggle.Activate = false; - HostPlayersAndWideShotTimerToggle.Activate = false; - Player1AndLocationBoardTimerToggle.Activate = false; - Player2AndLocationBoardTimerToggle.Activate = false; - LocationBoardAndShortHostTimerToggle.Activate = true; - LocationBoardAndLongHostTimerToggle.Activate = false; - LocationBoardAndWinningPlayerTimerToggle.Activate = false; - VideoPlayerToWinningPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(LocationBoardAndShortHostTimerToggle); } public void ActivateLocationBoardAndLongHostCameraSwitcher() { - HostAllPlayersTimerToggle.Activate = false; - HostPlayersAndWideShotTimerToggle.Activate = false; - Player1AndLocationBoardTimerToggle.Activate = false; - Player2AndLocationBoardTimerToggle.Activate = false; - LocationBoardAndShortHostTimerToggle.Activate = false; - LocationBoardAndLongHostTimerToggle.Activate = true; - LocationBoardAndWinningPlayerTimerToggle.Activate = false; - VideoPlayerToWinningPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(LocationBoardAndLongHostTimerToggle); } public void ActivateLocationBoardAndWinningPlayerCameraSwitcher() { - HostAllPlayersTimerToggle.Activate = false; - HostPlayersAndWideShotTimerToggle.Activate = false; - Player1AndLocationBoardTimerToggle.Activate = false; - Player2AndLocationBoardTimerToggle.Activate = false; - LocationBoardAndShortHostTimerToggle.Activate = false; - LocationBoardAndLongHostTimerToggle.Activate = false; - LocationBoardAndWinningPlayerTimerToggle.Activate = true; - VideoPlayerToWinningPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(LocationBoardAndWinningPlayerTimerToggle); } public void ActivateVideoPlayerToWinningPlayerCameraSwitcher() { - HostAllPlayersTimerToggle.Activate = false; - HostPlayersAndWideShotTimerToggle.Activate = false; - Player1AndLocationBoardTimerToggle.Activate = false; - Player2AndLocationBoardTimerToggle.Activate = false; - LocationBoardAndShortHostTimerToggle.Activate = false; - LocationBoardAndLongHostTimerToggle.Activate = false; - LocationBoardAndWinningPlayerTimerToggle.Activate = false; - VideoPlayerToWinningPlayerTimerToggle.Activate = true; + ActivateCameraSwitcher(VideoPlayerToWinningPlayerTimerToggle); } @@ -259,12 +203,6 @@ public class CameraControllerRound2 : CameraControllerBase public override void DisableAllSwitchers() { - HostAllPlayersTimerToggle.Activate = false; - HostPlayersAndWideShotTimerToggle.Activate = false; - Player1AndLocationBoardTimerToggle.Activate = false; - Player2AndLocationBoardTimerToggle.Activate = false; - LocationBoardAndShortHostTimerToggle.Activate = false; - LocationBoardAndLongHostTimerToggle.Activate = false; - LocationBoardAndWinningPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(null); } } diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.asset b/Assets/UdonSharp/Cameras/CameraControllerRound3.asset index 863ae61..b5a65b7 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound3.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 23 + Data: 24 - Name: Entry: 7 Data: @@ -176,25 +176,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: PlayerCamera + Data: _ActiveSwitcher - Name: $v Entry: 7 Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: PlayerCamera + Data: _ActiveSwitcher - Name: k__BackingField Entry: 7 Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Camera, UnityEngine.CoreModule + Data: CameraTimedSwitcher, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 12 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -206,28 +206,13 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 14|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -245,19 +230,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostCamera + Data: PlayerCamera - Name: $v Entry: 7 - Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HostCamera + Data: PlayerCamera - Name: k__BackingField - Entry: 9 - Data: 12 + Entry: 7 + Data: 15|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Camera, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -272,10 +263,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 17|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -299,19 +299,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: OverheadCamera + Data: HostCamera - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: OverheadCamera + Data: HostCamera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -353,19 +353,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: FrontCamera + Data: OverheadCamera - Name: $v Entry: 7 Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: FrontCamera + Data: OverheadCamera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -407,19 +407,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: PrimaryFocusCamera + Data: FrontCamera - Name: $v Entry: 7 Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: PrimaryFocusCamera + Data: FrontCamera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -461,19 +461,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: VideoPlayerCamera + Data: PrimaryFocusCamera - Name: $v Entry: 7 Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: VideoPlayerCamera + Data: PrimaryFocusCamera - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 12 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -515,25 +515,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: PlayfieldSwitchTriggerGroup + Data: VideoPlayerCamera - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: PlayfieldSwitchTriggerGroup + Data: VideoPlayerCamera - Name: k__BackingField - Entry: 7 - Data: 32|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.GameObject, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 15 - Name: k__BackingField Entry: 9 - Data: 32 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -548,13 +542,73 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 33|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: PlayfieldSwitchTriggerGroup + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: PlayfieldSwitchTriggerGroup + - Name: k__BackingField + Entry: 7 + Data: 35|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 35 + - 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: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 34|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 37|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -563,7 +617,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -587,19 +641,13 @@ MonoBehaviour: Data: HostPlayerTimerToggle - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostPlayerTimerToggle - Name: k__BackingField - Entry: 7 - Data: 37|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraTimedSwitcher, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 12 - Name: k__BackingField Entry: 9 Data: 4 @@ -617,13 +665,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 39|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 41|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -632,7 +680,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 40|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -656,13 +704,13 @@ MonoBehaviour: Data: _CameraAnimator - Name: $v Entry: 7 - Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraAnimator - Name: k__BackingField Entry: 7 - Data: 42|System.RuntimeType, mscorlib + Data: 44|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -671,7 +719,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 42 + Data: 44 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -686,13 +734,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 44|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 46|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -701,7 +749,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -725,13 +773,13 @@ MonoBehaviour: Data: HostStartingCameraAnchor - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostStartingCameraAnchor - Name: k__BackingField Entry: 7 - Data: 47|System.RuntimeType, mscorlib + Data: 49|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraAnchor, Assembly-CSharp @@ -755,13 +803,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 49|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 51|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -770,7 +818,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -794,13 +842,13 @@ MonoBehaviour: Data: PlayerStartingCameraAnchor - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: PlayerStartingCameraAnchor - Name: k__BackingField Entry: 9 - Data: 47 + Data: 49 - Name: k__BackingField Entry: 9 Data: 4 @@ -818,13 +866,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -848,13 +896,13 @@ MonoBehaviour: Data: OverheadCameraAnchor - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: OverheadCameraAnchor - Name: k__BackingField Entry: 9 - Data: 47 + Data: 49 - Name: k__BackingField Entry: 9 Data: 4 @@ -872,13 +920,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -902,13 +950,13 @@ MonoBehaviour: Data: FrontCameraAnchor - Name: $v Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: FrontCameraAnchor - Name: k__BackingField Entry: 9 - Data: 47 + Data: 49 - Name: k__BackingField Entry: 9 Data: 4 @@ -926,13 +974,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 58|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: 59|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -956,13 +1004,13 @@ MonoBehaviour: Data: NewspaperCameraAnchor - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: NewspaperCameraAnchor - Name: k__BackingField Entry: 9 - Data: 47 + Data: 49 - Name: k__BackingField Entry: 9 Data: 4 @@ -980,13 +1028,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 64|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1010,13 +1058,13 @@ MonoBehaviour: Data: VideoPlayerCameraAnchor - Name: $v Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: VideoPlayerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 47 + Data: 49 - Name: k__BackingField Entry: 9 Data: 4 @@ -1034,13 +1082,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 67|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1064,13 +1112,13 @@ MonoBehaviour: Data: HostCameraAnchorSequence - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostCameraAnchorSequence - Name: k__BackingField Entry: 7 - Data: 67|System.RuntimeType, mscorlib + Data: 69|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraAnchor[], Assembly-CSharp @@ -1079,7 +1127,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 68|System.RuntimeType, mscorlib + Data: 70|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -1100,13 +1148,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 70|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 72|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1115,7 +1163,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 71|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 73|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1139,16 +1187,16 @@ MonoBehaviour: Data: PlayerCameraAnchorSequence - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: PlayerCameraAnchorSequence - Name: k__BackingField Entry: 9 - Data: 67 + Data: 69 - Name: k__BackingField Entry: 9 - Data: 68 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1163,13 +1211,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 76|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1193,13 +1241,13 @@ MonoBehaviour: Data: _ActivatePlayfieldSwitchTriggerGroup - Name: $v Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ActivatePlayfieldSwitchTriggerGroup - Name: k__BackingField Entry: 7 - Data: 76|System.RuntimeType, mscorlib + Data: 78|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -1208,7 +1256,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 76 + Data: 78 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1223,19 +1271,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 78|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 79|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 81|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1259,7 +1307,7 @@ MonoBehaviour: Data: _MarkerCameraAnchorPosition - Name: $v Entry: 7 - Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MarkerCameraAnchorPosition @@ -1283,19 +1331,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 82|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 84|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 83|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 85|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1319,16 +1367,16 @@ MonoBehaviour: Data: _PlayIFeelGood - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayIFeelGood - Name: k__BackingField Entry: 9 - Data: 76 + Data: 78 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 78 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1343,19 +1391,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 88|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 87|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 89|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1379,16 +1427,16 @@ MonoBehaviour: Data: _PlayDoItRockapella - Name: $v Entry: 7 - Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayDoItRockapella - Name: k__BackingField Entry: 9 - Data: 76 + Data: 78 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 78 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1403,19 +1451,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 92|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 91|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 93|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs index 5cb5811..d7c8e96 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs @@ -140,7 +140,7 @@ public class CameraControllerRound3 : CameraControllerBase public void ActivateHostPlayerCameraSwitcher() { - HostPlayerTimerToggle.Activate = true; + ActivateCameraSwitcher(HostPlayerTimerToggle); } @@ -176,7 +176,7 @@ public class CameraControllerRound3 : CameraControllerBase public override void DisableAllSwitchers() { - HostPlayerTimerToggle.Activate = false; + ActivateCameraSwitcher(null); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 306bc68..c599720 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -223,8 +223,16 @@ public class GameManagerRound1 : GameManagerBase private void AssignStarterPoints() { - InitialiseQuestion(); + DisableChoiceCards(); + DisableRiskCards(); + DisableBuzzers(); + _CameraControllerRound1.DisableAllSwitchers(); + _CameraControllerRound1.SwitchToAllPlayersCamera(); + SendCustomEventDelayedSeconds(nameof(AssignStarterPoints_Delayed), 0.5f); + } + public void AssignStarterPoints_Delayed() + { for (int i = 0; i < _PlayerPodiums.Length; i++) { _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "DisplayScore"); @@ -233,15 +241,13 @@ public class GameManagerRound1 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.D6); - DisableChoiceCards(); - DisableRiskCards(); - DisableBuzzers(); - - _CameraControllerRound1.ActivateHostAllPlayersCameraSwitcher(); - - ShowBetweenQuestionsInterface(); - + SendCustomEventDelayedSeconds(nameof(BeginGame_Delayed), 1.5f); + } + public void BeginGame_Delayed() + { _GameHasBegun = true; + InitialiseQuestion(); + ShowBetweenQuestionsInterface(); } diff --git a/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset b/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset index 46790a4..c52ebb3 100644 --- a/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset +++ b/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 20 + Data: 22 - Name: Entry: 7 Data: @@ -1166,16 +1166,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _SelectedTabColour + Data: _PotatoModeImage - Name: $v Entry: 7 Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _SelectedTabColour + Data: _PotatoModeImage + - Name: k__BackingField + Entry: 9 + Data: 25 + - Name: k__BackingField + Entry: 9 + Data: 25 + - 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: 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: SELECTED_TAB_COLOUR + - Name: $v + Entry: 7 + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: SELECTED_TAB_COLOUR - Name: k__BackingField Entry: 7 - Data: 73|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Color, UnityEngine.CoreModule @@ -1184,7 +1238,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 73 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1199,7 +1253,55 @@ MonoBehaviour: Data: false - 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: 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: POTATO_TOGGLED_ON_COLOUR + - Name: $v + Entry: 7 + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: POTATO_TOGGLED_ON_COLOUR + - Name: k__BackingField + Entry: 9 + Data: 76 + - Name: k__BackingField + Entry: 9 + Data: 76 + - 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 diff --git a/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs b/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs index 73e754b..6d7810c 100644 --- a/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs +++ b/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs @@ -45,8 +45,10 @@ public class HostPanelInterface : UdonSharpBehaviour [SerializeField] private CaseManager _CaseManager; [SerializeField] private PlayerPodium[] _PlayerPodiums; [SerializeField] private CameraSystem_Console _CameraConsole; + [SerializeField] private Image _PotatoModeImage; - private readonly Color _SelectedTabColour = new Color(0.0f, 0.5f, 0.0f); + private readonly Color SELECTED_TAB_COLOUR = new Color(0.0f, 0.5f, 0.0f); + private readonly Color POTATO_TOGGLED_ON_COLOUR = new Color(0.5f, 0.0f, 0.0f); public void ShowPlayersAdminView() @@ -54,7 +56,7 @@ public class HostPanelInterface : UdonSharpBehaviour _GameConfigPanel.SetActive(true); _CamerasPanel.SetActive(false); - _GameConfigButtonImage.color = _SelectedTabColour; + _GameConfigButtonImage.color = SELECTED_TAB_COLOUR; _CamerasButtonImage.color = Color.white; _GameConfigButtonText.color = Color.white; @@ -67,7 +69,7 @@ public class HostPanelInterface : UdonSharpBehaviour _CamerasPanel.SetActive(true); _GameConfigButtonImage.color = Color.white; - _CamerasButtonImage.color = _SelectedTabColour; + _CamerasButtonImage.color = SELECTED_TAB_COLOUR; _GameConfigButtonText.color = Color.black; _CamerasButtonText.color = Color.white; @@ -79,7 +81,7 @@ public class HostPanelInterface : UdonSharpBehaviour _Round2Panel.SetActive(false); _Round3Panel.SetActive(false); - _Round1ButtonImage.color = _SelectedTabColour; + _Round1ButtonImage.color = SELECTED_TAB_COLOUR; _Round2ButtonImage.color = Color.white; _Round3ButtonImage.color = Color.white; @@ -94,7 +96,7 @@ public class HostPanelInterface : UdonSharpBehaviour _Round3Panel.SetActive(false); _Round1ButtonImage.color = Color.white; - _Round2ButtonImage.color = _SelectedTabColour; + _Round2ButtonImage.color = SELECTED_TAB_COLOUR; _Round3ButtonImage.color = Color.white; _Round1ButtonText.color = Color.black; @@ -109,7 +111,7 @@ public class HostPanelInterface : UdonSharpBehaviour _Round1ButtonImage.color = Color.white; _Round2ButtonImage.color = Color.white; - _Round3ButtonImage.color = _SelectedTabColour; + _Round3ButtonImage.color = SELECTED_TAB_COLOUR; _Round1ButtonText.color = Color.black; _Round2ButtonText.color = Color.black; @@ -250,4 +252,9 @@ public class HostPanelInterface : UdonSharpBehaviour { _CameraConsole.SendLiveCamera6(); } + + public void TogglePotato() + { + _PotatoModeImage.color = _CameraConsole.TogglePotato() ? POTATO_TOGGLED_ON_COLOUR : Color.white; + } } 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: