diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index 0738eadb..94868474 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -20,7 +20,6 @@ * archery range: * mute/unmute ikooni värv mitte must (muted kollane, roheline) * mikrofon peaks lõpetama protsessimise ka siis kui mängija läheb ära mikri juurest - * mikril ontriggerenter collider peaks olema väiksem kui ontriggerexit collider * võiks jääda kordama viimast instruktsiooni, kui mängija ei progressi edasi * kui archery range läbi, võiks npc öelda "good job, try again..." * kui midagi laeb (wire aktiivne), siis particle'id võiks voolata mööda toru diff --git a/Assets/_PROJECT/Multiplayer/NetworkPrefabs/NetworkPlayerMirror.prefab b/Assets/_PROJECT/Multiplayer/NetworkPrefabs/NetworkPlayerMirror.prefab index 0992bf49..345fd234 100644 --- a/Assets/_PROJECT/Multiplayer/NetworkPrefabs/NetworkPlayerMirror.prefab +++ b/Assets/_PROJECT/Multiplayer/NetworkPrefabs/NetworkPlayerMirror.prefab @@ -336,6 +336,11 @@ PrefabInstance: propertyPath: m_Name value: Kyle Head objectReference: {fileID: 0} + - target: {fileID: 7343580558529594842, guid: 298653603c8a05d488a30d936543a6bc, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -431,7 +436,7 @@ SphereCollider: m_LayerOverridePriority: 0 m_IsTrigger: 1 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Radius: 0.1337732 m_Center: {x: 0, y: -0.010031074, z: 0.02195441} diff --git a/Assets/_PROJECT/Prefabs/Audio/AudioManager.prefab b/Assets/_PROJECT/Prefabs/Audio/AudioManager.prefab index c8de4158..89464ac0 100644 --- a/Assets/_PROJECT/Prefabs/Audio/AudioManager.prefab +++ b/Assets/_PROJECT/Prefabs/Audio/AudioManager.prefab @@ -230,11 +230,11 @@ MonoBehaviour: Path: event:/SFX/Lexus/CarSystem k__BackingField: Guid: - Data1: 2116859508 - Data2: 1165465729 - Data3: 2142829992 - Data4: -912259047 - Path: event:/UI/Hover + Data1: -558038968 + Data2: 1319696346 + Data3: 1107837582 + Data4: -794860702 + Path: event:/UI/Click k__BackingField: Guid: Data1: 54902525 @@ -244,11 +244,11 @@ MonoBehaviour: Path: event:/UI/MapOpen k__BackingField: Guid: - Data1: -558038968 - Data2: 1319696346 - Data3: 1107837582 - Data4: -794860702 - Path: event:/UI/Click + Data1: 2116859508 + Data2: 1165465729 + Data3: 2142829992 + Data4: -912259047 + Path: event:/UI/Hover k__BackingField: Guid: Data1: -863141031 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab index 51dd3b7f..0499cac3 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab @@ -26,8 +26,8 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1228480816127797708} - m_LocalRotation: {x: -0, y: 0.9974923, z: -0, w: -0.07077533} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.999755, z: -0, w: 0.02213406} + m_LocalPosition: {x: 0, y: 0, z: 0.062999755} m_LocalScale: {x: 0.0013671161, y: 0.0013671163, z: 0.0013671161} m_ConstrainProportionsScale: 0 m_Children: @@ -35,10 +35,10 @@ RectTransform: - {fileID: 5533742576861006609} m_Father: {fileID: 6350200277953360468} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -182.537, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 1.519} + m_AnchoredPosition: {x: 0.008996681, y: 1.4561999} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &1276569980542663467 @@ -114,8 +114,8 @@ GameObject: - component: {fileID: 6350200277953360468} - component: {fileID: 8212827426052675577} - component: {fileID: 6621835591315127495} - - component: {fileID: 3702137064712532564} - component: {fileID: 2290950303170375389} + - component: {fileID: 1895843181799506388} m_Layer: 0 m_Name: MicrophoneStand m_TagString: Untagged @@ -130,14 +130,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4133399896732208162} - m_LocalRotation: {x: -0, y: 0.74966615, z: -0, w: 0.6618162} + m_LocalRotation: {x: 0, y: 0.7496666, z: 0, w: 0.6618157} m_LocalPosition: {x: -4.855707, y: -2.269, z: -3.767624} m_LocalScale: {x: 1.0972, y: 1.0972, z: 1.0972} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2055615201434766442} + - {fileID: 6631927537301099119} - {fileID: 4809606984572048444} + - {fileID: 8298154793510291265} m_Father: {fileID: 0} - m_RootOrder: -1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 97.123, z: 0} --- !u!33 &8212827426052675577 MeshFilter: @@ -190,27 +193,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!135 &3702137064712532564 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4133399896732208162} - 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_Radius: 0.47 - m_Center: {x: 0, y: 0.48, z: 0} --- !u!114 &2290950303170375389 MonoBehaviour: m_ObjectHideFlags: 0 @@ -227,6 +209,195 @@ MonoBehaviour: microphoneOffStatus: {fileID: 8834111901074404784} microphoneOnStatus: {fileID: 7008025959211898135} fmodWhisperBridge: {fileID: 0} +--- !u!64 &1895843181799506388 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4133399896732208162} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -1716842359454501035, guid: 8d58d99593882c94f96b623aa6967180, type: 3} +--- !u!1 &5505325484467839765 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8298154793510291265} + m_Layer: 0 + m_Name: QuestMarkerPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8298154793510291265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5505325484467839765} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.256, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6350200277953360468} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6112909062793245276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2055615201434766442} + - component: {fileID: 4754670324047860366} + - component: {fileID: 8238825200830906928} + m_Layer: 0 + m_Name: PlayerEnterTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2055615201434766442 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6112909062793245276} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.304, z: 0.119} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6350200277953360468} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &4754670324047860366 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6112909062793245276} + 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_Radius: 0.75 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8238825200830906928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6112909062793245276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 802e078b61fa28949b02b767f4fe7226, type: 3} + m_Name: + m_EditorClassIdentifier: + mic: {fileID: 2290950303170375389} + isEnter: 1 +--- !u!1 &6518319731001466033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6631927537301099119} + - component: {fileID: 6610863252786260040} + - component: {fileID: 1255423588861241212} + m_Layer: 0 + m_Name: PlayerExitTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6631927537301099119 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6518319731001466033} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.304, z: 0.119} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6350200277953360468} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &6610863252786260040 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6518319731001466033} + 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_Radius: 0.85 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1255423588861241212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6518319731001466033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 802e078b61fa28949b02b767f4fe7226, type: 3} + m_Name: + m_EditorClassIdentifier: + mic: {fileID: 2290950303170375389} + isEnter: 0 --- !u!1 &7008025959211898135 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/MicrophoneStand_Prototype.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/MicrophoneStand_Prototype.prefab deleted file mode 100644 index 24e7b913..00000000 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/MicrophoneStand_Prototype.prefab +++ /dev/null @@ -1,380 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4291579148315658230 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6761968278529855575} - - component: {fileID: 4763701867718457502} - - component: {fileID: 7203143526414218131} - - component: {fileID: 2568780590385977406} - - component: {fileID: 1523408157143897080} - m_Layer: 0 - m_Name: MicrophoneStand_Prototype - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6761968278529855575 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4291579148315658230} - 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: - - {fileID: 1850758373829337931} - m_Father: {fileID: 0} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4763701867718457502 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4291579148315658230} - m_Mesh: {fileID: -8524547844719368960, guid: 7c81a7464d27596489f008c96d1971c8, type: 3} ---- !u!23 &7203143526414218131 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4291579148315658230} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 19c6f99eccf0c69469fd5c281f18b5c0, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!135 &2568780590385977406 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4291579148315658230} - 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_Radius: 0.47 - m_Center: {x: 0, y: 0.48, z: 0} ---- !u!114 &1523408157143897080 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4291579148315658230} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 357101b2cface4943b04dfd25d4944e3, type: 3} - m_Name: - m_EditorClassIdentifier: - outputText: {fileID: 0} - microphoneOffStatus: {fileID: 8977839985090371394} - microphoneOnStatus: {fileID: 6537061652288108950} - fmodWhisperBridge: {fileID: 0} ---- !u!1 &5819798980962142350 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1850758373829337931} - - component: {fileID: 2106466490739867277} - - component: {fileID: 4587043586550884435} - - component: {fileID: 8719646384572601803} - m_Layer: 0 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1850758373829337931 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5819798980962142350} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0405} - m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4321634455225286656} - - {fileID: 3972028686577586524} - m_Father: {fileID: 6761968278529855575} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0.6033} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &2106466490739867277 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5819798980962142350} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &4587043586550884435 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5819798980962142350} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!114 &8719646384572601803 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5819798980962142350} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!1 &6537061652288108950 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3972028686577586524} - - component: {fileID: 3263217202320683959} - - component: {fileID: 6147207569465961459} - m_Layer: 0 - m_Name: MicrophoneOnStatus - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &3972028686577586524 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6537061652288108950} - 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: 1850758373829337931} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3263217202320683959 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6537061652288108950} - m_CullTransparentMesh: 1 ---- !u!114 &6147207569465961459 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6537061652288108950} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3f2516f6ee1cb5c4ba7f85f24c3d4f43, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8977839985090371394 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4321634455225286656} - - component: {fileID: 1842889781999843329} - - component: {fileID: 6304871477875013403} - m_Layer: 0 - m_Name: MicrophoneOffStatus - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4321634455225286656 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8977839985090371394} - 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: 1850758373829337931} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1842889781999843329 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8977839985090371394} - m_CullTransparentMesh: 1 ---- !u!114 &6304871477875013403 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8977839985090371394} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 68669679d082ba94bb4a39c08fa91e0d, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/MicrophoneStand_Prototype.prefab.meta b/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/MicrophoneStand_Prototype.prefab.meta deleted file mode 100644 index 37a4036e..00000000 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/MicrophoneStand_Prototype.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 44b369698b4397b45b9424694c46f2f5 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 0da53eeb..d00f15f2 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17a83165b79c8a939650f3aaecba75becda1482fcef2538c33422dc8ecc198f5 -size 68627834 +oid sha256:b437d93cc818f068311ba29872e20b1bf558e758825c09e2fa6d5a7f83589644 +size 68622277 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneProximityTrigger.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneProximityTrigger.cs new file mode 100644 index 00000000..e5d85de6 --- /dev/null +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneProximityTrigger.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MicrophoneProximityTrigger : MonoBehaviour +{ + public MicrophoneStand mic; + public bool isEnter; + + private void OnTriggerEnter(Collider other) + { + if (isEnter && other.gameObject.tag == "Player Head") + { + Debug.Log("collided with: " + other.gameObject.name); + mic.OnPlayerApproach(); + } + } + + private void OnTriggerExit(Collider other) + { + if (!isEnter && other.gameObject.tag == "Player Head") + { + Debug.Log("collider left with: " + other.gameObject.name); + mic.OnPlayerLeave(); + } + } +} diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneProximityTrigger.cs.meta b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneProximityTrigger.cs.meta new file mode 100644 index 00000000..37ead41f --- /dev/null +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneProximityTrigger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 802e078b61fa28949b02b767f4fe7226 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneStand.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneStand.cs index f0c49fcb..62393474 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneStand.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneStand.cs @@ -26,36 +26,26 @@ public class MicrophoneStand : MonoBehaviour } - void OnTriggerEnter(Collider other) + public void OnPlayerApproach() { - KbmController controller = other.GetComponent(); - Debug.Log("Mic stand collided with object " + other.gameObject.name); + fmodWhisperBridge.OnWhisperSegmentUpdated += OnPlayerSpeechUpdated; + fmodWhisperBridge.OnWhisperSegmentFinished += OnPlayerSpeechFinished; - if (controller != null || other.gameObject.tag == "Player Head") - { - fmodWhisperBridge.OnWhisperSegmentUpdated += OnPlayerSpeechUpdated; - fmodWhisperBridge.OnWhisperSegmentFinished += OnPlayerSpeechFinished; - - microphoneOffStatus.SetActive(false); - microphoneOnStatus.SetActive(true); - AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.RadioButton, gameObject); - fmodWhisperBridge.ActivateRecording(); - } + microphoneOffStatus.SetActive(false); + microphoneOnStatus.SetActive(true); + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.RadioButton, gameObject); + fmodWhisperBridge.ActivateRecording(); } - private void OnTriggerExit(Collider other) + public void OnPlayerLeave() { - KbmController controller = other.GetComponent(); - if (controller != null | other.gameObject.tag == "Player Head") - { - fmodWhisperBridge.OnWhisperSegmentUpdated -= OnPlayerSpeechUpdated; - fmodWhisperBridge.OnWhisperSegmentFinished -= OnPlayerSpeechFinished; + fmodWhisperBridge.OnWhisperSegmentUpdated -= OnPlayerSpeechUpdated; + fmodWhisperBridge.OnWhisperSegmentFinished -= OnPlayerSpeechFinished; - microphoneOffStatus.SetActive(true); - microphoneOnStatus.SetActive(false); - AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.RadioButton, gameObject); - fmodWhisperBridge.DeactivateRecording(); - } + microphoneOffStatus.SetActive(true); + microphoneOnStatus.SetActive(false); + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.RadioButton, gameObject); + fmodWhisperBridge.DeactivateRecording(); } private void OnPlayerSpeechUpdated(string text)