diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index a5b5e76..3a6eccf 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -114,6 +114,7 @@ + diff --git a/Assets/Prefabs/Host Card Spawner.prefab b/Assets/Prefabs/Host Card Spawner.prefab new file mode 100644 index 0000000..b314b13 --- /dev/null +++ b/Assets/Prefabs/Host Card Spawner.prefab @@ -0,0 +1,107 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8172070431878381391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 583779592686493652} + - component: {fileID: 7553974903287998836} + - component: {fileID: 4067872519216286117} + - component: {fileID: 3675447201977067804} + m_Layer: 0 + m_Name: Host Card Spawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &583779592686493652 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8172070431878381391} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0.6499994, y: 1.46305, z: -0.09999871} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &7553974903287998836 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8172070431878381391} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 3 + m_Radius: 0.1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &4067872519216286117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8172070431878381391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 15a3c738aa07b8741b95d7cd03b173ce, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 3675447201977067804} + _HostCard: {fileID: 0} + _InteractiveCollider: {fileID: 7553974903287998836} +--- !u!114 &3675447201977067804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8172070431878381391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Spawn Host Card + interactTextGO: {fileID: 0} + proximity: 0.15 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 73407f20ea9b93548a097bd504b41789, + type: 2} + programSource: {fileID: 11400000, guid: d6ea985bd526b4648a09a27773533dec, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 diff --git a/Assets/Prefabs/Host Card Spawner.prefab.meta b/Assets/Prefabs/Host Card Spawner.prefab.meta new file mode 100644 index 0000000..226e42f --- /dev/null +++ b/Assets/Prefabs/Host Card Spawner.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c0e6ac64e5e4b49469f640d83b81c9f7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 75b2565..b8dc44d 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -16622,7 +16622,7 @@ MonoBehaviour: allowManipulationWhenEquipped: 0 orientation: 0 AutoHold: 1 - InteractionText: + InteractionText: Pick Up UseText: useEventBroadcastType: 0 UseDownEventName: @@ -16634,7 +16634,7 @@ MonoBehaviour: ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} pickupable: 0 - proximity: 1 + proximity: 0.15 --- !u!54 &379391075 Rigidbody: m_ObjectHideFlags: 0 @@ -16670,8 +16670,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 379391072} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.043619484, z: -0, w: 0.99904823} - m_LocalPosition: {x: -4.1258187, y: 1.571, z: 16.276983} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: @@ -16680,7 +16680,7 @@ Transform: - {fileID: 967689108} - {fileID: 1932946014} - {fileID: 736410918} - m_Father: {fileID: 0} + m_Father: {fileID: 2057732729} m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!65 &379391077 BoxCollider: @@ -16784,8 +16784,8 @@ MonoBehaviour: positionDesyncThreshold: 0.015 rotationDesyncThreshold: 0.995 minimumSleepFrames: 4 - spawnPos: {x: -4.1258187, y: 1.571, z: 16.276983} - spawnRot: {x: -0, y: -0.043619484, z: -0, w: 0.99904823} + spawnPos: {x: 0, y: 0, z: 0} + spawnRot: {x: -0, y: -0, z: -0, w: 1} _state: -1 localTransformFlag: 1 leftHandFlag: 0 @@ -32183,6 +32183,9 @@ MonoBehaviour: - {fileID: 272672682} - {fileID: 379391084} - {fileID: 198611405} + - {fileID: 2057732731} + - {fileID: 1737232025} + - {fileID: 1264786911} _CameraEventListeners: - {fileID: 904261778} --- !u!65 &824788963 @@ -37883,6 +37886,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &1040782399 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8172070431878381391, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + m_PrefabInstance: {fileID: 1264786910} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1042026143 PrefabInstance: m_ObjectHideFlags: 0 @@ -46347,6 +46356,103 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1264786910 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1276291775} + m_Modifications: + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalPosition.x + value: -27.21 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.46305 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.45000005 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.38268274 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.9238798 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 225 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4067872519216286117, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: _HostCard + value: + objectReference: {fileID: 379391087} + - target: {fileID: 4067872519216286117, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4067872519216286117, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + - target: {fileID: 8172070431878381391, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_Name + value: Round 3 Host Card Spawner + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} +--- !u!114 &1264786911 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3675447201977067804, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + m_PrefabInstance: {fileID: 1264786910} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1040782399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1264786912 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + m_PrefabInstance: {fileID: 1264786910} + m_PrefabAsset: {fileID: 0} --- !u!1 &1265023767 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4294144169429098507, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -46540,6 +46646,7 @@ Transform: - {fileID: 772205214} - {fileID: 1762618933} - {fileID: 1657587667} + - {fileID: 1264786912} - {fileID: 1343307840} - {fileID: 1143449486} - {fileID: 2063457642} @@ -53104,7 +53211,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1737232024} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2508e31fad449364f8b5919392c5d343, type: 3} @@ -68082,6 +68193,103 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1737232023 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1470660571} + m_Modifications: + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.9163 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.46305 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.7682 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4067872519216286117, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: _HostCard + value: + objectReference: {fileID: 379391087} + - target: {fileID: 4067872519216286117, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4067872519216286117, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + - target: {fileID: 8172070431878381391, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_Name + value: Round 2 Host Card Spawner + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} +--- !u!4 &1737232024 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + m_PrefabInstance: {fileID: 1737232023} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1737232025 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3675447201977067804, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + m_PrefabInstance: {fileID: 1737232023} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1931251399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1737908419 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, @@ -69415,7 +69623,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} propertyPath: m_LocalPosition.x - value: -0 + value: 0.68 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} @@ -69425,27 +69633,27 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.681 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.500004 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.500004 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.49999607 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.49999607 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} @@ -69460,7 +69668,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: 89.999 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} @@ -72887,6 +73095,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &1931251399 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8172070431878381391, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + m_PrefabInstance: {fileID: 1737232023} + m_PrefabAsset: {fileID: 0} --- !u!1 &1932605368 GameObject: m_ObjectHideFlags: 0 @@ -78254,6 +78468,30 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &2057732728 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8172070431878381391, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + m_PrefabInstance: {fileID: 5286186926104409739} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2057732729 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + m_PrefabInstance: {fileID: 5286186926104409739} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2057732731 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3675447201977067804, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + m_PrefabInstance: {fileID: 5286186926104409739} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057732728} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2057791818 GameObject: m_ObjectHideFlags: 0 @@ -78374,6 +78612,7 @@ Transform: m_Children: - {fileID: 1123331144} - {fileID: 1707197902} + - {fileID: 2057732729} m_Father: {fileID: 2110808113} m_LocalEulerAnglesHint: {x: 0, y: 75, z: 0} --- !u!1 &2058128274 @@ -85149,6 +85388,89 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f02831e826ef4484899eeac5b18c77ef, type: 3} +--- !u!1001 &5286186926104409739 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2057791822} + m_Modifications: + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.6499994 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.46305 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.09999871 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4067872519216286117, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: _HostCard + value: + objectReference: {fileID: 379391087} + - target: {fileID: 4067872519216286117, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4067872519216286117, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + - target: {fileID: 8172070431878381391, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + propertyPath: m_Name + value: Round 1 Host Card Spawner + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, + type: 3} + insertIndex: -1 + addedObject: {fileID: 379391076} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} --- !u!1001 &5448599223445625650 PrefabInstance: m_ObjectHideFlags: 0 @@ -91908,6 +92230,18 @@ MonoBehaviour: ID: 1450 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 2057732728} + ID: 1451 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1931251399} + ID: 1452 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1040782399} + ID: 1453 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -92092,7 +92426,6 @@ SceneRoots: - {fileID: 358170790} - {fileID: 1193701800} - {fileID: 1947493793} - - {fileID: 379391076} - {fileID: 1027471609} - {fileID: 1276291775} - {fileID: 1855771788} diff --git a/Assets/UdonSharp/HostCardSpawner.asset b/Assets/UdonSharp/HostCardSpawner.asset new file mode 100644 index 0000000..0f31ff6 --- /dev/null +++ b/Assets/UdonSharp/HostCardSpawner.asset @@ -0,0 +1,179 @@ +%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: HostCardSpawner + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 73407f20ea9b93548a097bd504b41789, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 15a3c738aa07b8741b95d7cd03b173ce, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 1 + scriptID: 3530674693465818898 + 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: 2 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _HostCard + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _HostCard + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: HostCardManager, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: _InteractiveCollider + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _InteractiveCollider + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Collider, UnityEngine.PhysicsModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 10|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: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/HostCardSpawner.asset.meta b/Assets/UdonSharp/HostCardSpawner.asset.meta new file mode 100644 index 0000000..e636673 --- /dev/null +++ b/Assets/UdonSharp/HostCardSpawner.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6ea985bd526b4648a09a27773533dec +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/HostCardSpawner.cs b/Assets/UdonSharp/HostCardSpawner.cs new file mode 100644 index 0000000..9d93e6f --- /dev/null +++ b/Assets/UdonSharp/HostCardSpawner.cs @@ -0,0 +1,34 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class HostCardSpawner : UdonSharpBehaviour +{ + [SerializeField] private HostCardManager _HostCard; + [SerializeField] private Collider _InteractiveCollider; + + + public override void Interact() + { + _HostCard.transform.parent = transform; + _HostCard.transform.localPosition = Vector3.zero; + _HostCard.transform.localRotation = Quaternion.identity; + + base.Interact(); + } + + + public void HostEnabled() + { + _InteractiveCollider.enabled = true; + } + + public void HostDisabled() + { + _InteractiveCollider.enabled = false; + } +} diff --git a/Assets/UdonSharp/HostCardSpawner.cs.meta b/Assets/UdonSharp/HostCardSpawner.cs.meta new file mode 100644 index 0000000..1bf1a44 --- /dev/null +++ b/Assets/UdonSharp/HostCardSpawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 15a3c738aa07b8741b95d7cd03b173ce +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: