diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index cc21854..da28a0b 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -61,6 +61,7 @@ + @@ -77,6 +78,7 @@ + @@ -88,7 +90,6 @@ - diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 9dd6a44..cbc4cdf 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -574,10 +574,10 @@ RectTransform: - {fileID: 535664611} m_Father: {fileID: 197393991} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -232.54001} + m_SizeDelta: {x: 640, y: 254.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &30715395 MonoBehaviour: @@ -1171,10 +1171,10 @@ RectTransform: - {fileID: 860275014} m_Father: {fileID: 535664611} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 400, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &92283835 CanvasRenderer: @@ -2797,7 +2797,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &197393991 RectTransform: m_ObjectHideFlags: 0 @@ -4756,12 +4756,13 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 379391086} - _GameManager: {fileID: 515404446} + _GameManager: {fileID: 0} _BetweenRoundsInterface: {fileID: 665314709} _MultipleChoiceInterface: {fileID: 722410359} _LightningRoundInterface: {fileID: 745232786} _TheChaseInterface: {fileID: 1400862957} _FinalRoundInterface: {fileID: 251407510} + _RecoverTheLootExplainerInterface: {fileID: 1331620965} _RecoverTheLootInterface: {fileID: 197393996} _AdminPanelInterface: {fileID: 967689115} --- !u!1 &386844719 stripped @@ -5571,10 +5572,10 @@ RectTransform: - {fileID: 116074574} m_Father: {fileID: 1772094039} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 560, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &438088199 CanvasRenderer: @@ -6287,10 +6288,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 197393991} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -26.22} + m_SizeDelta: {x: 640, y: 52.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &450356237 MonoBehaviour: @@ -6969,10 +6970,10 @@ RectTransform: - {fileID: 1640156454} m_Father: {fileID: 1772094039} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 240, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &506578820 CanvasRenderer: @@ -7270,6 +7271,7 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 515404445} _HostCard: {fileID: 379391087} + _CaseManager: {fileID: 841163054} _PlayerPodiums: - {fileID: 4438766482650780795} - {fileID: 1993364535} @@ -7324,10 +7326,10 @@ RectTransform: - {fileID: 21538766} m_Father: {fileID: 1772094039} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 80, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &519851851 CanvasRenderer: @@ -7470,10 +7472,10 @@ RectTransform: - {fileID: 1032807171} m_Father: {fileID: 30715394} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -31.865} + m_SizeDelta: {x: 640, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &530695309 MonoBehaviour: @@ -7536,10 +7538,10 @@ RectTransform: - {fileID: 1662151575} m_Father: {fileID: 30715394} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -223.05501} + m_SizeDelta: {x: 640, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &535664612 MonoBehaviour: @@ -9048,10 +9050,10 @@ RectTransform: - {fileID: 1106638334} m_Father: {fileID: 530695308} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 400, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &682556713 CanvasRenderer: @@ -10466,6 +10468,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1331620963} - {fileID: 197393991} m_Father: {fileID: 334599374} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11027,6 +11030,7 @@ MonoBehaviour: url: https://witwics-dev.github.io/TestQuestion.json _Round1Manager: {fileID: 515404446} _Round2Manager: {fileID: 865296978} + _HostCard: {fileID: 379391087} --- !u!4 &841163055 Transform: m_ObjectHideFlags: 0 @@ -11351,6 +11355,7 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 865296977} _HostCard: {fileID: 379391087} + _CaseManager: {fileID: 841163054} _LocationBoard: {fileID: 1748199014} --- !u!1001 &881903122 PrefabInstance: @@ -13533,10 +13538,10 @@ RectTransform: - {fileID: 2042479928} m_Father: {fileID: 530695308} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 560, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1032807172 CanvasRenderer: @@ -13833,10 +13838,10 @@ RectTransform: - {fileID: 1817081117} m_Father: {fileID: 1772094039} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 400, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1043608560 CanvasRenderer: @@ -15895,10 +15900,10 @@ RectTransform: - {fileID: 399030820} m_Father: {fileID: 530695308} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 80, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1213213242 CanvasRenderer: @@ -15994,6 +15999,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1254880961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1254880962} + - component: {fileID: 1254880964} + - component: {fileID: 1254880963} + m_Layer: 22 + m_Name: Header + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1254880962 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254880961} + 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: 1331620963} + 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: -26.22} + m_SizeDelta: {x: 640, y: 52.44} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1254880963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254880961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Briefing + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2} + m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 1 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.010192516, y: 0.15875247, z: -0.33999637, w: 0.05278692} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1254880964 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254880961} + m_CullTransparentMesh: 1 --- !u!1 &1265023767 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4294144169429098507, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -16635,10 +16775,10 @@ RectTransform: - {fileID: 1037221220} m_Father: {fileID: 1404056329} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -31.865} + m_SizeDelta: {x: 213.33333, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1324576702 CanvasRenderer: @@ -16734,6 +16874,125 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1331620962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1331620963} + - component: {fileID: 1331620966} + - component: {fileID: 1331620965} + - component: {fileID: 1331620964} + m_Layer: 22 + m_Name: Explainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1331620963 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331620962} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00034335244} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1254880962} + - {fileID: 1380484467} + m_Father: {fileID: 801369498} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000030517578, y: 0.00010681152} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1331620964 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331620962} + 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: c5954b0d86e4f474f9080bc0754854c9, + type: 2} + programSource: {fileID: 11400000, guid: 03be52085dd34cd45ba00937cbbcaa4b, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgYAAAAAAAAAAi8CAAAAAVsAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAVABNAFAAcgBvAC4AVABlAHgAdABNAGUAcwBoAFAAcgBvAFUARwBVAEkALAAgAFUAbgBpAHQAeQAuAFQAZQB4AHQATQBlAHMAaABQAHIAbwBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAQgAAABIAGUAYQBkAGUAcgBVAEkAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4ATwBiAGoAZQBjAHQALAAgAG0AcwBjAG8AcgBsAGkAYgAtAQUAAABWAGEAbAB1AGUABwUCLwMAAAABXQAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBUAE0AUAByAG8ALgBUAGUAeAB0AE0AZQBzAGgAUAByAG8AVQBHAFUASQBbAF0ALAAgAFUAbgBpAHQAeQAuAFQAZQB4AHQATQBlAHMAaABQAHIAbwBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAMAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAQgAAABDAGgAbwBpAGMAZQBVAEkAJwEEAAAAdAB5AHAAZQABKgAAAFQATQBQAHIAbwAuAFQAZQB4AHQATQBlAHMAaABQAHIAbwBVAEcAVQBJAFsAXQAsACAAVQBuAGkAdAB5AC4AVABlAHgAdABNAGUAcwBoAFAAcgBvAAEBBQAAAFYAYQBsAHUAZQAvBAAAAAEqAAAAVABNAFAAcgBvAC4AVABlAHgAdABNAGUAcwBoAFAAcgBvAFUARwBVAEkAWwBdACwAIABVAG4AaQB0AHkALgBUAGUAeAB0AE0AZQBzAGgAUAByAG8ABAAAAAYAAAAAAAAAAAcFBwUCLwUAAAABWQAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBVAG4AaQB0AHkARQBuAGcAaQBuAGUALgBVAEkALgBJAG0AYQBnAGUAWwBdACwAIABVAG4AaQB0AHkARQBuAGcAaQBuAGUALgBVAEkAXQBdACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAFAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAESAAAAQwBoAG8AaQBjAGUAQgB1AHQAdABvAG4ASQBtAGEAZwBlAHMAJwEEAAAAdAB5AHAAZQABJgAAAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQAuAEkAbQBhAGcAZQBbAF0ALAAgAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQABAQUAAABWAGEAbAB1AGUALwYAAAABJgAAAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQAuAEkAbQBhAGcAZQBbAF0ALAAgAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQAGAAAABgAAAAAAAAAABwUHBQIvBwAAAAFaAAAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQBgADEAWwBbAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQAuAEIAdQB0AHQAbwBuAFsAXQAsACAAVQBuAGkAdAB5AEUAbgBnAGkAbgBlAC4AVQBJAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ABwAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABDQAAAEMAaABvAGkAYwBlAEIAdQB0AHQAbwBuAHMAJwEEAAAAdAB5AHAAZQABJwAAAFUAbgBpAHQAeQBFAG4AZwBpAG4AZQAuAFUASQAuAEIAdQB0AHQAbwBuAFsAXQAsACAAVQBuAGkAdAB5AEUAbgBnAGkAbgBlAC4AVQBJAAEBBQAAAFYAYQBsAHUAZQAvCAAAAAEnAAAAVQBuAGkAdAB5AEUAbgBnAGkAbgBlAC4AVQBJAC4AQgB1AHQAdABvAG4AWwBdACwAIABVAG4AaQB0AHkARQBuAGcAaQBuAGUALgBVAEkACAAAAAYAAAAAAAAAAAcFBwUCMAIAAAAJAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEMAAAAXwBFAHgAcABsAGEAaQBuAGUAcgBVAEkAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4ATwBiAGoAZQBjAHQALAAgAG0AcwBjAG8AcgBsAGkAYgAtAQUAAABWAGEAbAB1AGUABwUCLwkAAAABSQAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ACgAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABHwAAAF8AXwBfAFUAZABvAG4AUwBoAGEAcgBwAEIAZQBoAGEAdgBpAG8AdQByAFYAZQByAHMAaQBvAG4AXwBfAF8AJwEEAAAAdAB5AHAAZQABFgAAAFMAeQBzAHQAZQBtAC4ASQBuAHQAMwAyACwAIABtAHMAYwBvAHIAbABpAGIAFwEFAAAAVgBhAGwAdQBlAAIAAAAHBQcFBwU= + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1331620965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331620962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7dd284e69f0929046b929354a08e673d, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1331620964} + HeaderUI: {fileID: 1254880963} + ChoiceUI: [] + ChoiceButtonImages: [] + ChoiceButtons: [] + _ExplainerUI: {fileID: 1380484468} +--- !u!114 &1331620966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331620962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1333952427 GameObject: m_ObjectHideFlags: 0 @@ -17491,6 +17750,168 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1374007755} m_CullTransparentMesh: 1 +--- !u!1 &1380484466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1380484467} + - component: {fileID: 1380484470} + - component: {fileID: 1380484469} + - component: {fileID: 1380484468} + m_Layer: 22 + m_Name: Comment + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1380484467 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1380484466} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00034335244} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1331620963} + 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: -193} + m_SizeDelta: {x: 640, y: 261.12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1380484468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1380484466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u2022 Here we have the possible locations for [[LOOT]], [[CROOK]], and + a warrant for [[CROOK]]'s arrest.\n\u2022 First, find the loot. That's the evidence + you need to obtain a warrant.\n\u2022 Once you have the warrant, then you can + arrest the crook.\n\u2022 Finding either the loot, the warrant, or the crook, + gets you a free turn.\n\u2022 Connect loot -> warrant -> crook in a single turn, + and in that order, and you will have a chance to catch Carmen Sandiego.\n\u2022 + Catch Carmen Sandiego to win the promotion from Gumshoe to Sleuth." + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2} + m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &1380484469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1380484466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!222 &1380484470 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1380484466} + m_CullTransparentMesh: 1 --- !u!1 &1389375729 GameObject: m_ObjectHideFlags: 0 @@ -17560,10 +17981,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 197393991} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -78.759995} + m_SizeDelta: {x: 640, y: 32.64} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1394546108 MonoBehaviour: @@ -17982,10 +18403,10 @@ RectTransform: - {fileID: 1463206609} m_Father: {fileID: 30715394} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -159.325} + m_SizeDelta: {x: 640, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1404056330 MonoBehaviour: @@ -18530,10 +18951,10 @@ RectTransform: - {fileID: 1925496951} m_Father: {fileID: 1404056329} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 533.3333, y: -31.865} + m_SizeDelta: {x: 213.33333, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1463206610 CanvasRenderer: @@ -22008,10 +22429,10 @@ RectTransform: - {fileID: 443746716} m_Father: {fileID: 535664611} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 560, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1662151576 CanvasRenderer: @@ -22603,10 +23024,10 @@ RectTransform: - {fileID: 438088198} m_Father: {fileID: 30715394} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -95.595} + m_SizeDelta: {x: 640, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1772094040 MonoBehaviour: @@ -25224,10 +25645,10 @@ RectTransform: - {fileID: 1917510582} m_Father: {fileID: 535664611} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 80, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1993575344 CanvasRenderer: @@ -25357,10 +25778,10 @@ RectTransform: - {fileID: 129879364} m_Father: {fileID: 535664611} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 240, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1996708091 CanvasRenderer: @@ -26075,10 +26496,10 @@ RectTransform: - {fileID: 1059914105} m_Father: {fileID: 530695308} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 240, y: -31.865} + m_SizeDelta: {x: 160, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2038231790 CanvasRenderer: @@ -26367,10 +26788,10 @@ RectTransform: - {fileID: 450941285} m_Father: {fileID: 1404056329} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 106.666664, y: -31.865} + m_SizeDelta: {x: 213.33333, y: 63.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2065801388 CanvasRenderer: @@ -30228,6 +30649,10 @@ MonoBehaviour: ID: 144 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1331620962} + ID: 145 + 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/UdonSharp/CaseManager.asset b/Assets/UdonSharp/Game Managers/CaseManager.asset similarity index 69% rename from Assets/UdonSharp/CaseManager.asset rename to Assets/UdonSharp/Game Managers/CaseManager.asset index 2550d85..5e83e74 100644 --- a/Assets/UdonSharp/CaseManager.asset +++ b/Assets/UdonSharp/Game Managers/CaseManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 3 + Data: 5 - Name: Entry: 7 Data: @@ -231,6 +231,120 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _HostCard + - Name: $v + Entry: 7 + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _HostCard + - Name: k__BackingField + Entry: 7 + Data: 16|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: HostCardManager, Assembly-CSharp + - Name: + Entry: 8 + Data: + - 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: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 18|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: _CaseFile + - Name: $v + Entry: 7 + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseFile + - Name: k__BackingField + Entry: 7 + Data: 20|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 20 + - 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: 21|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/CaseManager.asset.meta b/Assets/UdonSharp/Game Managers/CaseManager.asset.meta similarity index 100% rename from Assets/UdonSharp/CaseManager.asset.meta rename to Assets/UdonSharp/Game Managers/CaseManager.asset.meta diff --git a/Assets/UdonSharp/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs similarity index 60% rename from Assets/UdonSharp/CaseManager.cs rename to Assets/UdonSharp/Game Managers/CaseManager.cs index c434732..e81346a 100644 --- a/Assets/UdonSharp/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -18,6 +18,10 @@ public class CaseManager : UdonSharpBehaviour [SerializeField] private GameManagerRound2 _Round2Manager; //[SerializeField] private GameManagerRound3 _Round3Manager; + [SerializeField] private HostCardManager _HostCard; + + private DataDictionary _CaseFile; + void Start() { @@ -34,18 +38,14 @@ public class CaseManager : UdonSharpBehaviour { if (JSONResult.TokenType == TokenType.DataDictionary) { - DataDictionary Dict = JSONResult.DataDictionary; + _CaseFile = JSONResult.DataDictionary; - if (!Dict.ContainsKey("Round 1") || !Dict.ContainsKey("Round 2")/* || !Dict.ContainsKey("Round 3")*/) - { - ErrorString = "Could not find all the necessary keys for game rounds."; - } - else + if (_CaseFile.ContainsKey("Round 1") && _CaseFile.ContainsKey("Round 2") && _CaseFile.ContainsKey("Round 3")) { // Attempt to load Round 1 data - if (Dict["Round 1"].TokenType == TokenType.DataList) + if (_CaseFile["Round 1"].TokenType == TokenType.DataList) { - _Round1Manager.LoadQuestionData(Dict["Round 1"]); + _Round1Manager.LoadQuestionData(_CaseFile["Round 1"]); } else { @@ -53,9 +53,9 @@ public class CaseManager : UdonSharpBehaviour } // Attempt to load Round 2 data - if (Dict["Round 2"].TokenType == TokenType.DataDictionary) + if (_CaseFile["Round 2"].TokenType == TokenType.DataDictionary) { - _Round2Manager.LoadQuestionData(Dict["Round 2"]); + _Round2Manager.LoadQuestionData(_CaseFile["Round 2"]); } else { @@ -63,26 +63,20 @@ public class CaseManager : UdonSharpBehaviour } //// Attempt to load Round 3 data - //if (Dict["Round 3"].TokenType == TokenType.DataList) + //if (_CaseFile["Round 3"].TokenType == TokenType.DataList) //{ - // LoadQuestionData(Dict["Round 3"].DataList); + // _Round3Manager.LoadQuestionData(_CaseFile["Round 3"].DataList); //} //else //{ - // ErrorString = "Ensure the 'Round 3' dictionary entry is a list of dictionaries."; + // ErrorString = "Ensure the 'Round 3' dictionary entry is whatever it's meant to be once it's done being decided."; //} - } - if (Dict.ContainsKey("Round 1")) - { + ContinueToRound1(); } else { - ErrorString = "Ensure the first element is a dictionary, containing 'Round 1', 'Round 2', and 'Round 3' entries."; - } - - if (Dict.ContainsKey("Round 2")) - { + ErrorString = "Could not find all the necessary keys for game rounds."; } } else @@ -96,4 +90,28 @@ public class CaseManager : UdonSharpBehaviour Debug.LogError("Malformed case file. " + ErrorString); } } + + public string ContinueToRound1() + { + _HostCard.SetGameManager(_Round1Manager); + _Round1Manager.InitialiseGameMode(); + + return ""; + } + + public string ContinueToRound2() + { + _HostCard.SetGameManager(_Round2Manager); + _Round2Manager.InitialiseGameMode(); + + return ""; + } + + public string ContinueToRound3() + { + //_HostCard.SetGameManager(_Round3Manager); + //_Round3Manager.InitialiseGameMode(); + + return ""; + } } diff --git a/Assets/UdonSharp/CaseManager.cs.meta b/Assets/UdonSharp/Game Managers/CaseManager.cs.meta similarity index 100% rename from Assets/UdonSharp/CaseManager.cs.meta rename to Assets/UdonSharp/Game Managers/CaseManager.cs.meta diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.asset b/Assets/UdonSharp/Game Managers/GameManagerBase.asset index f06e220..23e1e00 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.asset @@ -44,82 +44,22 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 3 + Data: 2 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: _GameHasBegun + Data: _HostCard - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _GameHasBegun + Data: _HostCard - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 3 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 5|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _HostCard - - Name: $v - Entry: 7 - Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _HostCard - - Name: k__BackingField - Entry: 7 - Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardManager, Assembly-CSharp @@ -128,7 +68,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 8|System.RuntimeType, mscorlib + Data: 4|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.Udon.UdonBehaviour, VRC.Udon @@ -149,13 +89,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -179,16 +119,22 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField - Entry: 9 - Data: 3 + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 3 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -203,7 +149,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index 01b32d9..dc6726f 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -21,6 +21,7 @@ public enum GameType public enum QuestionType { BetweenRounds, + MultipleChoice, LightningRound, DumpsterDive, @@ -28,24 +29,18 @@ public enum QuestionType FinalRound, Tiebreaker, + RecoverTheLootExplainer, RecoverTheLoot } public class GameManagerBase : UdonSharpBehaviour { - [UdonSynced] protected bool _GameHasBegun = false; - [SerializeField] protected HostCardManager _HostCard = null; private bool _AllowInteractionFromHostCard = false; - void Start() - { - InitialiseGameMode(); - } - protected void EnableInteraction(string NextInteraction = "Advance") { _AllowInteractionFromHostCard = true; @@ -70,7 +65,7 @@ public class GameManagerBase : UdonSharpBehaviour protected virtual HostCardInterfaceBase GetHostCardInterface(QuestionType Question) { - Debug.LogError("You should not be seeing this. You don't need to run base.GetHostCardInterface()"); + Debug.LogError("You should not be seeing this. You don't need to call base.GetHostCardInterface()"); return _HostCard.EnableHostCardDisplay(GameType.None, Question); } @@ -80,7 +75,7 @@ public class GameManagerBase : UdonSharpBehaviour } - protected virtual void InitialiseGameMode() { } + public virtual void InitialiseGameMode() { } public virtual void LoadQuestionData(DataToken Data) { } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index 04e445c..0d4fe33 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset @@ -44,82 +44,22 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 14 + Data: 15 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: _GameHasBegun + Data: _HostCard - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _GameHasBegun + Data: _HostCard - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 3 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 5|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _HostCard - - Name: $v - Entry: 7 - Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _HostCard - - Name: k__BackingField - Entry: 7 - Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardManager, Assembly-CSharp @@ -128,7 +68,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 8|System.RuntimeType, mscorlib + Data: 4|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.Udon.UdonBehaviour, VRC.Udon @@ -149,13 +89,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -179,16 +119,22 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField - Entry: 9 - Data: 3 + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 3 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -203,7 +149,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -224,25 +170,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionIndex + Data: _CaseManager - Name: $v Entry: 7 - Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionIndex + Data: _CaseManager - Name: k__BackingField Entry: 7 - Data: 14|System.RuntimeType, mscorlib + Data: 11|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Int32, mscorlib + Data: CaseManager, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 14 + 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: 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: 7 + Data: + - Name: $k + Entry: 1 + Data: _GameHasBegun + - Name: $v + Entry: 7 + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _GameHasBegun + - 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 @@ -284,19 +284,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionStage + Data: _QuestionIndex - Name: $v Entry: 7 Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _QuestionIndex + - Name: k__BackingField + Entry: 7 + Data: 18|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 18 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 20|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _QuestionStage + - Name: $v + Entry: 7 + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionStage - Name: k__BackingField Entry: 9 - Data: 14 + Data: 18 - Name: k__BackingField Entry: 9 - Data: 14 + Data: 18 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -311,13 +371,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 19|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 23|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -341,16 +401,16 @@ MonoBehaviour: Data: _QuestionCorrectResponse - Name: $v Entry: 7 - Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionCorrectResponse - Name: k__BackingField Entry: 9 - Data: 14 + Data: 18 - Name: k__BackingField Entry: 9 - Data: 14 + Data: 18 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -363,72 +423,18 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 22|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _QuestionsList - - Name: $v - Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _QuestionsList - - Name: k__BackingField - Entry: 7 - Data: 24|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDK3.Data.DataList, VRCSDK3 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 24 - - 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: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 26|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -446,25 +452,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentQuestion + Data: _QuestionsList - Name: $v Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentQuestion + Data: _QuestionsList - Name: k__BackingField Entry: 7 - Data: 27|System.RuntimeType, mscorlib + Data: 28|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + Data: VRC.SDK3.Data.DataList, VRCSDK3 - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 27 + Data: 28 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -479,7 +485,61 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CurrentQuestion + - Name: $v + Entry: 7 + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CurrentQuestion + - Name: k__BackingField + Entry: 7 + Data: 31|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 31 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -503,76 +563,16 @@ MonoBehaviour: Data: _BuzzInAllowed - Name: $v Entry: 7 - Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BuzzInAllowed - Name: k__BackingField Entry: 9 - Data: 3 + Data: 8 - Name: k__BackingField Entry: 9 - Data: 3 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 31|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _PlayerBuzzInAllowed - - Name: $v - Entry: 7 - Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _PlayerBuzzInAllowed - - Name: k__BackingField - Entry: 7 - Data: 33|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean[], mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 33 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -614,19 +614,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _BuzzedInPlayer + Data: _PlayerBuzzInAllowed - Name: $v Entry: 7 Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _BuzzedInPlayer + Data: _PlayerBuzzInAllowed - Name: k__BackingField - Entry: 9 - Data: 14 + Entry: 7 + Data: 37|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean[], mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 14 + Data: 37 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -641,13 +647,67 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 38|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 39|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _BuzzedInPlayer + - Name: $v + Entry: 7 + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _BuzzedInPlayer + - Name: k__BackingField + Entry: 9 + Data: 18 + - Name: k__BackingField + Entry: 9 + Data: 18 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 42|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -671,13 +731,13 @@ MonoBehaviour: Data: _FinalRoundPlayersSortedByScore - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FinalRoundPlayersSortedByScore - Name: k__BackingField Entry: 7 - Data: 40|System.RuntimeType, mscorlib + Data: 44|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32[], mscorlib @@ -686,7 +746,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 40 + Data: 44 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -701,7 +761,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -725,13 +785,13 @@ MonoBehaviour: Data: _PlayerPodiums - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerPodiums - Name: k__BackingField Entry: 7 - Data: 43|System.RuntimeType, mscorlib + Data: 47|System.RuntimeType, mscorlib - Name: Entry: 1 Data: PlayerPodium[], Assembly-CSharp @@ -740,7 +800,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 44|System.RuntimeType, mscorlib + Data: 48|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -759,66 +819,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 46|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: _AudioManager - - Name: $v - Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AudioManager - - Name: k__BackingField - Entry: 7 - Data: 48|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: AudioManager, Assembly-CSharp - - Name: - Entry: 8 - Data: - - 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: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -843,6 +843,66 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _AudioManager + - Name: $v + Entry: 7 + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AudioManager + - Name: k__BackingField + Entry: 7 + Data: 52|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: AudioManager, 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 54|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/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 9484281..bbddbc0 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -10,6 +10,10 @@ using VRC.SDKBase; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class GameManagerRound1 : GameManagerBase { + [SerializeField] private CaseManager _CaseManager; + + [UdonSynced] protected bool _GameHasBegun = false; + [UdonSynced] private int _QuestionIndex = 0; [UdonSynced] private int _QuestionStage = 0; [UdonSynced] private int _QuestionCorrectResponse = 0; @@ -27,8 +31,12 @@ public class GameManagerRound1 : GameManagerBase [SerializeField] private AudioManager _AudioManager; - protected override void InitialiseGameMode() + public override void InitialiseGameMode() { + _GameHasBegun = false; + _QuestionIndex = 0; + _QuestionStage = 0; + _PlayerBuzzInAllowed = new bool[_PlayerPodiums.Length]; ResetBuzzers(); @@ -39,7 +47,6 @@ public class GameManagerRound1 : GameManagerBase public override void LoadQuestionData(DataToken Data) { _QuestionsList.Clear(); - _QuestionIndex = 0; HostCardBetweenRoundsInterface Interface = (HostCardBetweenRoundsInterface)GetHostCardInterface(QuestionType.BetweenRounds); @@ -60,8 +67,6 @@ public class GameManagerRound1 : GameManagerBase return; } - _CurrentQuestion = _QuestionsList[_QuestionIndex].DataDictionary; - Interface.HeaderUI.text = "Found " + _QuestionsList.Count + " questions in this case file. Press 'Use' button to show scores."; @@ -616,7 +621,16 @@ public class GameManagerRound1 : GameManagerBase NetworkEventTarget.All, "VerifyFinalRoundResponse", _QuestionCorrectResponse); - EnableInteraction("Reveal Next Player Answer"); + // If we're assigning points to the first-place player, then we're + // about to finish up, so just move on to determining winners. + if (PlayerPlace == 1) + { + FinalRoundDetermineWinners(); + } + else + { + EnableInteraction("Reveal Next Player Answer"); + } } private void FinalRoundDetermineWinners() @@ -629,19 +643,21 @@ public class GameManagerRound1 : GameManagerBase SortedPlayerScores[i] = _PlayerPodiums[_FinalRoundPlayersSortedByScore[i] - 1].PlayerScore; } + HostCardBetweenRoundsInterface Interface = + (HostCardBetweenRoundsInterface)GetHostCardInterface(QuestionType.BetweenRounds); + bool TiebreakerNeeded = false; if (SortedPlayerScores[1] == SortedPlayerScores[2]) { if (SortedPlayerScores[0] == SortedPlayerScores[1]) { - Debug.LogError("Three-way tie"); - TiebreakerNeeded = true; + Interface.HeaderUI.text = "Three-way tie; two tiebreakers will appear here in the final version."; } else { - Debug.LogWarning("Tie for second place"); - TiebreakerNeeded = true; + Interface.HeaderUI.text = "Tie for second place between [[PLAYER]] and [[PLAYER]]; tiebreaker will appear here in the final version."; } + TiebreakerNeeded = true; } else { @@ -653,12 +669,16 @@ public class GameManagerRound1 : GameManagerBase // Tag both players as being tied for first place Number1.SetPlayerTag("Round1State", "TiedForFirstPlace"); Number2.SetPlayerTag("Round2State", "TiedForFirstPlace"); + + Interface.HeaderUI.text = "[[PLAYER]] and [[PLAYER]] are tied for first; both will move on to the next round."; } else { // Tag first place player as first place, and second place as second Number1.SetPlayerTag("Round1State", "FirstPlace"); Number2.SetPlayerTag("Round2State", "SecondPlace"); + + Interface.HeaderUI.text = "[[FIRSTPLACEPLAYER]] and [[SECONDPLACEPLAYER]] will move on to the next round."; } } @@ -685,8 +705,8 @@ public class GameManagerRound1 : GameManagerBase _QuestionIndex++; if (_QuestionIndex >= _QuestionsList.Count) { - Interface.HeaderUI.text = "No More Questions"; - DisableInteraction(); + Interface.HeaderUI.text = "Round is over. Move to the loot recovery area."; + _CaseManager.ContinueToRound2(); return; } @@ -911,8 +931,7 @@ public class GameManagerRound1 : GameManagerBase case 10: FinalRoundAssignPointsToPlayerPlace(2); break; case 11: FinalRoundRevealPlayerPlace(1); break; case 12: FinalRoundAssignPointsToPlayerPlace(1); break; - case 13: FinalRoundDetermineWinners(); break; - case 14: AdvanceToNextQuestion(); break; + case 13: AdvanceToNextQuestion(); break; default: break; } } @@ -933,6 +952,8 @@ public class GameManagerRound1 : GameManagerBase NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.D6); + _CurrentQuestion = _QuestionsList[_QuestionIndex].DataDictionary; + HostCardBetweenRoundsInterface Interface = (HostCardBetweenRoundsInterface)GetHostCardInterface(QuestionType.BetweenRounds); Interface.HeaderUI.text = "Upcoming Question: " + QuestionTypeToString((QuestionType)((int)_CurrentQuestion["Type"].Number)); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index f808cf4..69d67b3 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -44,82 +44,22 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 4 + Data: 6 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: _GameHasBegun + Data: _HostCard - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _GameHasBegun + Data: _HostCard - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 3 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 5|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _HostCard - - Name: $v - Entry: 7 - Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _HostCard - - Name: k__BackingField - Entry: 7 - Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardManager, Assembly-CSharp @@ -128,7 +68,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 8|System.RuntimeType, mscorlib + Data: 4|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.Udon.UdonBehaviour, VRC.Udon @@ -149,13 +89,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -179,16 +119,22 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField - Entry: 9 - Data: 3 + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 3 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -203,7 +149,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -224,25 +170,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LocationBoard + Data: _CaseManager - Name: $v Entry: 7 - Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LocationBoard + Data: _CaseManager - Name: k__BackingField Entry: 7 - Data: 14|System.RuntimeType, mscorlib + Data: 11|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: LocationBoard, Assembly-CSharp + Data: CaseManager, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 8 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -257,13 +203,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 16|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 13|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -279,6 +225,174 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _LocationBoard + - Name: $v + Entry: 7 + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LocationBoard + - Name: k__BackingField + Entry: 7 + Data: 15|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: LocationBoard, 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 17|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: _LandmarkData + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LandmarkData + - Name: k__BackingField + Entry: 7 + Data: 19|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 19 + - 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: 20|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: _StageIndex + - Name: $v + Entry: 7 + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _StageIndex + - Name: k__BackingField + Entry: 7 + Data: 22|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 22 + - 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: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index d675acb..e683afb 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -19,47 +19,32 @@ public enum PanelType [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class GameManagerRound2 : GameManagerBase { + [SerializeField] private CaseManager _CaseManager; + [SerializeField] private LocationBoard _LocationBoard; - protected override void InitialiseGameMode() + private DataDictionary _LandmarkData; + private int _StageIndex = 0; + + + public override void InitialiseGameMode() { + PopulateLandmarkDataOnLocationBoard(); + base.InitialiseGameMode(); } public override void LoadQuestionData(DataToken Data) { - HostCardRecoverTheLootInterface Interface = - (HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot); - DataDictionary DataDict = Data.DataDictionary; + _LandmarkData = Data.DataDictionary; - if (DataDict.ContainsKey("Location") && DataDict.ContainsKey("Landmarks")) + if (_LandmarkData.ContainsKey("Location") && _LandmarkData.ContainsKey("Landmarks")) { - if (DataDict["Landmarks"].TokenType == TokenType.DataList && DataDict["Landmarks"].DataList.Count >= 15) + if (_LandmarkData["Landmarks"].TokenType == TokenType.DataList && _LandmarkData["Landmarks"].DataList.Count >= 15) { - DataList Landmarks = DataDict["Landmarks"].DataList; - for (int i = 0; i < Landmarks.Count; i++) - { - if (Landmarks[i].TokenType == TokenType.DataDictionary) - { - DataDictionary LandmarkEntry = Landmarks[i].DataDictionary; - if (LandmarkEntry.ContainsKey("Landmark")) - { - string LandmarkName = LandmarkEntry["Landmark"].ToString(); - _LocationBoard.LocationPanelText[i].text = LandmarkName; - Interface.AddLandmarkName(i, LandmarkName); - } - else - { - Debug.LogError("Malformed landmark entry. Ensure the 'Landmark' key exists."); - } - } - else - { - Debug.LogError("Malformed landmark entry. Ensure each landmark is a dictionary containing a 'Landmark' key."); - } - } + PopulateLandmarkDataOnLocationBoard(); } else { @@ -71,8 +56,52 @@ public class GameManagerRound2 : GameManagerBase Debug.LogError("Malformed round data. Ensure Round 2 contains 'Location' and 'Landmark' keys."); } - //_GameHasBegun = false; - //EnableInteraction("Start Game"); + EnableInteraction("Start Game"); + } + + private void DisplayBriefing() + { + HostCardRecoverTheLootExplainerInterface RecoverTheLootInterface = + (HostCardRecoverTheLootExplainerInterface)GetHostCardInterface(QuestionType.RecoverTheLootExplainer); + } + + private void PopulateLandmarkDataOnLocationBoard() + { + DataList Landmarks = _LandmarkData["Landmarks"].DataList; + for (int i = 0; i < Landmarks.Count; i++) + { + if (Landmarks[i].TokenType == TokenType.DataDictionary) + { + DataDictionary LandmarkEntry = Landmarks[i].DataDictionary; + if (LandmarkEntry.ContainsKey("Landmark")) + { + _LocationBoard.LocationPanelText[i].text = LandmarkEntry["Landmark"].ToString(); + } + else + { + Debug.LogError("Malformed landmark entry. Ensure the 'Landmark' key exists."); + } + } + else + { + Debug.LogError("Malformed landmark entry. Ensure each landmark is a dictionary containing a 'Landmark' key."); + } + } + } + + private void PopulateLandmarkDataOnHostCard() + { + HostCardRecoverTheLootInterface RecoverTheLootInterface = + (HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot); + + DataList Landmarks = _LandmarkData["Landmarks"].DataList; + for (int i = 0; i < Landmarks.Count; i++) + { + if (Landmarks[i].TokenType == TokenType.DataDictionary) + { + RecoverTheLootInterface.AddLandmarkName(i, Landmarks[i].DataDictionary["Landmark"].ToString()); + } + } } @@ -162,27 +191,12 @@ public class GameManagerRound2 : GameManagerBase protected override void _HostCardUseButtonDown_Internal() { - //if (!_GameHasBegun) - //{ - // for (int i = 0; i < _PlayerPodiums.Length; i++) - // { - // NetworkCalling.SendCustomNetworkEvent( - // (IUdonEventReceiver)_PlayerPodiums[i], - // NetworkEventTarget.All, - // "DisplayScore"); - // } - - // SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlaySFXAtPitch), SFXEventType.Ding, D6); - - // HostCardBetweenRoundsInterface Interface = - // (HostCardBetweenRoundsInterface)GetHostCardInterface(QuestionType.BetweenRounds); - // Interface.HeaderUI.text = "Upcoming Question: " + QuestionTypeToString((QuestionType)((int)_CurrentQuestion["Type"].Number)); - - // _GameHasBegun = true; - // return; - //} - - //AdvanceQuestion(); + _StageIndex++; + switch(_StageIndex) + { + case 1: DisplayBriefing(); break; + case 2: PopulateLandmarkDataOnHostCard(); break; + } } diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.asset b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.asset index b245f66..7e2488e 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.asset +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 10 + Data: 11 - Name: Entry: 7 Data: @@ -533,19 +533,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _RecoverTheLootInterface + Data: _RecoverTheLootExplainerInterface - Name: $v Entry: 7 Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _RecoverTheLootInterface + Data: _RecoverTheLootExplainerInterface - Name: k__BackingField Entry: 7 Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: HostCardRecoverTheLootInterface, Assembly-CSharp + Data: HostCardRecoverTheLootExplainerInterface, Assembly-CSharp - Name: Entry: 8 Data: @@ -593,19 +593,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AdminPanelInterface + Data: _RecoverTheLootInterface - Name: $v Entry: 7 Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AdminPanelInterface + Data: _RecoverTheLootInterface - Name: k__BackingField Entry: 7 Data: 39|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: HostPanelInterface, Assembly-CSharp + Data: HostCardRecoverTheLootInterface, Assembly-CSharp - Name: Entry: 8 Data: @@ -648,6 +648,66 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _AdminPanelInterface + - Name: $v + Entry: 7 + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AdminPanelInterface + - Name: k__BackingField + Entry: 7 + Data: 43|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: HostPanelInterface, 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + 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: 13 Data: diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs index a7edf49..88c4f12 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs @@ -25,6 +25,7 @@ public class HostCardManager : UdonSharpBehaviour [SerializeField] private HostCardTheChaseInterface _TheChaseInterface; [SerializeField] private HostCardFinalRoundInterface _FinalRoundInterface; + [SerializeField] private HostCardRecoverTheLootExplainerInterface _RecoverTheLootExplainerInterface; [SerializeField] private HostCardRecoverTheLootInterface _RecoverTheLootInterface; [SerializeField] private HostPanelInterface _AdminPanelInterface; @@ -90,6 +91,12 @@ public class HostCardManager : UdonSharpBehaviour } + public void SetGameManager(GameManagerBase Manager) + { + _GameManager = Manager; + } + + public HostCardInterfaceBase EnableHostCardDisplay(GameType Game, QuestionType Question) { _BetweenRoundsInterface.gameObject.SetActive(false); @@ -98,6 +105,7 @@ public class HostCardManager : UdonSharpBehaviour _TheChaseInterface.gameObject.SetActive(false); _FinalRoundInterface.gameObject.SetActive(false); + _RecoverTheLootExplainerInterface.gameObject.SetActive(false); _RecoverTheLootInterface.gameObject.SetActive(false); switch (Game) @@ -128,6 +136,9 @@ public class HostCardManager : UdonSharpBehaviour { switch(Question) { + case QuestionType.RecoverTheLootExplainer: + _RecoverTheLootExplainerInterface.gameObject.SetActive(true); + return _RecoverTheLootExplainerInterface; case QuestionType.RecoverTheLoot: _RecoverTheLootInterface.gameObject.SetActive(true); return _RecoverTheLootInterface; diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.asset b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.asset new file mode 100644 index 0000000..f679ee9 --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.asset @@ -0,0 +1,323 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: HostCardRecoverTheLootExplainerInterface + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: c5954b0d86e4f474f9080bc0754854c9, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 7dd284e69f0929046b929354a08e673d, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 419105965483500703 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 5 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: HeaderUI + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HeaderUI + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 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: ChoiceUI + - Name: $v + Entry: 7 + Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ChoiceUI + - Name: k__BackingField + Entry: 7 + Data: 6|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI[], Unity.TextMeshPro + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 6 + - 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: 7|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: ChoiceButtonImages + - Name: $v + Entry: 7 + Data: 8|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ChoiceButtonImages + - Name: k__BackingField + Entry: 7 + Data: 9|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.UI.Image[], UnityEngine.UI + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 9 + - 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: 10|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: ChoiceButtons + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ChoiceButtons + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.UI.Button[], UnityEngine.UI + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - 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: 7 + Data: + - Name: $k + Entry: 1 + Data: _ExplainerUI + - Name: $v + Entry: 7 + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ExplainerUI + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 16|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: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.asset.meta b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.asset.meta new file mode 100644 index 0000000..616cc3f --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03be52085dd34cd45ba00937cbbcaa4b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.cs b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.cs new file mode 100644 index 0000000..48f56df --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.cs @@ -0,0 +1,14 @@ + +using TMPro; +using UnityEngine.UI; +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class HostCardRecoverTheLootExplainerInterface : HostCardInterfaceBase +{ + [SerializeField] private TextMeshProUGUI _ExplainerUI; +} diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.cs.meta b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.cs.meta new file mode 100644 index 0000000..127dafc --- /dev/null +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7dd284e69f0929046b929354a08e673d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Poi.Tools.csproj b/Poi.Tools.csproj index b6a9c14..6b2a38b 100644 --- a/Poi.Tools.csproj +++ b/Poi.Tools.csproj @@ -1149,14 +1149,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index d925021..ba6209e 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -10,8 +10,8 @@ AudioManager: Default Speaker Mode: 2 m_SampleRate: 48000 m_DSPBufferSize: 1024 - m_VirtualVoiceCount: 32 - m_RealVoiceCount: 24 + m_VirtualVoiceCount: 64 + m_RealVoiceCount: 32 m_EnableOutputSuspension: 1 m_SpatializerPlugin: OculusSpatializer m_AmbisonicDecoderPlugin: OculusSpatializer diff --git a/ThryAssemblyDefinition.csproj b/ThryAssemblyDefinition.csproj index 043956c..30de29b 100644 --- a/ThryAssemblyDefinition.csproj +++ b/ThryAssemblyDefinition.csproj @@ -1249,14 +1249,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Editor.csproj b/UdonSharp.Editor.csproj index ac6db56..835468e 100644 --- a/UdonSharp.Editor.csproj +++ b/UdonSharp.Editor.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Lib.csproj b/UdonSharp.Lib.csproj index 474574e..fdd42af 100644 --- a/UdonSharp.Lib.csproj +++ b/UdonSharp.Lib.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UdonSharp.Runtime.csproj b/UdonSharp.Runtime.csproj index ba74349..62564ab 100644 --- a/UdonSharp.Runtime.csproj +++ b/UdonSharp.Runtime.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.Addressables.csproj b/UniTask.Addressables.csproj index fb0f47b..bae8e93 100644 --- a/UniTask.Addressables.csproj +++ b/UniTask.Addressables.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.DOTween.csproj b/UniTask.DOTween.csproj index dabbbec..478d57b 100644 --- a/UniTask.DOTween.csproj +++ b/UniTask.DOTween.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.Editor.csproj b/UniTask.Editor.csproj index 473d503..a39cffe 100644 --- a/UniTask.Editor.csproj +++ b/UniTask.Editor.csproj @@ -1128,14 +1128,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UniTask.Linq.csproj b/UniTask.Linq.csproj index fd7ad68..d608348 100644 --- a/UniTask.Linq.csproj +++ b/UniTask.Linq.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.TextMeshPro.csproj b/UniTask.TextMeshPro.csproj index cc5e8cf..8de78ee 100644 --- a/UniTask.TextMeshPro.csproj +++ b/UniTask.TextMeshPro.csproj @@ -1123,14 +1123,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.csproj b/UniTask.csproj index c1c2d15..ff2c404 100644 --- a/UniTask.csproj +++ b/UniTask.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UnityEditorTests.csproj b/UnityEditorTests.csproj index f57b82f..fd56b97 100644 --- a/UnityEditorTests.csproj +++ b/UnityEditorTests.csproj @@ -990,14 +990,14 @@ Library\ScriptAssemblies\UnityEditor.TestRunner.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.ClientSim.Editor.csproj b/VRC.ClientSim.Editor.csproj index 2cc0fd2..20834b5 100644 --- a/VRC.ClientSim.Editor.csproj +++ b/VRC.ClientSim.Editor.csproj @@ -1159,14 +1159,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.ClientSim.csproj b/VRC.ClientSim.csproj index c4619f3..b633eb0 100644 --- a/VRC.ClientSim.csproj +++ b/VRC.ClientSim.csproj @@ -1264,14 +1264,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.ExampleCentral.Editor.csproj b/VRC.ExampleCentral.Editor.csproj index c33d7fd..73b783a 100644 --- a/VRC.ExampleCentral.Editor.csproj +++ b/VRC.ExampleCentral.Editor.csproj @@ -1138,14 +1138,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.Editor.csproj b/VRC.SDK3.Editor.csproj index e8c1069..088871a 100644 --- a/VRC.SDK3.Editor.csproj +++ b/VRC.SDK3.Editor.csproj @@ -1181,14 +1181,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.csproj b/VRC.SDK3.csproj index 80863e5..66ee270 100644 --- a/VRC.SDK3.csproj +++ b/VRC.SDK3.csproj @@ -1149,14 +1149,14 @@ Library\ScriptAssemblies\Cinemachine.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.SDKBase.Editor.BuildPipeline.csproj b/VRC.SDKBase.Editor.BuildPipeline.csproj index ed626b7..29cfdf4 100644 --- a/VRC.SDKBase.Editor.BuildPipeline.csproj +++ b/VRC.SDKBase.Editor.BuildPipeline.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.SDKBase.Editor.ShaderStripping.csproj b/VRC.SDKBase.Editor.ShaderStripping.csproj index 76e0eff..208cd12 100644 --- a/VRC.SDKBase.Editor.ShaderStripping.csproj +++ b/VRC.SDKBase.Editor.ShaderStripping.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.Editor.csproj b/VRC.SDKBase.Editor.csproj index 221ccd3..8d952c3 100644 --- a/VRC.SDKBase.Editor.csproj +++ b/VRC.SDKBase.Editor.csproj @@ -1258,14 +1258,14 @@ Library\ScriptAssemblies\Unity.XR.Oculus.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.csproj b/VRC.SDKBase.csproj index 457487c..dfaf574 100644 --- a/VRC.SDKBase.csproj +++ b/VRC.SDKBase.csproj @@ -1185,14 +1185,14 @@ Library\ScriptAssemblies\Unity.Timeline.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.Udon.Editor.csproj b/VRC.Udon.Editor.csproj index a9bee13..2a48698 100644 --- a/VRC.Udon.Editor.csproj +++ b/VRC.Udon.Editor.csproj @@ -1206,14 +1206,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.Udon.Serialization.OdinSerializer.csproj b/VRC.Udon.Serialization.OdinSerializer.csproj index c19e98a..dea0bb8 100644 --- a/VRC.Udon.Serialization.OdinSerializer.csproj +++ b/VRC.Udon.Serialization.OdinSerializer.csproj @@ -1305,14 +1305,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.Udon.csproj b/VRC.Udon.csproj index 48b5212..6252443 100644 --- a/VRC.Udon.csproj +++ b/VRC.Udon.csproj @@ -1143,14 +1143,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRWorldToolkit.Editor.csproj b/VRWorldToolkit.Editor.csproj index c8493d8..6586dc2 100644 --- a/VRWorldToolkit.Editor.csproj +++ b/VRWorldToolkit.Editor.csproj @@ -1146,14 +1146,14 @@ Library\ScriptAssemblies\Unity.Postprocessing.Runtime.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/com.vrchat.core.vpm-resolver.Editor.csproj b/com.vrchat.core.vpm-resolver.Editor.csproj index 7071a0e..ee65efd 100644 --- a/com.vrchat.core.vpm-resolver.Editor.csproj +++ b/com.vrchat.core.vpm-resolver.Editor.csproj @@ -1142,14 +1142,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.Editor.csproj b/vrchat.jordo.easyquestswitch.Editor.csproj index efa55bb..436bfe1 100644 --- a/vrchat.jordo.easyquestswitch.Editor.csproj +++ b/vrchat.jordo.easyquestswitch.Editor.csproj @@ -1129,14 +1129,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.csproj b/vrchat.jordo.easyquestswitch.csproj index 5925cbf..8c0c6db 100644 --- a/vrchat.jordo.easyquestswitch.csproj +++ b/vrchat.jordo.easyquestswitch.csproj @@ -1151,14 +1151,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False +