From 27da1f5bf4d73fc7d2dbeba6596f87e63476875e Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Thu, 14 Aug 2025 05:19:23 -0400 Subject: [PATCH] - Interaction text finally made properly visible. - ACME Crimenet Computer clue images no longer infect the host card. - The Chase now begins without an awkward delay beforehand. --- .../M_ClueVideoScreen_Maps.mat | 2 +- .../ACME Crimenet Computer.prefab | 5 + .../Video Music Clue Skateboard.prefab | 7 +- Assets/Scenes/witwics.unity | 189 +++++++-- .../ACMECrimenetComputer.cs | 2 +- .../Game Managers/GameManagerBase.cs | 1 + .../Game Managers/GameManagerRound1.cs | 17 +- .../HostCardManager.asset | 369 +++++++++++------- .../Host Card Interfaces/HostCardManager.cs | 26 +- 9 files changed, 422 insertions(+), 196 deletions(-) diff --git a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat index 9d11511..0c5c084 100644 --- a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat +++ b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat @@ -48,7 +48,7 @@ Material: - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 0.5, y: 0.33333334} - m_Offset: {x: 0, y: 0.6666667} + m_Offset: {x: 0.5, y: 0.33333334} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab b/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab index cb8b6e4..c72e9b7 100644 --- a/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab +++ b/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab @@ -1354,6 +1354,11 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -1678994688175033314, guid: 131388005b2ec2642baed4dde9ef0e65, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - target: {fileID: 83984440625220898, guid: 131388005b2ec2642baed4dde9ef0e65, type: 3} propertyPath: m_Layer diff --git a/Assets/Prefabs/Video Music Clue Skateboard.prefab b/Assets/Prefabs/Video Music Clue Skateboard.prefab index a2a8ff1..1c7edac 100644 --- a/Assets/Prefabs/Video Music Clue Skateboard.prefab +++ b/Assets/Prefabs/Video Music Clue Skateboard.prefab @@ -909,7 +909,7 @@ MonoBehaviour: ChoiceUI: [] ChoiceButtonImages: [] ChoiceButtons: [] - _ExplainerUI: {fileID: 3606301561822296207} + ExplainerUI: {fileID: 0} --- !u!114 &3249518565014302499 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2053,6 +2053,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 019fb7f38cb408e4da4c713a8a54f001, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - target: {fileID: -7511558181221131132, guid: 019fb7f38cb408e4da4c713a8a54f001, type: 3} propertyPath: m_Materials.Array.data[1] diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index cfeaafa..85d3903 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -11868,6 +11868,7 @@ RectTransform: - {fileID: 73047839} - {fileID: 801369498} - {fileID: 270804580} + - {fileID: 1531399173} m_Father: {fileID: 379391076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.1, y: 0.1} @@ -13521,8 +13522,8 @@ MonoBehaviour: allowManipulationWhenEquipped: 0 orientation: 0 AutoHold: 1 - InteractionText: Pick Up - UseText: Advance + InteractionText: + UseText: useEventBroadcastType: 0 UseDownEventName: UseUpEventName: @@ -13757,6 +13758,7 @@ MonoBehaviour: _CaptureCarmenExplainerInterface: {fileID: 1347311702} _CaptureCarmenInterface: {fileID: 723351290} _AdminPanelInterface: {fileID: 967689115} + _InteractionText: {fileID: 1531399174} --- !u!1 &380683960 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2304338070976342257, guid: 126991d511ca61841a0ef899b6c038a6, @@ -48576,6 +48578,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530597307} m_CullTransparentMesh: 1 +--- !u!1 &1531399172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1531399173} + - component: {fileID: 1531399175} + - component: {fileID: 1531399174} + m_Layer: 22 + m_Name: InteractionText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1531399173 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1531399172} + 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: 334599374} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -239} + m_SizeDelta: {x: 640, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1531399174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1531399172} + 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: Interaction Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f1df6593a5901a141b7174c0cc73d6d0, type: 2} + m_sharedMaterial: {fileID: -1369706839575089024, guid: f1df6593a5901a141b7174c0cc73d6d0, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + 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!222 &1531399175 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1531399172} + m_CullTransparentMesh: 1 --- !u!1 &1531640755 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9199516250756149469, guid: 126991d511ca61841a0ef899b6c038a6, @@ -71464,37 +71601,37 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: e3bf0e4e3864c2149b48a821a799c6f4, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 68c7d547c0d7542429e36f9a891362ec, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 68c7d547c0d7542429e36f9a891362ec, type: 2} - - {fileID: 2100000, guid: e3bf0e4e3864c2149b48a821a799c6f4, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 diff --git a/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs b/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs index 08f7c7a..56d6e37 100644 --- a/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs +++ b/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs @@ -104,7 +104,7 @@ public class ACMECrimenetComputer : UdonSharpBehaviour } public override void OnImageLoadSuccess(IVRCImageDownload Result) { - _ClueImageCard.sharedMaterial.SetTexture("_MainTex", Result.Result); + _ClueImageCard.material.SetTexture("_MainTex", Result.Result); base.OnImageLoadSuccess(Result); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index 568653e..968e489 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -48,6 +48,7 @@ public class GameManagerBase : UdonSharpBehaviour protected void DisableInteraction() { _AllowInteractionFromHostCard = false; + _HostCard.SetNextInteractionText(""); } public bool IsInteractionEnabled() diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 7154c73..f6dffad 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -1410,14 +1410,11 @@ public class GameManagerRound1 : GameManagerBase private void AdvanceTheChase() { - Debug.Log("The Chase is now advancing to stage " + _QuestionStage); - switch (_QuestionStage) { - case 1: BeginTheChase(); break; - case 2: PlayTheChaseMusic(); break; - case 3: TheChaseCluesLoop(); break; - case 4: AdvanceToNextQuestion(); break; + case 1: PlayTheChaseMusic(); break; + case 2: TheChaseCluesLoop(); break; + case 3: AdvanceToNextQuestion(); break; default: break; } } @@ -1499,10 +1496,10 @@ public class GameManagerRound1 : GameManagerBase { PresentationMediumString = PresentationMediumToString((PresentationMedium)(int)Presentation["Medium"].Number); } - else - { - PresentationMediumString = RoundSegmentTypeToString(_CurrentQuestionType); - } + } + else + { + PresentationMediumString = RoundSegmentTypeToString(_CurrentQuestionType); } Interface.HeaderUI.text = "Upcoming Question: " + PresentationMediumString; diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.asset b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.asset index 38ebe37..a1db618 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: 13 + Data: 14 - Name: Entry: 7 Data: @@ -116,124 +116,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _IsBeingHeld + Data: _BetweenRoundsInterface - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _IsBeingHeld + Data: _BetweenRoundsInterface - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - 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: false - - Name: _fieldAttributes - Entry: 7 - Data: 9|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: _StoredJumpImpulse - - Name: $v - Entry: 7 - Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _StoredJumpImpulse - - Name: k__BackingField - Entry: 7 - Data: 11|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Single, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 11 - - 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: 12|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: _BetweenRoundsInterface - - Name: $v - Entry: 7 - Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _BetweenRoundsInterface - - Name: k__BackingField - Entry: 7 - Data: 14|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardBetweenRoundsInterface, Assembly-CSharp @@ -257,13 +149,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 16|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 10|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: UI @@ -272,7 +164,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 11|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -296,13 +188,13 @@ MonoBehaviour: Data: _MultipleChoiceInterface - Name: $v Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MultipleChoiceInterface - Name: k__BackingField Entry: 7 - Data: 19|System.RuntimeType, mscorlib + Data: 13|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardMultipleChoiceInterface, Assembly-CSharp @@ -326,13 +218,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -356,13 +248,13 @@ MonoBehaviour: Data: _LightningRoundInterface - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LightningRoundInterface - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 17|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardLightningRoundInterface, Assembly-CSharp @@ -386,13 +278,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -416,13 +308,13 @@ MonoBehaviour: Data: _TheChaseInterface - Name: $v Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TheChaseInterface - Name: k__BackingField Entry: 7 - Data: 27|System.RuntimeType, mscorlib + Data: 21|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardTheChaseInterface, Assembly-CSharp @@ -446,13 +338,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 28|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: 29|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 23|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -476,13 +368,13 @@ MonoBehaviour: Data: _TiebreakerInterface - Name: $v Entry: 7 - Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TiebreakerInterface - Name: k__BackingField Entry: 7 - Data: 31|System.RuntimeType, mscorlib + Data: 25|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardTiebreakerInterface, Assembly-CSharp @@ -506,13 +398,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 27|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -536,13 +428,13 @@ MonoBehaviour: Data: _RecoverTheLootExplainerInterface - Name: $v Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RecoverTheLootExplainerInterface - Name: k__BackingField Entry: 7 - Data: 35|System.RuntimeType, mscorlib + Data: 29|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardRecoverTheLootExplainerInterface, Assembly-CSharp @@ -566,13 +458,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 37|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 31|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -596,13 +488,13 @@ MonoBehaviour: Data: _RecoverTheLootInterface - Name: $v Entry: 7 - Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RecoverTheLootInterface - Name: k__BackingField Entry: 7 - Data: 39|System.RuntimeType, mscorlib + Data: 33|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardRecoverTheLootInterface, Assembly-CSharp @@ -626,13 +518,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 41|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -656,13 +548,13 @@ MonoBehaviour: Data: _CaptureCarmenExplainerInterface - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaptureCarmenExplainerInterface - Name: k__BackingField Entry: 7 - Data: 43|System.RuntimeType, mscorlib + Data: 37|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardCaptureCarmenExplainerInterface, Assembly-CSharp @@ -686,13 +578,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 44|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: 45|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -716,13 +608,13 @@ MonoBehaviour: Data: _CaptureCarmenInterface - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaptureCarmenInterface - Name: k__BackingField Entry: 7 - Data: 47|System.RuntimeType, mscorlib + Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardCaptureCarmenInterface, Assembly-CSharp @@ -746,13 +638,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 43|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -776,13 +668,13 @@ MonoBehaviour: Data: _AdminPanelInterface - Name: $v Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AdminPanelInterface - Name: k__BackingField Entry: 7 - Data: 51|System.RuntimeType, mscorlib + Data: 45|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostPanelInterface, Assembly-CSharp @@ -806,13 +698,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -828,6 +720,183 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _InteractionText + - Name: $v + Entry: 7 + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _InteractionText + - Name: k__BackingField + Entry: 7 + Data: 49|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 49 + - 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: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 51|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 52|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: _IsBeingHeld + - Name: $v + Entry: 7 + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _IsBeingHeld + - Name: k__BackingField + Entry: 7 + Data: 54|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 54 + - 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: 55|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: _StoredJumpImpulse + - Name: $v + Entry: 7 + Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _StoredJumpImpulse + - Name: k__BackingField + Entry: 7 + Data: 57|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 57 + - 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: 58|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/Host Card Interfaces/HostCardManager.cs b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs index ea1bd5d..d3f1481 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs @@ -4,6 +4,7 @@ using UnityEngine; using VRC.SDKBase; using VRC.SDK3.Components; using VRC.Udon.Common; +using TMPro; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] @@ -11,9 +12,6 @@ public class HostCardManager : UdonSharpBehaviour { [SerializeField] private GameManagerBase _GameManager; - private bool _IsBeingHeld = false; - private float _StoredJumpImpulse = 0.0f; - [Header("UI")] [SerializeField] private HostCardBetweenRoundsInterface _BetweenRoundsInterface; [SerializeField] private HostCardMultipleChoiceInterface _MultipleChoiceInterface; @@ -29,6 +27,13 @@ public class HostCardManager : UdonSharpBehaviour [SerializeField] private HostPanelInterface _AdminPanelInterface; + [Space] + + [SerializeField] private TextMeshProUGUI _InteractionText; + + private bool _IsBeingHeld = false; + private float _StoredJumpImpulse = 0.0f; + public override void OnPickup() { if (gameObject != null) @@ -37,6 +42,8 @@ public class HostCardManager : UdonSharpBehaviour _StoredJumpImpulse = Networking.LocalPlayer.GetJumpImpulse(); Networking.LocalPlayer.SetJumpImpulse(0.0f); _IsBeingHeld = true; + + _InteractionText.gameObject.SetActive(true); } base.OnPickup(); @@ -50,6 +57,8 @@ public class HostCardManager : UdonSharpBehaviour Networking.LocalPlayer.SetJumpImpulse(_StoredJumpImpulse); _StoredJumpImpulse = 0.0f; _IsBeingHeld = false; + + _InteractionText.gameObject.SetActive(false); } base.OnDrop(); @@ -87,11 +96,14 @@ public class HostCardManager : UdonSharpBehaviour public void SetNextInteractionText(string NextInteractionText) { - DisableInteractive = false; - VRCPickup Pickup = GetComponent(); - if (Pickup != null) + if (NextInteractionText != "") { - Pickup.UseText = NextInteractionText; + DisableInteractive = false; + _InteractionText.text = "Next: " + NextInteractionText; + } + else + { + _InteractionText.text = "Please wait..."; } }