Added an area to drop the risk card that snaps it to the correct place.

This commit is contained in:
Jamie Greunbaum 2025-09-06 12:54:56 -04:00
parent 6ca24773b0
commit 0053f283c7
12 changed files with 468 additions and 44 deletions

View File

@ -71,6 +71,7 @@
<Compile Include="Assets\UdonSharp\Modem\Modem.cs" /> <Compile Include="Assets\UdonSharp\Modem\Modem.cs" />
<Compile Include="Assets\UdonSharp\Host Card Interfaces\HostCardIntroInterface.cs" /> <Compile Include="Assets\UdonSharp\Host Card Interfaces\HostCardIntroInterface.cs" />
<Compile Include="Assets\UdonSharp\Location Board\LocationBoardPanel.cs" /> <Compile Include="Assets\UdonSharp\Location Board\LocationBoardPanel.cs" />
<Compile Include="Assets\UdonSharp\Podium\RiskCardHolder.cs" />
<Compile Include="Assets\UdonSharp\Maps\FloorMapLocation.cs" /> <Compile Include="Assets\UdonSharp\Maps\FloorMapLocation.cs" />
<Compile Include="Assets\UdonSharp\Podium\ChoiceCardGroup.cs" /> <Compile Include="Assets\UdonSharp\Podium\ChoiceCardGroup.cs" />
<Compile Include="Assets\UdonSharp\Host Card Interfaces\HostCardRecoverTheLootEndInterface.cs" /> <Compile Include="Assets\UdonSharp\Host Card Interfaces\HostCardRecoverTheLootEndInterface.cs" />

View File

@ -243,10 +243,10 @@ BoxCollider:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 8192
m_ExcludeLayers: m_ExcludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 3584
m_LayerOverridePriority: 0 m_LayerOverridePriority: 0
m_IsTrigger: 0 m_IsTrigger: 0
m_ProvidesContacts: 0 m_ProvidesContacts: 0
@ -296,10 +296,10 @@ Rigidbody:
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 8192
m_ExcludeLayers: m_ExcludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 4294967295 m_Bits: 3584
m_ImplicitCom: 1 m_ImplicitCom: 1
m_ImplicitTensor: 1 m_ImplicitTensor: 1
m_UseGravity: 1 m_UseGravity: 1

View File

@ -918,6 +918,7 @@ Transform:
- {fileID: 78434554900276400} - {fileID: 78434554900276400}
- {fileID: 6190117174038594721} - {fileID: 6190117174038594721}
- {fileID: 2250248657447934369} - {fileID: 2250248657447934369}
- {fileID: 9149069322342715399}
m_Father: {fileID: 5984335492357139332} m_Father: {fileID: 5984335492357139332}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4424524232366912296 --- !u!114 &4424524232366912296
@ -1230,6 +1231,109 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &5957486306513083280
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9149069322342715399}
- component: {fileID: 2039829568681020909}
- component: {fileID: 6501792587173908481}
- component: {fileID: 8906657908162858697}
m_Layer: 0
m_Name: Risk Card Holder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9149069322342715399
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957486306513083280}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0000002533197}
m_LocalPosition: {x: 0, y: 0.0278, z: 0.2231}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5617792120913924276}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!65 &2039829568681020909
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957486306513083280}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 8192
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.48215008, y: 0.16358376, z: 0.2828468}
m_Center: {x: 0, y: 0.013086915, z: 0.1414234}
--- !u!114 &6501792587173908481
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957486306513083280}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8c5c9c0099baba047a5672fe5f733eeb, type: 3}
m_Name:
m_EditorClassIdentifier:
serializationData:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects: []
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes: []
_udonSharpBackingUdonBehaviour: {fileID: 8906657908162858697}
--- !u!114 &8906657908162858697
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5957486306513083280}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3}
m_Name:
m_EditorClassIdentifier:
interactTextPlacement: {fileID: 0}
interactText: Use
interactTextGO: {fileID: 0}
proximity: 2
SynchronizePosition: 0
AllowCollisionOwnershipTransfer: 0
Reliable: 0
_syncMethod: 3
serializedProgramAsset: {fileID: 11400000, guid: 55879270d8d2bd2448aa0fd442ff3062,
type: 2}
programSource: {fileID: 11400000, guid: 5ee671b124e44f9479db21be2e10cf42, type: 2}
serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF
publicVariablesUnityEngineObjects: []
publicVariablesSerializationDataFormat: 0
--- !u!1 &6181750060712598379 --- !u!1 &6181750060712598379
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2274,6 +2378,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3}
propertyPath: _Holder
value:
objectReference: {fileID: 2039829568681020909}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3} type: 3}
propertyPath: CardGroup propertyPath: CardGroup
@ -2398,6 +2507,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3}
propertyPath: _Holder
value:
objectReference: {fileID: 2039829568681020909}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3} type: 3}
propertyPath: CardGroup propertyPath: CardGroup
@ -2522,6 +2636,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3}
propertyPath: _Holder
value:
objectReference: {fileID: 2039829568681020909}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3} type: 3}
propertyPath: CardGroup propertyPath: CardGroup
@ -2646,6 +2765,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3}
propertyPath: _Holder
value:
objectReference: {fileID: 2039829568681020909}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3} type: 3}
propertyPath: CardGroup propertyPath: CardGroup
@ -3232,6 +3356,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3}
propertyPath: _Holder
value:
objectReference: {fileID: 2039829568681020909}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3} type: 3}
propertyPath: CardGroup propertyPath: CardGroup
@ -3580,6 +3709,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3}
propertyPath: _Holder
value:
objectReference: {fileID: 2039829568681020909}
- target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a, - target: {fileID: 7568050221486147178, guid: 951f1ffb73ac3374e904b18fa5f6d87a,
type: 3} type: 3}
propertyPath: CardGroup propertyPath: CardGroup

