From 316773c78923701963577a9f2b60cd1b3dc952d8 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Wed, 13 Aug 2025 18:08:37 -0400 Subject: [PATCH] Explainer for Round 2 now properly shows the loot and crook in the text. --- Assets/Scenes/witwics.unity | 15 ++++++++------- Assets/UdonSharp/Game Managers/CaseManager.cs | 4 ++++ .../UdonSharp/Game Managers/GameManagerRound2.cs | 4 ++++ ...HostCardRecoverTheLootExplainerInterface.asset | 12 +++--------- .../HostCardRecoverTheLootExplainerInterface.cs | 2 +- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 7f49c8f..3e1a67b 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -18528,8 +18528,8 @@ Light: m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.5 m_Range: 14 - m_SpotAngle: 85 - m_InnerSpotAngle: 5 + m_SpotAngle: 90 + m_InnerSpotAngle: 1 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -29754,8 +29754,8 @@ Light: m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.5 m_Range: 14 - m_SpotAngle: 85 - m_InnerSpotAngle: 5 + m_SpotAngle: 90 + m_InnerSpotAngle: 1 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -39755,7 +39755,7 @@ MonoBehaviour: ChoiceUI: [] ChoiceButtonImages: [] ChoiceButtons: [] - _ExplainerUI: {fileID: 1380484468} + ExplainerUI: {fileID: 1380484468} --- !u!114 &1331620966 MonoBehaviour: m_ObjectHideFlags: 0 @@ -41260,8 +41260,9 @@ MonoBehaviour: 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." + and in that order, and you will put [[CROOK]] in jail and 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, diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 8469841..f544add 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -182,6 +182,10 @@ public class CaseManager : UdonSharpBehaviour { return _AccusedCrook; } + public string GetCrookName() + { + return CrookToString(_AccusedCrook); + } public VRCUrl GetMap(int MapIndex) { diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 9e1f5f7..55e4eb8 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -112,6 +112,10 @@ public class GameManagerRound2 : GameManagerBase RecoverTheLootInterface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.RecoverTheLootExplainer); + RecoverTheLootInterface.ExplainerUI.text = RecoverTheLootInterface.ExplainerUI.text + .Replace("[[LOOT]]", _CaseManager.GetLoot()) + .Replace("[[CROOK]]", _CaseManager.GetCrookName()); + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic"); EnableInteraction("Begin Round"); diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.asset b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.asset index f679ee9..9878cc2 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.asset +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.asset @@ -266,13 +266,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ExplainerUI + Data: ExplainerUI - Name: $v Entry: 7 Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ExplainerUI + Data: ExplainerUI - Name: k__BackingField Entry: 9 Data: 3 @@ -296,13 +296,7 @@ MonoBehaviour: 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: + Data: 0 - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.cs b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.cs index 282b464..1d2ee57 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.cs +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.cs @@ -7,5 +7,5 @@ using UnityEngine; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class HostCardRecoverTheLootExplainerInterface : HostCardInterfaceBase { - [SerializeField] private TextMeshProUGUI _ExplainerUI; + public TextMeshProUGUI ExplainerUI; }