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

Took a detour to implement many necessary changes:

Browse Source 
- Video player has been made a central object to improve reliability.
- Location board buttons on host card now indicate where items are.
- Jail Chain now syncs properly once again.
This commit is contained in:
ActualHorse
2025-12-22 00:18:08 -05:00
parent 743c9cde75
commit 7faece4539
48 changed files with 1250 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.asset
+240 -30
View File
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 9
Data: 13
- Name:
Entry: 7
Data:
@@ -320,19 +320,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ButtonColours
Data: _ButtonColourEnabled
- Name: $v
Entry: 7
Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ButtonColours
Data: _ButtonColourEnabled
- Name: <UserType>k__BackingField
Entry: 7
Data: 18|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Color[], UnityEngine.CoreModule
Data: UnityEngine.Color, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -350,13 +350,22 @@ MonoBehaviour:
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
Data: 1
- Name:
Entry: 7
Data: 20|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
@@ -374,25 +383,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ButtonColourEnabled
Data: _ButtonColourDisabled
- Name: $v
Entry: 7
Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ButtonColourEnabled
Data: _ButtonColourDisabled
- Name: <UserType>k__BackingField
Entry: 7
Data: 21|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Color, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
Entry: 9
Data: 18
- Name: <SystemType>k__BackingField
Entry: 9
Data: 21
Data: 18
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -404,7 +407,7 @@ MonoBehaviour:
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
@@ -428,19 +431,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ButtonColourDisabled
Data: _ButtonColourLoot
- Name: $v
Entry: 7
Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ButtonColourDisabled
Data: _ButtonColourLoot
- Name: <UserType>k__BackingField
Entry: 9
Data: 21
Data: 18
- Name: <SystemType>k__BackingField
Entry: 9
Data: 21
Data: 18
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -452,10 +455,67 @@ MonoBehaviour:
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 25|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- 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: _ButtonColourWarrant
- Name: $v
Entry: 7
Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ButtonColourWarrant
- Name: <UserType>k__BackingField
Entry: 9
Data: 18
- Name: <SystemType>k__BackingField
Entry: 9
Data: 18
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
@@ -476,19 +536,73 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ButtonColourAlreadyChosen
Data: _ButtonColourCrook
- Name: $v
Entry: 7
Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ButtonColourAlreadyChosen
Data: _ButtonColourCrook
- Name: <UserType>k__BackingField
Entry: 9
Data: 21
Data: 18
- Name: <SystemType>k__BackingField
Entry: 9
Data: 21
Data: 18
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
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: _LootButton
- Name: $v
Entry: 7
Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _LootButton
- Name: <UserType>k__BackingField
Entry: 7
Data: 31|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Int32, mscorlib
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 31
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -503,7 +617,103 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
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: 7
Data:
- Name: $k
Entry: 1
Data: _WarrantButton
- Name: $v
Entry: 7
Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _WarrantButton
- Name: <UserType>k__BackingField
Entry: 9
Data: 31
- Name: <SystemType>k__BackingField
Entry: 9
Data: 31
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 34|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: _CrookButton
- Name: $v
Entry: 7
Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CrookButton
- Name: <UserType>k__BackingField
Entry: 9
Data: 31
- Name: <SystemType>k__BackingField
Entry: 9
Data: 31
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.cs
+30 -5
View File
@@ -11,12 +11,17 @@ using VRC.Udon;
public class HostCardRecoverTheLootInterface : HostCardInterfaceBase
{
[SerializeField] private TextMeshProUGUI _CommentUI;
[Space]
public Color _ButtonColourEnabled = Color.white;
public Color _ButtonColourDisabled = Color.gray;
[Space]
public Color _ButtonColourLoot = new Color(0.0f, 1.0f, 1.0f);
public Color _ButtonColourWarrant = new Color(1.0f, 1.0f, 0.0f);
public Color _ButtonColourCrook = new Color(0.0f, 1.0f, 0.0f);
private Color[] _ButtonColours;
private Color _ButtonColourEnabled = Color.white;
private Color _ButtonColourDisabled = Color.gray;
private Color _ButtonColourAlreadyChosen = Color.yellow;
private int _LootButton = -1;
private int _WarrantButton = -1;
private int _CrookButton = -1;
public void SetComment(string Comment, Color CommentColour)
@@ -43,5 +48,25 @@ public class HostCardRecoverTheLootInterface : HostCardInterfaceBase
ChoiceButtons[i].enabled = Enable;
ChoiceButtonImages[i].color = Enable ? _ButtonColourEnabled : _ButtonColourDisabled;
}
if (_LootButton >= 0) ChoiceButtonImages[_LootButton].color = _ButtonColourLoot;
if (_WarrantButton >= 0) ChoiceButtonImages[_WarrantButton].color = _ButtonColourWarrant;
if (_CrookButton >= 0) ChoiceButtonImages[_CrookButton].color = _ButtonColourCrook;
}
public void SetLootButton(int Index)
{
_LootButton = (Index - 1) % ChoiceButtons.Length;
}
public void SetWarrantButton(int Index)
{
_WarrantButton = (Index - 1) % ChoiceButtons.Length;
}
public void SetCrookButton(int Index)
{
_CrookButton = (Index - 1) % ChoiceButtons.Length;
}
}