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

Player markers are no longer handled by GameManagerBase.

Browse Source
This commit is contained in:
Jamie Greunbaum 2026-05-17 03:52:12 -04:00
parent dbc5746a0b
commit 7bad3a6bed
5 changed files with 1135 additions and 1409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
Assets/UdonSharp/Game Managers/GameManagerBase.asset
View File

@ -44,7 +44,7 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 12 Entry: 12
Data: 13 Data: 12
- Name: - Name:
Entry: 7 Entry: 7
Data: Data:
@ -539,82 +539,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _PlayerPositionMarkers Data: _CameraController
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _PlayerPositionMarkers Data: _CameraController
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 36|System.RuntimeType, mscorlib Data: 36|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: PositionMarker[], Assembly-CSharp
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 7
Data: 37|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Component[], UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- 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: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 39|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: _CameraController
- Name: $v
Entry: 7
Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CameraController
- Name: <UserType>k__BackingField
Entry: 7
Data: 41|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: CameraControllerBase, Assembly-CSharp Data: CameraControllerBase, Assembly-CSharp
@ -638,13 +572,13 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 2 Data: 2
- Name: - Name:
Entry: 7 Entry: 7
Data: 43|UnityEngine.SpaceAttribute, UnityEngine.CoreModule Data: 38|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height - Name: height
Entry: 4 Entry: 4
Data: 8 Data: 8
@ -653,7 +587,7 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 7 Entry: 7
Data: 44|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -677,13 +611,13 @@ MonoBehaviour:
Data: _Initialised Data: _Initialised
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _Initialised Data: _Initialised
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 46|System.RuntimeType, mscorlib Data: 41|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: System.Boolean, mscorlib Data: System.Boolean, mscorlib
@ -692,7 +626,7 @@ MonoBehaviour:
Data: Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 46 Data: 41
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -707,13 +641,13 @@ MonoBehaviour:
Data: false Data: false
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 48|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -737,16 +671,16 @@ MonoBehaviour:
Data: _IsHostEnabled Data: _IsHostEnabled
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _IsHostEnabled Data: _IsHostEnabled
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 46 Data: 41
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 46 Data: 41
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -761,7 +695,7 @@ MonoBehaviour:
Data: false Data: false
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 0 Data: 0
@ -785,16 +719,16 @@ MonoBehaviour:
Data: _AllowInteractionFromHostCard Data: _AllowInteractionFromHostCard
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _AllowInteractionFromHostCard Data: _AllowInteractionFromHostCard
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 46 Data: 41
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 46 Data: 41
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -809,7 +743,7 @@ MonoBehaviour:
Data: false Data: false
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 0 Data: 0

25
Assets/UdonSharp/Game Managers/GameManagerBase.cs
View File

@ -48,7 +48,6 @@ public class GameManagerBase : UdonSharpBehaviour
[SerializeField] protected Microphone _AudienceSilencer = null; [SerializeField] protected Microphone _AudienceSilencer = null;
[Space] [Space]
[SerializeField] private PositionMarker _HostPositionMarker; [SerializeField] private PositionMarker _HostPositionMarker;
[SerializeField] private PositionMarker[] _PlayerPositionMarkers;
[Space] [Space]
[SerializeField] protected CameraControllerBase _CameraController; [SerializeField] protected CameraControllerBase _CameraController;
@ -145,26 +144,6 @@ public class GameManagerBase : UdonSharpBehaviour
_HostPositionMarker.SetPlayer(_CaseManager.GetHostOwner().displayName); _HostPositionMarker.SetPlayer(_CaseManager.GetHostOwner().displayName);
string[] WinningPlayers = _CaseManager.GetCurrentWinningPlayers();
for (int i = 0; i < _PlayerPositionMarkers.Length; i++)
{
if (_PlayerPositionMarkers[i].IsSet())
{
continue;
}
string PlayerName = "";
if (i < WinningPlayers.Length)
{
PlayerName = WinningPlayers[i];
}
else
{
PlayerName = _CaseManager.GetHostOwner().displayName;
}
_PlayerPositionMarkers[i].SetPlayer(PlayerName);
}
RequestSerialization(); RequestSerialization();
} }
@ -174,10 +153,6 @@ public class GameManagerBase : UdonSharpBehaviour
EnableAudienceSilencer(true); EnableAudienceSilencer(true);
_HostPositionMarker.ClearPlayer(); _HostPositionMarker.ClearPlayer();
for (int i = 0; i < _PlayerPositionMarkers.Length; i++)
{
_PlayerPositionMarkers[i].ClearPlayer();
}
_Initialised = false; _Initialised = false;
_InitAndDeinit_Synced(); _InitAndDeinit_Synced();

943
Assets/UdonSharp/Game Managers/GameManagerRound1.asset
View File

File diff suppressed because it is too large Load Diff

907
Assets/UdonSharp/Game Managers/GameManagerRound2.asset
View File

File diff suppressed because it is too large Load Diff

565
Assets/UdonSharp/Game Managers/GameManagerRound3.asset
View File

File diff suppressed because it is too large Load Diff