diff --git a/Assets/Materials/M_ChoiceCard.mat b/Assets/Materials/M_ChoiceCard.mat index 0722e24..f675ab8 100644 --- a/Assets/Materials/M_ChoiceCard.mat +++ b/Assets/Materials/M_ChoiceCard.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ENABLE_GEOMETRIC_SPECULAR_AA - m_InvalidKeywords: [] + m_InvalidKeywords: + - _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -25,7 +26,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 511a2a95e47da9a4fb1b0b8146ad3e70, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -42,11 +43,11 @@ Material: m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Scale: {x: 0.5, y: 0.125} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Scale: {x: 0.5, y: 0.125} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -63,7 +64,7 @@ Material: m_Ints: [] m_Floats: - _Bicubic: 0 - - _BumpScale: 1 + - _BumpScale: 0.33333334 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 diff --git a/Assets/Materials/M_Podium.mat b/Assets/Materials/M_Podium.mat index b94bf21..3d85de7 100644 --- a/Assets/Materials/M_Podium.mat +++ b/Assets/Materials/M_Podium.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ENABLE_GEOMETRIC_SPECULAR_AA - m_InvalidKeywords: [] + m_InvalidKeywords: + - _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -25,7 +26,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 511a2a95e47da9a4fb1b0b8146ad3e70, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -63,7 +64,7 @@ Material: m_Ints: [] m_Floats: - _Bicubic: 0 - - _BumpScale: 1 + - _BumpScale: 0.33333334 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 diff --git a/Assets/Prefabs/Player Podium.prefab b/Assets/Prefabs/Player Podium.prefab index 4885308..a1a9a3e 100644 --- a/Assets/Prefabs/Player Podium.prefab +++ b/Assets/Prefabs/Player Podium.prefab @@ -172,7 +172,6 @@ GameObject: - component: {fileID: 1783151321112907825} - component: {fileID: 7720830972136695702} - component: {fileID: 2981482409094476529} - - component: {fileID: 2229823252050206256} m_Layer: 13 m_Name: Card Mesh m_TagString: Untagged @@ -245,27 +244,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &2229823252050206256 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 362458260504488319} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &576681596859506762 GameObject: m_ObjectHideFlags: 0 @@ -409,9 +387,12 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4784420777705181201} - - component: {fileID: 6984570406273449552} + - component: {fileID: 8832899739148045539} - component: {fileID: 2628711887938685344} - m_Layer: 0 + - component: {fileID: 4976480905586968192} + - component: {fileID: 4454862644353458933} + - component: {fileID: 6984570406273449552} + m_Layer: 13 m_Name: Card 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -435,6 +416,112 @@ Transform: - {fileID: 1624500124964819308} m_Father: {fileID: 2978271015408449549} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8832899739148045539 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255192616189574615} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.75, y: 0.005, z: 0.15} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2628711887938685344 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255192616189574615} + 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: 1 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 2bde40f0de0d2814daa3b6cd7e581e72, + type: 2} + programSource: {fileID: 11400000, guid: 221c60eb00090d54bb64570833c9a2d5, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!54 &4976480905586968192 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255192616189574615} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &4454862644353458933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255192616189574615} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1804438810, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} + m_Name: + m_EditorClassIdentifier: + MomentumTransferMethod: 0 + DisallowTheft: 1 + ExactGun: {fileID: 0} + ExactGrip: {fileID: 0} + allowManipulationWhenEquipped: 0 + orientation: 0 + AutoHold: 2 + InteractionText: Pick Up + UseText: Use + useEventBroadcastType: 0 + UseDownEventName: + UseUpEventName: + pickupDropEventBroadcastType: 0 + PickupEventName: + DropEventName: + ThrowVelocityBoostMinSpeed: 1 + ThrowVelocityBoostScale: 1 + currentlyHeldBy: {fileID: 0} + pickupable: 1 + proximity: 2 --- !u!114 &6984570406273449552 MonoBehaviour: m_ObjectHideFlags: 0 @@ -457,33 +544,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 2628711887938685344} - ChoiceNumber: 0 ---- !u!114 &2628711887938685344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1255192616189574615} - 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: 2bde40f0de0d2814daa3b6cd7e581e72, - type: 2} - programSource: {fileID: 11400000, guid: 221c60eb00090d54bb64570833c9a2d5, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 + ChoiceNumber: 1 + CardGroup: {fileID: 4424524232366912296} --- !u!1 &1829400999671884876 GameObject: m_ObjectHideFlags: 0 @@ -519,7 +581,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.4371, y: 1.031, z: -0.202} - m_LocalScale: {x: 0.045, y: 0.045, z: 0.4} + m_LocalScale: {x: 0.025, y: 0.025, z: 0.25} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7802392935245435383} @@ -737,7 +799,7 @@ MonoBehaviour: ExactGun: {fileID: 0} ExactGrip: {fileID: 0} allowManipulationWhenEquipped: 0 - orientation: 1 + orientation: 2 AutoHold: 0 InteractionText: Pick Up UseText: Buzz In @@ -831,9 +893,39 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4784420777705181201} - - {fileID: 4877525253113564480} m_Father: {fileID: 5617792120913924276} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2509325258865248374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2250248657447934369} + m_Layer: 0 + m_Name: PC Card Held Position + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2250248657447934369 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2509325258865248374} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071065, y: -0, z: -0, w: 0.7071071} + m_LocalPosition: {x: 0, y: 0.444, z: 0.47} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5617792120913924276} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &2607218674517393058 GameObject: m_ObjectHideFlags: 0 @@ -843,9 +935,12 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1604211625791945829} - - component: {fileID: 3603690767504630756} + - component: {fileID: 1915527556051957117} - component: {fileID: 7014170836395171117} - m_Layer: 0 + - component: {fileID: 7225155211836776917} + - component: {fileID: 5234292122976435584} + - component: {fileID: 3603690767504630756} + m_Layer: 13 m_Name: Card 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -869,6 +964,112 @@ Transform: - {fileID: 484292461414127745} m_Father: {fileID: 78434554900276400} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1915527556051957117 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2607218674517393058} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.75, y: 0.005, z: 0.15} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7014170836395171117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2607218674517393058} + 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: 1 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 2bde40f0de0d2814daa3b6cd7e581e72, + type: 2} + programSource: {fileID: 11400000, guid: 221c60eb00090d54bb64570833c9a2d5, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!54 &7225155211836776917 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2607218674517393058} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &5234292122976435584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2607218674517393058} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1804438810, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} + m_Name: + m_EditorClassIdentifier: + MomentumTransferMethod: 0 + DisallowTheft: 1 + ExactGun: {fileID: 0} + ExactGrip: {fileID: 0} + allowManipulationWhenEquipped: 0 + orientation: 0 + AutoHold: 2 + InteractionText: Pick Up + UseText: Use + useEventBroadcastType: 0 + UseDownEventName: + UseUpEventName: + pickupDropEventBroadcastType: 0 + PickupEventName: + DropEventName: + ThrowVelocityBoostMinSpeed: 1 + ThrowVelocityBoostScale: 1 + currentlyHeldBy: {fileID: 0} + pickupable: 1 + proximity: 2 --- !u!114 &3603690767504630756 MonoBehaviour: m_ObjectHideFlags: 0 @@ -891,33 +1092,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 7014170836395171117} - ChoiceNumber: 0 ---- !u!114 &7014170836395171117 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2607218674517393058} - 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: 2bde40f0de0d2814daa3b6cd7e581e72, - type: 2} - programSource: {fileID: 11400000, guid: 221c60eb00090d54bb64570833c9a2d5, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 + ChoiceNumber: 2 + CardGroup: {fileID: 4424524232366912296} --- !u!1 &2676251866672163708 GameObject: m_ObjectHideFlags: 0 @@ -1183,7 +1359,6 @@ GameObject: - component: {fileID: 2708926938775142233} - component: {fileID: 6141531539074573384} - component: {fileID: 2796096606291828731} - - component: {fileID: 168555523086297084} m_Layer: 13 m_Name: Card Mesh m_TagString: Untagged @@ -1256,27 +1431,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &168555523086297084 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3177186200166145190} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &3311726862824349027 GameObject: m_ObjectHideFlags: 1 @@ -1503,6 +1657,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5617792120913924276} + - component: {fileID: 4424524232366912296} + - component: {fileID: 8462795151643791661} m_Layer: 0 m_Name: Choice Cards m_TagString: Untagged @@ -1519,15 +1675,70 @@ Transform: m_GameObject: {fileID: 3902744920602546784} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.004, z: -0.07} + m_LocalPosition: {x: 0, y: 1.004, z: -0.139} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2978271015408449549} - {fileID: 78434554900276400} - {fileID: 6190117174038594721} + - {fileID: 2250248657447934369} m_Father: {fileID: 5984335492357139332} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4424524232366912296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3902744920602546784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 53ded36b5511644438dd179343f93e5a, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 8462795151643791661} + ChoiceCards: + - {fileID: 6984570406273449552} + - {fileID: 3603690767504630756} + - {fileID: 4898668639397953358} + Podium: {fileID: 1226214083704227558} + _PCCardHeldPosition: {fileID: 2250248657447934369} +--- !u!114 &8462795151643791661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3902744920602546784} + 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: 7e78a2ccac5c3e547abc2312ba9a455c, + type: 2} + programSource: {fileID: 11400000, guid: e3674ffb69c83514c8e3993fbfd8371c, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 --- !u!1 &5022568696710522097 GameObject: m_ObjectHideFlags: 0 @@ -1537,9 +1748,12 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2005410010811368080} - - component: {fileID: 4898668639397953358} + - component: {fileID: 6045589981160315630} - component: {fileID: 7308589448968152414} - m_Layer: 0 + - component: {fileID: 4885276250261690265} + - component: {fileID: 2812455601588160659} + - component: {fileID: 4898668639397953358} + m_Layer: 13 m_Name: Card 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1563,6 +1777,112 @@ Transform: - {fileID: 6168901515704183267} m_Father: {fileID: 6190117174038594721} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6045589981160315630 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5022568696710522097} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.75, y: 0.005, z: 0.15} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7308589448968152414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5022568696710522097} + 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: 1 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 2bde40f0de0d2814daa3b6cd7e581e72, + type: 2} + programSource: {fileID: 11400000, guid: 221c60eb00090d54bb64570833c9a2d5, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!54 &4885276250261690265 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5022568696710522097} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &2812455601588160659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5022568696710522097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1804438810, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} + m_Name: + m_EditorClassIdentifier: + MomentumTransferMethod: 0 + DisallowTheft: 1 + ExactGun: {fileID: 0} + ExactGrip: {fileID: 0} + allowManipulationWhenEquipped: 0 + orientation: 0 + AutoHold: 2 + InteractionText: Pick Up + UseText: Use + useEventBroadcastType: 0 + UseDownEventName: + UseUpEventName: + pickupDropEventBroadcastType: 0 + PickupEventName: + DropEventName: + ThrowVelocityBoostMinSpeed: 1 + ThrowVelocityBoostScale: 1 + currentlyHeldBy: {fileID: 0} + pickupable: 1 + proximity: 2 --- !u!114 &4898668639397953358 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1585,86 +1905,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 7308589448968152414} - ChoiceNumber: 0 ---- !u!114 &7308589448968152414 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5022568696710522097} - 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: 2bde40f0de0d2814daa3b6cd7e581e72, - type: 2} - programSource: {fileID: 11400000, guid: 221c60eb00090d54bb64570833c9a2d5, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!1 &5050991617928778067 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 313025860651454693} - - component: {fileID: 2193139898057447369} - m_Layer: 0 - m_Name: Card 2 Trigger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &313025860651454693 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5050991617928778067} - serializedVersion: 2 - 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: 0 - m_Children: [] - m_Father: {fileID: 78434554900276400} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &2193139898057447369 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5050991617928778067} - 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: 1 - serializedVersion: 3 - m_Size: {x: 0.8, y: 0.075, z: 0.175} - m_Center: {x: 0, y: 0, z: 0} + ChoiceNumber: 3 + CardGroup: {fileID: 4424524232366912296} --- !u!1 &5278643753074928947 GameObject: m_ObjectHideFlags: 0 @@ -1886,59 +2128,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!1 &5968747992642703659 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 940833088237162946} - - component: {fileID: 8748155860553856361} - m_Layer: 0 - m_Name: Card 3 Trigger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &940833088237162946 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5968747992642703659} - serializedVersion: 2 - 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: 0 - m_Children: [] - m_Father: {fileID: 6190117174038594721} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &8748155860553856361 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5968747992642703659} - 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: 1 - serializedVersion: 3 - m_Size: {x: 0.8, y: 0.075, z: 0.175} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &6181750060712598379 GameObject: m_ObjectHideFlags: 0 @@ -2052,7 +2241,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2005410010811368080} - - {fileID: 940833088237162946} m_Father: {fileID: 5617792120913924276} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6693907286767766257 @@ -2333,59 +2521,6 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!1 &7066569739728034305 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4877525253113564480} - - component: {fileID: 8597861768149332672} - m_Layer: 0 - m_Name: Card 1 Trigger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4877525253113564480 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7066569739728034305} - serializedVersion: 2 - 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: 0 - m_Children: [] - m_Father: {fileID: 2978271015408449549} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &8597861768149332672 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7066569739728034305} - 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: 1 - serializedVersion: 3 - m_Size: {x: 0.8, y: 0.075, z: 0.175} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7951288449963250592 GameObject: m_ObjectHideFlags: 0 @@ -2397,7 +2532,6 @@ GameObject: - component: {fileID: 7682722238609482187} - component: {fileID: 9190027058058457193} - component: {fileID: 95753584309622584} - - component: {fileID: 1820540931707353389} m_Layer: 13 m_Name: Card Mesh m_TagString: Untagged @@ -2470,27 +2604,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &1820540931707353389 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7951288449963250592} - 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: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &8532401947568035043 GameObject: m_ObjectHideFlags: 0 @@ -2761,7 +2874,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1604211625791945829} - - {fileID: 313025860651454693} m_Father: {fileID: 5617792120913924276} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9177488332444271605 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 257d4db..e15c05b 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -802,8 +802,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 2798572389090279422, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 3603690767504630756, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -820,6 +819,12 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4424524232366912296, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4424524232366912296, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4626828056981927811, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode @@ -875,8 +880,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 5730882168965022218, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 5944596893148642110, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode @@ -976,26 +980,28 @@ PrefabInstance: - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: spawnPos.x - value: 0.358 + value: 0.4371 + objectReference: {fileID: 0} + - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: spawnPos.z + value: -0.202 objectReference: {fileID: 0} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8700908482286058787, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -1022,6 +1028,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 172614115} m_PrefabAsset: {fileID: 0} +--- !u!1 &172614117 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5022568696710522097, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} +--- !u!1 &172614118 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2607218674517393058, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} +--- !u!1 &172614119 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1255192616189574615, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} --- !u!1 &202834220 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9000421388767152295, guid: 700c7675bc7fcf547a888725c3536e38, @@ -3936,8 +3960,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 2798572389090279422, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 3603690767504630756, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -3954,6 +3977,12 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4424524232366912296, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4424524232366912296, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4626828056981927811, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode @@ -4009,8 +4038,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 5730882168965022218, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 5944596893148642110, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode @@ -4110,26 +4138,28 @@ PrefabInstance: - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: spawnPos.x - value: 0.358 + value: 0.4371 + objectReference: {fileID: 0} + - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: spawnPos.z + value: -0.202 objectReference: {fileID: 0} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8700908482286058787, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -4156,6 +4186,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 937910637} m_PrefabAsset: {fileID: 0} +--- !u!1 &937910639 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5022568696710522097, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} +--- !u!1 &937910640 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2607218674517393058, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} +--- !u!1 &937910641 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1255192616189574615, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} --- !u!1 &957012837 GameObject: m_ObjectHideFlags: 0 @@ -5531,6 +5579,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1416238135} m_CullTransparentMesh: 1 +--- !u!1 &1419973031 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3902744920602546784, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} --- !u!1 &1441856220 GameObject: m_ObjectHideFlags: 0 @@ -5591,7 +5645,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -5903,6 +5957,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1494209301} m_CullTransparentMesh: 1 +--- !u!1 &1523413810 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3902744920602546784, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1559839983 PrefabInstance: m_ObjectHideFlags: 0 @@ -8143,7 +8203,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -8347,7 +8407,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -8608,6 +8668,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 937910637} m_PrefabAsset: {fileID: 0} +--- !u!1 &2095450009 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3902744920602546784, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} --- !u!1 &2106990171 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, @@ -9109,8 +9175,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 2798572389090279422, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 3603690767504630756, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -9127,6 +9192,12 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4424524232366912296, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4424524232366912296, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 4626828056981927811, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode @@ -9182,8 +9253,7 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 5730882168965022218, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 5944596893148642110, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode @@ -9283,26 +9353,28 @@ PrefabInstance: - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: spawnPos.x - value: 0.358 + value: 0.4371 + objectReference: {fileID: 0} + - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: spawnPos.z + value: -0.202 objectReference: {fileID: 0} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8700908482286058787, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -9329,6 +9401,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4438766482650780789} m_PrefabAsset: {fileID: 0} +--- !u!1 &4438766482650780791 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5022568696710522097, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4438766482650780792 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2607218674517393058, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4438766482650780793 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1255192616189574615, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} --- !u!114 &4438766482650780794 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2656281140157091124, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -9396,21 +9486,24 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2} + - {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2} - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} + - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} + - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} + - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} - - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - - {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2} - - {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: 9ae5e187a5d8f4e4893d37b62cbf0959, type: 2} - {fileID: 2100000, guid: ff135f18e14d9a94287191652767f722, type: 2} - {fileID: 2100000, guid: 341141e903fac3e4ca54a62259c6d01d, type: 2} @@ -9694,6 +9787,63 @@ MonoBehaviour: - VRC.Udon.UdonBehaviour - VRC.SDK3.Components.VRCPickup - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 4438766482650780793} + ID: 59 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.SDK3.Components.VRCPickup + - gameObject: {fileID: 4438766482650780792} + ID: 60 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.SDK3.Components.VRCPickup + - gameObject: {fileID: 4438766482650780791} + ID: 61 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.SDK3.Components.VRCPickup + - gameObject: {fileID: 172614119} + ID: 62 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.SDK3.Components.VRCPickup + - gameObject: {fileID: 172614118} + ID: 63 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.SDK3.Components.VRCPickup + - gameObject: {fileID: 172614117} + ID: 64 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.SDK3.Components.VRCPickup + - gameObject: {fileID: 937910641} + ID: 65 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.SDK3.Components.VRCPickup + - gameObject: {fileID: 937910640} + ID: 66 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.SDK3.Components.VRCPickup + - gameObject: {fileID: 937910639} + ID: 67 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - VRC.SDK3.Components.VRCPickup + - gameObject: {fileID: 1523413810} + ID: 68 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1419973031} + ID: 69 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 2095450009} + ID: 70 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/Textures/T_SimplexNoiseNormal.png b/Assets/Textures/T_SimplexNoiseNormal.png new file mode 100644 index 0000000..8775e73 Binary files /dev/null and b/Assets/Textures/T_SimplexNoiseNormal.png differ diff --git a/Assets/Textures/T_SimplexNoiseNormal.png.meta b/Assets/Textures/T_SimplexNoiseNormal.png.meta new file mode 100644 index 0000000..26abf3c --- /dev/null +++ b/Assets/Textures/T_SimplexNoiseNormal.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 511a2a95e47da9a4fb1b0b8146ad3e70 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 1 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 0 + crunchedCompression: 1 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/ChoiceCard.asset b/Assets/UdonSharp/ChoiceCard.asset index d6483ad..7152e6f 100644 --- a/Assets/UdonSharp/ChoiceCard.asset +++ b/Assets/UdonSharp/ChoiceCard.asset @@ -20,7 +20,7 @@ MonoBehaviour: scriptVersion: 2 compiledVersion: 2 behaviourSyncMode: 4 - hasInteractEvent: 1 + hasInteractEvent: 0 scriptID: -4699376671505787403 serializationData: SerializedFormat: 2 @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: @@ -105,6 +105,72 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: CardGroup + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: CardGroup + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: ChoiceCardGroup, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 8|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: 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: diff --git a/Assets/UdonSharp/ChoiceCard.cs b/Assets/UdonSharp/ChoiceCard.cs index 15dd285..47fd9b6 100644 --- a/Assets/UdonSharp/ChoiceCard.cs +++ b/Assets/UdonSharp/ChoiceCard.cs @@ -1,21 +1,29 @@  using UdonSharp; using UnityEngine; -using VRC.SDKBase; -using VRC.Udon; +using VRC.SDK3.UdonNetworkCalling; +using VRC.Udon.Common.Interfaces; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class ChoiceCard : UdonSharpBehaviour { [UdonSynced] public int ChoiceNumber = 0; + [SerializeField] private ChoiceCardGroup CardGroup = null; - public override void Interact() - { - base.Interact(); - } public override void OnPickup() { - base.OnPickup(); + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)CardGroup, NetworkEventTarget.All, "ChoiceCardInteract", ChoiceNumber); + } + + public void SetParent(ChoiceCardGroup ParentCardGroup) + { + CardGroup = ParentCardGroup; + } + + public void ResetPosition() + { + transform.localPosition = Vector3.zero; + transform.localRotation = Quaternion.identity; } } diff --git a/Assets/UdonSharp/ChoiceCardGroup.asset b/Assets/UdonSharp/ChoiceCardGroup.asset index ce759fa..5d61fb4 100644 --- a/Assets/UdonSharp/ChoiceCardGroup.asset +++ b/Assets/UdonSharp/ChoiceCardGroup.asset @@ -19,7 +19,7 @@ MonoBehaviour: sourceCsScript: {fileID: 11500000, guid: 53ded36b5511644438dd179343f93e5a, type: 3} scriptVersion: 2 compiledVersion: 2 - behaviourSyncMode: 0 + behaviourSyncMode: 4 hasInteractEvent: 0 scriptID: 3686401941242233976 serializationData: @@ -42,6 +42,54 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 12 + Data: 4 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: ChoiceCards + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ChoiceCards + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: ChoiceCard[], Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - 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: 0 @@ -51,3 +99,195 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: Podium + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Podium + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: PlayerPodium, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 8|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: 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: 7 + Data: + - Name: $k + Entry: 1 + Data: _PCCardHeldPosition + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PCCardHeldPosition + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - 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: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 14|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: _SelectedChoice + - Name: $v + Entry: 7 + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _SelectedChoice + - Name: k__BackingField + Entry: 7 + Data: 16|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 16 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 17|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: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/ChoiceCardGroup.cs b/Assets/UdonSharp/ChoiceCardGroup.cs index e82059b..07ecd56 100644 --- a/Assets/UdonSharp/ChoiceCardGroup.cs +++ b/Assets/UdonSharp/ChoiceCardGroup.cs @@ -1,13 +1,78 @@  using UdonSharp; using UnityEngine; +using VRC.SDK3.Components; +using VRC.SDK3.UdonNetworkCalling; using VRC.SDKBase; -using VRC.Udon; + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class ChoiceCardGroup : UdonSharpBehaviour { - void Start() - { - - } + public ChoiceCard[] ChoiceCards; + + [SerializeField] private PlayerPodium Podium = null; + [SerializeField] private Transform _PCCardHeldPosition; + + private int _SelectedChoice = -1; + + + void Start() + { + for (int i = 0; i < ChoiceCards.Length; i++) + { + ChoiceCards[i].SetParent(this); + ChoiceCards[i].ResetPosition(); + } + } + + + [NetworkCallable] + public void ChoiceCardInteract(int ChoiceNumber) + { + _SelectedChoice = ChoiceNumber; + + for (int i = 0; i < ChoiceCards.Length; i++) + { + ChoiceCard Card = ChoiceCards[i]; + + if (Card.ChoiceNumber == _SelectedChoice) + { + VRCPlayerApi Player = Networking.GetOwner(Podium.gameObject); + if (Player != null && !Player.IsUserInVR()) + { + VRCPickup Pickup = Card.GetComponent(); + if (Pickup != null) + { + Pickup.Drop(); + } + Card.transform.localPosition = _PCCardHeldPosition.localPosition; + Card.transform.localEulerAngles = _PCCardHeldPosition.localEulerAngles; + } + } + else + { + Card.ResetPosition(); + } + + } + } + + private void RevealChoice(int ChoiceNumber) + { + if (ChoiceNumber == _SelectedChoice) + { + VRCPlayerApi Player = Networking.GetOwner(Podium.gameObject); + if (Player != null && !Player.IsUserInVR()) + { + // Play the PC turn-around animation here. + } + } + } + + + public int GetSelectedChoice() + { + return _SelectedChoice; + } } diff --git a/Poi.Tools.csproj b/Poi.Tools.csproj index b6a9c14..6b2a38b 100644 --- a/Poi.Tools.csproj +++ b/Poi.Tools.csproj @@ -1149,14 +1149,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/ThryAssemblyDefinition.csproj b/ThryAssemblyDefinition.csproj index 043956c..30de29b 100644 --- a/ThryAssemblyDefinition.csproj +++ b/ThryAssemblyDefinition.csproj @@ -1249,14 +1249,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Editor.csproj b/UdonSharp.Editor.csproj index ac6db56..835468e 100644 --- a/UdonSharp.Editor.csproj +++ b/UdonSharp.Editor.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Lib.csproj b/UdonSharp.Lib.csproj index 474574e..fdd42af 100644 --- a/UdonSharp.Lib.csproj +++ b/UdonSharp.Lib.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UdonSharp.Runtime.csproj b/UdonSharp.Runtime.csproj index ba74349..62564ab 100644 --- a/UdonSharp.Runtime.csproj +++ b/UdonSharp.Runtime.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.Addressables.csproj b/UniTask.Addressables.csproj index fb0f47b..bae8e93 100644 --- a/UniTask.Addressables.csproj +++ b/UniTask.Addressables.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.DOTween.csproj b/UniTask.DOTween.csproj index dabbbec..478d57b 100644 --- a/UniTask.DOTween.csproj +++ b/UniTask.DOTween.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.Editor.csproj b/UniTask.Editor.csproj index 473d503..a39cffe 100644 --- a/UniTask.Editor.csproj +++ b/UniTask.Editor.csproj @@ -1128,14 +1128,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UniTask.Linq.csproj b/UniTask.Linq.csproj index fd7ad68..d608348 100644 --- a/UniTask.Linq.csproj +++ b/UniTask.Linq.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.TextMeshPro.csproj b/UniTask.TextMeshPro.csproj index cc5e8cf..8de78ee 100644 --- a/UniTask.TextMeshPro.csproj +++ b/UniTask.TextMeshPro.csproj @@ -1123,14 +1123,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UniTask.csproj b/UniTask.csproj index c1c2d15..ff2c404 100644 --- a/UniTask.csproj +++ b/UniTask.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/UnityEditorTests.csproj b/UnityEditorTests.csproj index f57b82f..fd56b97 100644 --- a/UnityEditorTests.csproj +++ b/UnityEditorTests.csproj @@ -990,14 +990,14 @@ Library\ScriptAssemblies\UnityEditor.TestRunner.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.ClientSim.Editor.csproj b/VRC.ClientSim.Editor.csproj index 2cc0fd2..20834b5 100644 --- a/VRC.ClientSim.Editor.csproj +++ b/VRC.ClientSim.Editor.csproj @@ -1159,14 +1159,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.ClientSim.csproj b/VRC.ClientSim.csproj index c4619f3..b633eb0 100644 --- a/VRC.ClientSim.csproj +++ b/VRC.ClientSim.csproj @@ -1264,14 +1264,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.ExampleCentral.Editor.csproj b/VRC.ExampleCentral.Editor.csproj index c33d7fd..73b783a 100644 --- a/VRC.ExampleCentral.Editor.csproj +++ b/VRC.ExampleCentral.Editor.csproj @@ -1138,14 +1138,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.Editor.csproj b/VRC.SDK3.Editor.csproj index e8c1069..088871a 100644 --- a/VRC.SDK3.Editor.csproj +++ b/VRC.SDK3.Editor.csproj @@ -1181,14 +1181,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.csproj b/VRC.SDK3.csproj index 80863e5..66ee270 100644 --- a/VRC.SDK3.csproj +++ b/VRC.SDK3.csproj @@ -1149,14 +1149,14 @@ Library\ScriptAssemblies\Cinemachine.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.SDKBase.Editor.BuildPipeline.csproj b/VRC.SDKBase.Editor.BuildPipeline.csproj index ed626b7..29cfdf4 100644 --- a/VRC.SDKBase.Editor.BuildPipeline.csproj +++ b/VRC.SDKBase.Editor.BuildPipeline.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.SDKBase.Editor.ShaderStripping.csproj b/VRC.SDKBase.Editor.ShaderStripping.csproj index 76e0eff..208cd12 100644 --- a/VRC.SDKBase.Editor.ShaderStripping.csproj +++ b/VRC.SDKBase.Editor.ShaderStripping.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.Editor.csproj b/VRC.SDKBase.Editor.csproj index 221ccd3..8d952c3 100644 --- a/VRC.SDKBase.Editor.csproj +++ b/VRC.SDKBase.Editor.csproj @@ -1258,14 +1258,14 @@ Library\ScriptAssemblies\Unity.XR.Oculus.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.csproj b/VRC.SDKBase.csproj index 457487c..dfaf574 100644 --- a/VRC.SDKBase.csproj +++ b/VRC.SDKBase.csproj @@ -1185,14 +1185,14 @@ Library\ScriptAssemblies\Unity.Timeline.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.Udon.Editor.csproj b/VRC.Udon.Editor.csproj index a9bee13..2a48698 100644 --- a/VRC.Udon.Editor.csproj +++ b/VRC.Udon.Editor.csproj @@ -1206,14 +1206,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.Udon.Serialization.OdinSerializer.csproj b/VRC.Udon.Serialization.OdinSerializer.csproj index c19e98a..dea0bb8 100644 --- a/VRC.Udon.Serialization.OdinSerializer.csproj +++ b/VRC.Udon.Serialization.OdinSerializer.csproj @@ -1305,14 +1305,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRC.Udon.csproj b/VRC.Udon.csproj index 48b5212..6252443 100644 --- a/VRC.Udon.csproj +++ b/VRC.Udon.csproj @@ -1143,14 +1143,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + diff --git a/VRWorldToolkit.Editor.csproj b/VRWorldToolkit.Editor.csproj index c8493d8..6586dc2 100644 --- a/VRWorldToolkit.Editor.csproj +++ b/VRWorldToolkit.Editor.csproj @@ -1146,14 +1146,14 @@ Library\ScriptAssemblies\Unity.Postprocessing.Runtime.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/com.vrchat.core.vpm-resolver.Editor.csproj b/com.vrchat.core.vpm-resolver.Editor.csproj index 7071a0e..ee65efd 100644 --- a/com.vrchat.core.vpm-resolver.Editor.csproj +++ b/com.vrchat.core.vpm-resolver.Editor.csproj @@ -1142,14 +1142,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.Editor.csproj b/vrchat.jordo.easyquestswitch.Editor.csproj index efa55bb..436bfe1 100644 --- a/vrchat.jordo.easyquestswitch.Editor.csproj +++ b/vrchat.jordo.easyquestswitch.Editor.csproj @@ -1129,14 +1129,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.csproj b/vrchat.jordo.easyquestswitch.csproj index 5925cbf..8c0c6db 100644 --- a/vrchat.jordo.easyquestswitch.csproj +++ b/vrchat.jordo.easyquestswitch.csproj @@ -1151,14 +1151,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEditor.UI.dll - False - Library\ScriptAssemblies\UnityEngine.UI.dll False + + Library\ScriptAssemblies\UnityEditor.UI.dll + False +