View File

@ -243,10 +243,10 @@ BoxCollider:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 8192
m_ExcludeLayers: m_ExcludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 3584
m_LayerOverridePriority: 0 m_LayerOverridePriority: 0
m_IsTrigger: 0 m_IsTrigger: 0
m_ProvidesContacts: 0 m_ProvidesContacts: 0
@ -296,10 +296,10 @@ Rigidbody:
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 8192
m_ExcludeLayers: m_ExcludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 4294967295 m_Bits: 3584
m_ImplicitCom: 1 m_ImplicitCom: 1
m_ImplicitTensor: 1 m_ImplicitTensor: 1
m_UseGravity: 1 m_UseGravity: 1
@ -363,6 +363,7 @@ MonoBehaviour:
_udonSharpBackingUdonBehaviour: {fileID: 7630349304643934917} _udonSharpBackingUdonBehaviour: {fileID: 7630349304643934917}
RiskAmount: 0 RiskAmount: 0
CardGroup: {fileID: 0} CardGroup: {fileID: 0}
_Holder: {fileID: 0}
_RiskCardText: {fileID: 3635978940077618910} _RiskCardText: {fileID: 3635978940077618910}
_SpawnPosition: {fileID: 0} _SpawnPosition: {fileID: 0}
_HeldPosition: {fileID: 0} _HeldPosition: {fileID: 0}

View File

