diff --git a/Assets/Post Processing/SilentProfile.asset b/Assets/Post Processing/SilentProfile.asset index bb6667e..4b0079f 100644 --- a/Assets/Post Processing/SilentProfile.asset +++ b/Assets/Post Processing/SilentProfile.asset @@ -123,11 +123,11 @@ MonoBehaviour: overrideState: 1 value: {r: 1, g: 1, b: 1, a: 1} hueShift: - overrideState: 1 + overrideState: 0 value: 0 saturation: overrideState: 1 - value: 20 + value: 10 brightness: overrideState: 1 value: 0 @@ -135,43 +135,43 @@ MonoBehaviour: overrideState: 1 value: 0.7 contrast: - overrideState: 1 + overrideState: 0 value: 0 mixerRedOutRedIn: - overrideState: 1 + overrideState: 0 value: 100 mixerRedOutGreenIn: - overrideState: 1 + overrideState: 0 value: 0 mixerRedOutBlueIn: - overrideState: 1 + overrideState: 0 value: 0 mixerGreenOutRedIn: - overrideState: 1 + overrideState: 0 value: 0 mixerGreenOutGreenIn: - overrideState: 1 + overrideState: 0 value: 100 mixerGreenOutBlueIn: - overrideState: 1 + overrideState: 0 value: 0 mixerBlueOutRedIn: - overrideState: 1 + overrideState: 0 value: 0 mixerBlueOutGreenIn: - overrideState: 1 + overrideState: 0 value: 0 mixerBlueOutBlueIn: - overrideState: 1 + overrideState: 0 value: 100 lift: - overrideState: 1 + overrideState: 0 value: {x: 1, y: 1, z: 1, w: 0} gamma: - overrideState: 1 + overrideState: 0 value: {x: 1, y: 1, z: 1, w: 0} gain: - overrideState: 1 + overrideState: 0 value: {x: 1, y: 1, z: 1, w: 0} masterCurve: overrideState: 1 diff --git a/Assets/Prefabs/Case List Entry.prefab b/Assets/Prefabs/Case List Entry.prefab index ce3ef6c..f45cfaa 100644 --- a/Assets/Prefabs/Case List Entry.prefab +++ b/Assets/Prefabs/Case List Entry.prefab @@ -255,7 +255,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 4897177162454936150} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 4174894745916174158} + m_TargetAssemblyTypeName: + m_MethodName: SendCustomEvent + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: LoadCaseFile + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &3641310137806823130 GameObject: m_ObjectHideFlags: 0 @@ -615,11 +627,11 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 4174894745916174158} - _CaseFileURL: - url: https://witwics-dev.github.io/TestQuestion.json - _CaseNameText: {fileID: 5289319896243535637} - _CrookNameText: {fileID: 8359197988175629327} - _StolenLootText: {fileID: 2357634297786518751} + _CaseManager: {fileID: 0} + CaseFileURL: + url: + MapFiles: [] + VideoFiles: [] --- !u!114 &4174894745916174158 MonoBehaviour: m_ObjectHideFlags: 0 @@ -766,7 +778,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7635005722111176880} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 4174894745916174158} + m_TargetAssemblyTypeName: + m_MethodName: SendCustomEvent + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: LoadCaseFile + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &8424341910889717829 GameObject: m_ObjectHideFlags: 0 @@ -887,4 +911,16 @@ MonoBehaviour: m_TargetGraphic: {fileID: 9017700041050903883} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 4174894745916174158} + m_TargetAssemblyTypeName: + m_MethodName: SendCustomEvent + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: LoadCaseFile + m_BoolArgument: 0 + m_CallState: 2 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index ae2e408..2487e21 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -5442,63 +5442,113 @@ PrefabInstance: - target: {fileID: 1962602868978819423, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1962602868978819423, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1962602868978819423, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1962602868978819423, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchoredPosition.x - value: 487.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1962602868978819423, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2357634297786518751, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_text + value: Colonial Williamsburg + objectReference: {fileID: 0} + - target: {fileID: 2357634297786518751, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSize + value: 21 + objectReference: {fileID: 0} + - target: {fileID: 2357634297786518751, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMax + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 2357634297786518751, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMin + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 2357634297786518751, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_enableAutoSizing + value: 1 objectReference: {fileID: 0} - target: {fileID: 2764573716386264021, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2764573716386264021, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2764573716386264021, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2764573716386264021, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchoredPosition.x - value: 662.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2764573716386264021, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4708553358522083476, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_Name - value: Case List Entry + value: The Williamsburglary objectReference: {fileID: 0} - target: {fileID: 4897177162454936150, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_Material value: objectReference: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + - target: {fileID: 5289319896243535637, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_text + value: The Williamsburglary + objectReference: {fileID: 0} + - target: {fileID: 5289319896243535637, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSize + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 5289319896243535637, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMax + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 5289319896243535637, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMin + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 5289319896243535637, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_enableAutoSizing + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_Pivot.x @@ -5532,7 +5582,7 @@ PrefabInstance: - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_SizeDelta.x - value: 753 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} @@ -5577,12 +5627,12 @@ PrefabInstance: - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchoredPosition.x - value: 376.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} @@ -5602,27 +5652,47 @@ PrefabInstance: - target: {fileID: 6587367985738308803, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6587367985738308803, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6587367985738308803, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6587367985738308803, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchoredPosition.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6587367985738308803, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: _CaseManager + value: + objectReference: {fileID: 841163054} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: CaseFileURL.url + value: https://witwics-dev.github.io/TheWilliamsburglary.json + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: _CaseFileURL.url + value: https://witwics-dev.github.io/TheWilliamsburglary.json + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.size + value: 6 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} @@ -5630,11 +5700,66 @@ PrefabInstance: value: objectReference: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[0].url + value: https://www.youtube.com/watch?v=v4M25yPLi68 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[1].url + value: https://www.youtube.com/watch?v=IWT_PHxurvg + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[2].url + value: https://www.youtube.com/watch?v=VjWWCy0V_M4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[3].url + value: https://www.youtube.com/watch?v=OXXjadCcg_A + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[4].url + value: https://www.youtube.com/watch?v=i_s4O2TkBng + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[5].url + value: https://www.youtube.com/watch?v=iCUbU12yNKI + objectReference: {fileID: 0} - target: {fileID: 7635005722111176880, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_Material value: objectReference: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + - target: {fileID: 8359197988175629327, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_text + value: Patty Larceny + objectReference: {fileID: 0} + - target: {fileID: 8359197988175629327, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSize + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 8359197988175629327, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMax + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 8359197988175629327, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMin + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 8359197988175629327, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_enableAutoSizing + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9017700041050903883, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_Material @@ -6180,7 +6305,7 @@ RectTransform: m_Father: {fileID: 1201351612} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -12850,9 +12975,9 @@ RectTransform: m_Father: {fileID: 1061457513} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -12, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &555532037 MonoBehaviour: @@ -15889,6 +16014,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -20 objectReference: {fileID: 0} + - target: {fileID: 2357634297786518751, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMax + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 2357634297786518751, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMin + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 2357634297786518751, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_enableAutoSizing + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2764573716386264021, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_AnchorMax.y @@ -15929,6 +16069,21 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + - target: {fileID: 5289319896243535637, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMax + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 5289319896243535637, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMin + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 5289319896243535637, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_enableAutoSizing + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_Pivot.x @@ -16065,6 +16220,21 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + - target: {fileID: 8359197988175629327, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMax + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 8359197988175629327, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSizeMin + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 8359197988175629327, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_enableAutoSizing + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9017700041050903883, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_Material @@ -20277,7 +20447,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: -287.5} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &944027049 MonoBehaviour: @@ -24344,7 +24514,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1145254421 RectTransform: m_ObjectHideFlags: 0 @@ -33560,6 +33730,23 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1903095507429397234, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, + type: 2} + - target: {fileID: 1903095507429397234, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9, + type: 2} + - target: {fileID: 1903095507429397234, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2082709212681858895, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} propertyPath: m_AnchorMax.y @@ -34036,6 +34223,23 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -0.0501 objectReference: {fileID: 0} + - target: {fileID: 4142243991634991271, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, + type: 2} + - target: {fileID: 4142243991634991271, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9, + type: 2} + - target: {fileID: 4142243991634991271, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4174641338678754265, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} propertyPath: m_Layer @@ -41092,7 +41296,7 @@ PrefabInstance: - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3} propertyPath: m_LocalPosition.y - value: 1.04 + value: 1.41 objectReference: {fileID: 0} - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3} @@ -41134,6 +41338,46 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1439010667097516304, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1439010667097516308, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.41 + objectReference: {fileID: 0} + - target: {fileID: 1439010667097516310, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2749372315644709424, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, + type: 3} + propertyPath: m_LocalScale.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2749372315644709424, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, + type: 3} + propertyPath: m_LocalScale.y + value: 5.625 + objectReference: {fileID: 0} + - target: {fileID: 2749372315644709424, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, + type: 3} + propertyPath: m_LocalScale.z + value: 1.25 + objectReference: {fileID: 0} + - target: {fileID: 2749372315644709424, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2749372315644709424, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 7639350706768358381, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3} @@ -49203,35 +49447,35 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: + - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} + - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} - - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} - - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2} - {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} + - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} + - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} + - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} + - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} + - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 2100000, guid: 341141e903fac3e4ca54a62259c6d01d, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: cba30de4550b90f4f8ef7bc7d94faf95, type: 2} + - {fileID: 2100000, guid: 341141e903fac3e4ca54a62259c6d01d, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -52237,6 +52481,7 @@ SceneRoots: - {fileID: 3480278762663400089} - {fileID: 967863683} - {fileID: 1069902877} + - {fileID: 1647062666} - {fileID: 1787983411} - {fileID: 1684289505} - {fileID: 1687043075} @@ -52253,5 +52498,4 @@ SceneRoots: - {fileID: 6044205050412544512} - {fileID: 875814628} - {fileID: 938262255} - - {fileID: 1647062666} - {fileID: 1967830428} diff --git a/Assets/UdonSharp/Game Managers/CaseManager.asset b/Assets/UdonSharp/Game Managers/CaseManager.asset index eba481f..906c7bf 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.asset +++ b/Assets/UdonSharp/Game Managers/CaseManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 7 + Data: 8 - Name: Entry: 7 Data: @@ -428,13 +428,13 @@ MonoBehaviour: Data: 28|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + Data: CaseManagerListEntry, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 28 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -465,6 +465,60 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CaseFileDictionary + - Name: $v + Entry: 7 + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseFileDictionary + - 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 + - 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/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 2cbd7dd..8ad1113 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -37,16 +37,16 @@ public class CaseManager : UdonSharpBehaviour [SerializeField] private Texture[] CrookPortraits; - private DataDictionary _CaseFile; + private CaseManagerListEntry _CaseFile; + private DataDictionary _CaseFileDictionary; - void Start() + public void LoadCaseFile(CaseManagerListEntry CaseFile) { - // Download our test question. - VRCStringDownloader.LoadUrl(_QuestionURL, (IUdonEventReceiver)this); + _CaseFile = CaseFile; + VRCStringDownloader.LoadUrl(_CaseFile.CaseFileURL, (IUdonEventReceiver)this); } - public override void OnStringLoadSuccess(IVRCStringDownload DownloadedString) { string ErrorString = ""; @@ -55,14 +55,14 @@ public class CaseManager : UdonSharpBehaviour { if (JSONResult.TokenType == TokenType.DataDictionary) { - _CaseFile = JSONResult.DataDictionary; + _CaseFileDictionary = JSONResult.DataDictionary; - if (_CaseFile.ContainsKey("Round 1") && _CaseFile.ContainsKey("Round 2") && _CaseFile.ContainsKey("Round 3")) + if (_CaseFileDictionary.ContainsKey("Round 1") && _CaseFileDictionary.ContainsKey("Round 2") && _CaseFileDictionary.ContainsKey("Round 3")) { // Attempt to load Round 1 data - if (_CaseFile["Round 1"].TokenType == TokenType.DataList) + if (_CaseFileDictionary["Round 1"].TokenType == TokenType.DataList) { - _Round1Manager.LoadQuestionData(_CaseFile["Round 1"]); + _Round1Manager.LoadQuestionData(_CaseFileDictionary["Round 1"]); } else { @@ -70,9 +70,9 @@ public class CaseManager : UdonSharpBehaviour } // Attempt to load Round 2 data - if (_CaseFile["Round 2"].TokenType == TokenType.DataDictionary) + if (_CaseFileDictionary["Round 2"].TokenType == TokenType.DataDictionary) { - _Round2Manager.LoadQuestionData(_CaseFile["Round 2"]); + _Round2Manager.LoadQuestionData(_CaseFileDictionary["Round 2"]); } else { @@ -80,9 +80,9 @@ public class CaseManager : UdonSharpBehaviour } // Attempt to load Round 3 data - if (_CaseFile["Round 3"].TokenType == TokenType.DataDictionary) + if (_CaseFileDictionary["Round 3"].TokenType == TokenType.DataDictionary) { - _Round3Manager.LoadQuestionData(_CaseFile["Round 3"].DataDictionary); + _Round3Manager.LoadQuestionData(_CaseFileDictionary["Round 3"].DataDictionary); } else { @@ -135,15 +135,15 @@ public class CaseManager : UdonSharpBehaviour public string GetCaseTitle() { - return _CaseFile["Case Title"].ToString(); + return _CaseFileDictionary["Case Title"].ToString(); } public string GetLoot() { - return _CaseFile["Stolen Loot"].ToString(); + return _CaseFileDictionary["Stolen Loot"].ToString(); } public AccusedCrook GetCrook() { - return (AccusedCrook)_CaseFile["Accused Crook"].Number; + return (AccusedCrook)_CaseFileDictionary["Accused Crook"].Number; } @@ -167,11 +167,11 @@ public class CaseManager : UdonSharpBehaviour public string GetAccusedCrook() { - return CrookToString((AccusedCrook)(int)_CaseFile["Accused Crook"].Number); + return CrookToString((AccusedCrook)(int)_CaseFileDictionary["Accused Crook"].Number); } public Texture GetAccusedCrookPortrait() { - return CrookPortraits[(int)_CaseFile["Accused Crook"].Number]; + return CrookPortraits[(int)_CaseFileDictionary["Accused Crook"].Number]; } } diff --git a/Assets/UdonSharp/Game Managers/CaseManagerListEntry.asset b/Assets/UdonSharp/Game Managers/CaseManagerListEntry.asset index 200d6fc..ddc9613 100644 --- a/Assets/UdonSharp/Game Managers/CaseManagerListEntry.asset +++ b/Assets/UdonSharp/Game Managers/CaseManagerListEntry.asset @@ -50,16 +50,82 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileURL + Data: _CaseManager - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileURL + Data: _CaseManager - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CaseManager, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: CaseFileURL + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: CaseFileURL + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCUrl, VRCSDKBase @@ -68,7 +134,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 3 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -83,16 +149,10 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -110,79 +170,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseNameText - - Name: $v - Entry: 7 - Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CaseNameText - - Name: k__BackingField - Entry: 7 - Data: 7|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 7 - - 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: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 9|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: _CrookNameText + Data: MapFiles - Name: $v Entry: 7 Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookNameText + Data: MapFiles - Name: k__BackingField - Entry: 9 - Data: 7 + Entry: 7 + Data: 11|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl[], VRCSDKBase + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -197,16 +203,10 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 11|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: 12|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -224,19 +224,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _StolenLootText + Data: VideoFiles - Name: $v Entry: 7 Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _StolenLootText + Data: VideoFiles - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -254,13 +254,7 @@ MonoBehaviour: Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -281,13 +275,13 @@ MonoBehaviour: Data: _DeserialisedData - Name: $v Entry: 7 - Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _DeserialisedData - Name: k__BackingField Entry: 7 - Data: 17|System.RuntimeType, mscorlib + Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -296,7 +290,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 17 + Data: 16 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -311,7 +305,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/CaseManagerListEntry.cs b/Assets/UdonSharp/Game Managers/CaseManagerListEntry.cs index 128495c..445429a 100644 --- a/Assets/UdonSharp/Game Managers/CaseManagerListEntry.cs +++ b/Assets/UdonSharp/Game Managers/CaseManagerListEntry.cs @@ -1,61 +1,23 @@  -using TMPro; using UdonSharp; using UnityEngine; using VRC.SDK3.Data; -using VRC.SDK3.Image; -using VRC.SDK3.StringLoading; using VRC.SDKBase; -using VRC.Udon; -using VRC.Udon.Common.Interfaces; public class CaseManagerListEntry : UdonSharpBehaviour { - [SerializeField] private VRCUrl _CaseFileURL; + [SerializeField] private CaseManager _CaseManager; - [SerializeField] private TextMeshProUGUI _CaseNameText; - [SerializeField] private TextMeshProUGUI _CrookNameText; - [SerializeField] private TextMeshProUGUI _StolenLootText; + public VRCUrl CaseFileURL; + + public VRCUrl[] MapFiles; + public VRCUrl[] VideoFiles; private DataDictionary _DeserialisedData; - private void Start() + public void LoadCaseFile() { - //VRCStringDownloader.LoadUrl(_CaseFileURL, (IUdonEventReceiver)this); - } - - public override void OnStringLoadSuccess(IVRCStringDownload DownloadedString) - { - string ErrorString = ""; - string JSONString = DownloadedString.Result; - if (VRCJson.TryDeserializeFromJson(JSONString, out DataToken JSONResult)) - { - if (JSONResult.TokenType == TokenType.DataDictionary) - { - _DeserialisedData = JSONResult.DataDictionary; - if (_DeserialisedData.ContainsKey("Case Title") && - _DeserialisedData.ContainsKey("Accused Crook") && - _DeserialisedData.ContainsKey("Stolen Loot")) - { - _CaseNameText.text = _DeserialisedData["Case Title"].ToString(); - _CrookNameText.text = _DeserialisedData["Accused Crook"].ToString(); - _StolenLootText.text = _DeserialisedData["Stolen Loot"].ToString(); - } - else - { - ErrorString = "Metadata is missing."; - } - } - else - { - ErrorString = "Ensure the first element is a dictionary"; - } - } - - if (ErrorString != "") - { - Debug.LogError("Malformed case file: " + _CaseFileURL.Get() + ". " + ErrorString); - } + _CaseManager.LoadCaseFile(this); } }