ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

Explainer for Round 2 now properly shows the loot and crook in the text.

Browse Source
This commit is contained in:
Jamie Greunbaum 2025-08-13 18:08:37 -04:00
parent ccd73c5895
commit 316773c789
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/Scenes/witwics.unity
View File

@ -18528,8 +18528,8 @@ Light:
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 3.5 m_Intensity: 3.5
m_Range: 14 m_Range: 14
m_SpotAngle: 85 m_SpotAngle: 90
m_InnerSpotAngle: 5 m_InnerSpotAngle: 1
m_CookieSize: 10 m_CookieSize: 10
m_Shadows: m_Shadows:
m_Type: 0 m_Type: 0
@ -29754,8 +29754,8 @@ Light:
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 3.5 m_Intensity: 3.5
m_Range: 14 m_Range: 14
m_SpotAngle: 85 m_SpotAngle: 90
m_InnerSpotAngle: 5 m_InnerSpotAngle: 1
m_CookieSize: 10 m_CookieSize: 10
m_Shadows: m_Shadows:
m_Type: 0 m_Type: 0
@ -39755,7 +39755,7 @@ MonoBehaviour:
ChoiceUI: [] ChoiceUI: []
ChoiceButtonImages: [] ChoiceButtonImages: []
ChoiceButtons: [] ChoiceButtons: []
_ExplainerUI: {fileID: 1380484468} ExplainerUI: {fileID: 1380484468}
--- !u!114 &1331620966 --- !u!114 &1331620966
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -41260,8 +41260,9 @@ MonoBehaviour:
you need to obtain a warrant.\n\u2022 Once you have the warrant, then you can 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, 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, 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 and in that order, and you will put [[CROOK]] in jail and have a chance to catch
Catch Carmen Sandiego to win the promotion from Gumshoe to Sleuth." Carmen Sandiego.\n\u2022 Catch Carmen Sandiego to win the promotion from Gumshoe
to Sleuth."
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2} m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2}
m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9, m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9,

4
Assets/UdonSharp/Game Managers/CaseManager.cs
View File

@ -182,6 +182,10 @@ public class CaseManager : UdonSharpBehaviour
{ {
return _AccusedCrook; return _AccusedCrook;
} }
public string GetCrookName()
{
return CrookToString(_AccusedCrook);
}
public VRCUrl GetMap(int MapIndex) public VRCUrl GetMap(int MapIndex)
{ {

4
Assets/UdonSharp/Game Managers/GameManagerRound2.cs
View File

@ -112,6 +112,10 @@ public class GameManagerRound2 : GameManagerBase
RecoverTheLootInterface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.RecoverTheLootExplainer); 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"); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic");
EnableInteraction("Begin Round"); EnableInteraction("Begin Round");

12
Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.asset
View File

@ -266,13 +266,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _ExplainerUI Data: ExplainerUI
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _ExplainerUI Data: ExplainerUI
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 3 Data: 3
@ -296,13 +296,7 @@ MonoBehaviour:
Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 0
- Name:
Entry: 7
Data: 16|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name: - Name:
Entry: 13 Entry: 13
Data: Data:

2
Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootExplainerInterface.cs
View File

@ -7,5 +7,5 @@ using UnityEngine;
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
public class HostCardRecoverTheLootExplainerInterface : HostCardInterfaceBase public class HostCardRecoverTheLootExplainerInterface : HostCardInterfaceBase
{ {
[SerializeField] private TextMeshProUGUI _ExplainerUI; public TextMeshProUGUI ExplainerUI;
} }