@ -8952,6 +8952,12 @@ PrefabInstance:
propertyPath: _syncMethod propertyPath: _syncMethod
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6501792587173908481, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 6501792587173908481, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a, - target: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3} type: 3}
propertyPath: serializationData.Prefab propertyPath: serializationData.Prefab
@ -26504,6 +26510,12 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 734635744} m_PrefabInstance: {fileID: 734635744}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &735590427 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5957486306513083280, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
m_PrefabInstance: {fileID: 937910637}
m_PrefabAsset: {fileID: 0}
--- !u!1 &736299400 stripped --- !u!1 &736299400 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 3727370695564467316, guid: c3b6993d13023194d904d6353e18944f, m_CorrespondingSourceObject: {fileID: 3727370695564467316, guid: c3b6993d13023194d904d6353e18944f,
@ -31876,6 +31888,12 @@ PrefabInstance:
propertyPath: _syncMethod propertyPath: _syncMethod
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6501792587173908481, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 6501792587173908481, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a, - target: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3} type: 3}
propertyPath: serializationData.Prefab propertyPath: serializationData.Prefab
@ -53532,6 +53550,12 @@ GameObject:
type: 3} type: 3}
m_PrefabInstance: {fileID: 98354744} m_PrefabInstance: {fileID: 98354744}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1522466319 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5957486306513083280, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
m_PrefabInstance: {fileID: 172614115}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1523413810 stripped --- !u!1 &1523413810 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 3902744920602546784, guid: 79ebe62246f7f464e98373cb14765f9a, m_CorrespondingSourceObject: {fileID: 3902744920602546784, guid: 79ebe62246f7f464e98373cb14765f9a,
@ -65964,6 +65988,12 @@ RectTransform:
m_AnchoredPosition: {x: 320, y: -125} m_AnchoredPosition: {x: 320, y: -125}
m_SizeDelta: {x: 640, y: 30} m_SizeDelta: {x: 640, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1889182717 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5957486306513083280, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
m_PrefabInstance: {fileID: 4438766482650780789}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1891232460 stripped --- !u!1 &1891232460 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 3744667581734330268, guid: 126991d511ca61841a0ef899b6c038a6, m_CorrespondingSourceObject: {fileID: 3744667581734330268, guid: 126991d511ca61841a0ef899b6c038a6,
@ -77437,6 +77467,12 @@ PrefabInstance:
propertyPath: _syncMethod propertyPath: _syncMethod
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6501792587173908481, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 6501792587173908481, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3}
- target: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a, - target: {fileID: 6562853073298935955, guid: 79ebe62246f7f464e98373cb14765f9a,
type: 3} type: 3}
propertyPath: serializationData.Prefab propertyPath: serializationData.Prefab
@ -79494,39 +79530,39 @@ MonoBehaviour:
useAssignedLayers: 0 useAssignedLayers: 0
DynamicPrefabs: [] DynamicPrefabs: []
DynamicMaterials: DynamicMaterials:
- {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
- {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
- {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2}
- {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
- {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2}
- {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
- {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
- {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
- {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
- {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2}
- {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2}
- {fileID: 2100000, guid: 20b7b61cb65ead644a4959264fc90833, type: 2}
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
- {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
- {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
- {fileID: 2100000, guid: 20b7b61cb65ead644a4959264fc90833, type: 2}
- {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2}
- {fileID: 2100000, guid: cf2685410a4f72447a34ea1791a70a1c, type: 2} - {fileID: 2100000, guid: cf2685410a4f72447a34ea1791a70a1c, type: 2}
- {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2}
- {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
- {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2}
- {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
- {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2}
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
- {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2}
- {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2}
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
- {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2}
- {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2}
- {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
- {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2}
- {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2}
- {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
- {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2}
- {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2}
- {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2}
- {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2}
- {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2}
- {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2}
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
- {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2}
- {fileID: 2100000, guid: cf9efbb6277ea2d4aa7d30bc9073915e, type: 2} - {fileID: 2100000, guid: cf9efbb6277ea2d4aa7d30bc9073915e, type: 2}
LightMapsNear: [] LightMapsNear: []
LightMapsFar: [] LightMapsFar: []
@ -84089,6 +84125,18 @@ MonoBehaviour:
ID: 1105 ID: 1105
SerializedTypeNames: SerializedTypeNames:
- VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour
- gameObject: {fileID: 1889182717}
ID: 1106
SerializedTypeNames:
- VRC.Udon.UdonBehaviour
- gameObject: {fileID: 1522466319}
ID: 1107
SerializedTypeNames:
- VRC.Udon.UdonBehaviour
- gameObject: {fileID: 735590427}
ID: 1108
SerializedTypeNames:
- VRC.Udon.UdonBehaviour
portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
PlayerPersistence: [] PlayerPersistence: []

View File

@ -44,7 +44,7 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 12 Entry: 12
Data: 5 Data: 7
- Name: - Name:
Entry: 7 Entry: 7
Data: Data:
@ -176,19 +176,19 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _RiskCardText Data: _Holder
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _RiskCardText Data: _Holder
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 12|System.RuntimeType, mscorlib Data: 12|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro Data: UnityEngine.Collider, UnityEngine.PhysicsModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -236,19 +236,19 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _SpawnPosition Data: _RiskCardText
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _SpawnPosition Data: _RiskCardText
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 16|System.RuntimeType, mscorlib Data: 16|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: UnityEngine.Transform, UnityEngine.CoreModule Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -296,19 +296,25 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _HeldPosition Data: _SpawnPosition
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _HeldPosition Data: _SpawnPosition
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 7
Data: 16 Data: 20|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Transform, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 16 Data: 20
- 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
@ -323,13 +329,13 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 21|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: 21|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 22|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -345,6 +351,114 @@ MonoBehaviour:
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _HeldPosition
- Name: $v
Entry: 7
Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _HeldPosition
- Name: <UserType>k__BackingField
Entry: 9
Data: 20
- Name: <SystemType>k__BackingField
Entry: 9
Data: 20
- 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: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 25|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: _IsInHeldCollider
- Name: $v
Entry: 7
Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _IsInHeldCollider
- Name: <UserType>k__BackingField
Entry: 7
Data: 27|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Boolean, mscorlib
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 27
- 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: 28|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: - Name:
Entry: 13 Entry: 13
Data: Data:

View File

@ -11,28 +11,61 @@ public class RiskCard : UdonSharpBehaviour
{ {
[UdonSynced] public int RiskAmount = 0; [UdonSynced] public int RiskAmount = 0;
[SerializeField] private RiskCardGroup CardGroup = null; [SerializeField] private RiskCardGroup CardGroup = null;
[SerializeField] private Collider _Holder;
[SerializeField] private TextMeshProUGUI _RiskCardText; [SerializeField] private TextMeshProUGUI _RiskCardText;
[SerializeField] private Transform _SpawnPosition; [SerializeField] private Transform _SpawnPosition;
[SerializeField] private Transform _HeldPosition; [SerializeField] private Transform _HeldPosition;
private bool _IsInHeldCollider = false;
void Start() void Start()
{ {
_RiskCardText.text = RiskAmount.ToString(); _RiskCardText.text = RiskAmount.ToString();
} }
void OnTriggerEnter(Collider OtherCollider)
{
if (OtherCollider == _Holder)
{
_IsInHeldCollider = true;
}
}
private void OnTriggerExit(Collider OtherCollider)
{
if (OtherCollider == _Holder)
{
_IsInHeldCollider = false;
}
}
public override void OnPickup() public override void OnPickup()
{ {
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)CardGroup, NetworkEventTarget.All, "RiskCardPickedUp", RiskAmount); CardGroup.SendCustomNetworkEvent(NetworkEventTarget.All, "RiskCardPickedUp", RiskAmount);
base.OnPickup();
} }
public override void Interact() public override void Interact()
{ {
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)CardGroup, NetworkEventTarget.All, "RiskCardInteract", RiskAmount); CardGroup.SendCustomNetworkEvent(NetworkEventTarget.All, "RiskCardInteract", RiskAmount);
base.Interact();
} }
public override void OnDrop()
{
if (_IsInHeldCollider)
{
transform.position = _Holder.transform.position;
transform.rotation = _Holder.transform.rotation;
}
base.OnDrop();
}
public void SetCardGroup(RiskCardGroup ParentCardGroup) public void SetCardGroup(RiskCardGroup ParentCardGroup)
{ {
CardGroup = ParentCardGroup; CardGroup = ParentCardGroup;

View File

@ -62,7 +62,7 @@ public class RiskCardGroup : UdonSharpBehaviour
{ {
if (!Player.IsUserInVR()) if (!Player.IsUserInVR())
{ {
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)Card, NetworkEventTarget.All, "SetToHeldPosition"); Card.SendCustomNetworkEvent(NetworkEventTarget.All, "SetToHeldPosition");
Card.DisableInteractive = true; Card.DisableInteractive = true;
} }
} }
@ -89,7 +89,7 @@ public class RiskCardGroup : UdonSharpBehaviour
{ {
Pickup.Drop(); Pickup.Drop();
} }
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)Card, NetworkEventTarget.All, "SetToHeldPosition"); Card.SendCustomNetworkEvent(NetworkEventTarget.All, "SetToHeldPosition");
_PCCardAnimator.SetBool("Turn Forward", true); _PCCardAnimator.SetBool("Turn Forward", true);
Card.DisableInteractive = true; Card.DisableInteractive = true;
} }
@ -121,10 +121,19 @@ public class RiskCardGroup : UdonSharpBehaviour
for (int i = 0; i < _RiskCards.Length; i++) for (int i = 0; i < _RiskCards.Length; i++)
{ {
RiskCard Card = _RiskCards[i]; RiskCard Card = _RiskCards[i];
if (Card.RiskAmount == _SelectedRiskAmount) { Card.DisableInteractive = false; continue; } if (Card.RiskAmount == _SelectedRiskAmount)
Card.DisableInteractive = true; {
VRCPickup Pickup = Card.GetComponent<VRCPickup>(); Card.DisableInteractive = false;
if (Pickup != null) { Pickup.pickupable = false; } }
else
{
Card.DisableInteractive = true;
VRCPickup Pickup = Card.GetComponent<VRCPickup>();
if (Pickup != null)
{
Pickup.pickupable = false;
}
}
} }
} }

View File

@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: RiskCardHolder
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 55879270d8d2bd2448aa0fd442ff3062,
type: 2}
udonAssembly:
assemblyError:
sourceCsScript: {fileID: 11500000, guid: 8c5c9c0099baba047a5672fe5f733eeb, type: 3}
scriptVersion: 2
compiledVersion: 2
behaviourSyncMode: 4
hasInteractEvent: 0
scriptID: 7902799765129343202
serializationData:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects: []
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes:
- Name: fieldDefinitions
Entry: 7
Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition,
UdonSharp.Editor]], mscorlib
- Name: comparer
Entry: 7
Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String,
mscorlib]], mscorlib
- Name:
Entry: 8
Data:
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5ee671b124e44f9479db21be2e10cf42
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,12 @@

using UdonSharp;
using UnityEngine;
using VRC.SDKBase;
using VRC.Udon;
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
public class RiskCardHolder : UdonSharpBehaviour
{
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 8c5c9c0099baba047a5672fe5f733eeb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: