diff --git a/Project Undercover/Assets/Models/YBot/YBoyAnimator.controller b/Project Undercover/Assets/Models/YBot/YBoyAnimator.controller index 386b04a..3a6b0f8 100644 --- a/Project Undercover/Assets/Models/YBot/YBoyAnimator.controller +++ b/Project Undercover/Assets/Models/YBot/YBoyAnimator.controller @@ -13,19 +13,25 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Interrupted m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: PassingMessage m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: Wave + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -242,6 +248,51 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &1101398582299456848 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Interrupted + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102150790202348572} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.82954544 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101403792724398678 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102150790202348572} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.82954544 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &1101775513785162602 AnimatorStateTransition: m_ObjectHideFlags: 3 @@ -266,6 +317,30 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &1101864097741464978 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Wave + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102575800090953688} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.97 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &1102075779692729400 AnimatorState: serializedVersion: 5 @@ -304,6 +379,7 @@ AnimatorState: - {fileID: 1101240174848402812} - {fileID: 1101154328280627494} - {fileID: 1101234958992700582} + - {fileID: 1101864097741464978} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -317,6 +393,31 @@ AnimatorState: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: +--- !u!1102 &1102575800090953688 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Wave + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101398582299456848} + - {fileID: 1101403792724398678} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 4377a1c3a58a44747b33d73506e3d858, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: --- !u!1102 &1102660636531336150 AnimatorState: serializedVersion: 5 @@ -359,6 +460,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1102150790202348572} m_Position: {x: 348, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102575800090953688} + m_Position: {x: 588, y: 12, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Project Undercover/Assets/Resources/InteractionItem.prefab b/Project Undercover/Assets/Resources/InteractionItem.prefab new file mode 100644 index 0000000..2cdf629 --- /dev/null +++ b/Project Undercover/Assets/Resources/InteractionItem.prefab @@ -0,0 +1,319 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1712754431308494} + m_IsPrefabParent: 1 +--- !u!1 &1363781139966340 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224531806016218054} + - component: {fileID: 222940000257781502} + - component: {fileID: 114523001061847092} + m_Layer: 5 + m_Name: Item Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1618822445019746 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224048300615382840} + - component: {fileID: 222727721632994402} + - component: {fileID: 114672679117268906} + m_Layer: 5 + m_Name: Item Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1712754431308494 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224495458828153612} + - component: {fileID: 114209797991797522} + - component: {fileID: 114090458887756884} + m_Layer: 5 + m_Name: InteractionItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1746095561317838 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224275517958138616} + - component: {fileID: 222059009440653190} + - component: {fileID: 114182452800898590} + m_Layer: 5 + m_Name: Item Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &114090458887756884 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1712754431308494} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a504f94575329234aa42f32c65d42f3e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 114523001061847092} + background: {fileID: 114672679117268906} +--- !u!114 &114182452800898590 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1746095561317838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114209797991797522 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1712754431308494} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114672679117268906} + toggleTransition: 1 + graphic: {fileID: 114182452800898590} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 1 +--- !u!114 &114523001061847092 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1363781139966340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!114 &114672679117268906 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1618822445019746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &222059009440653190 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1746095561317838} +--- !u!222 &222727721632994402 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1618822445019746} +--- !u!222 &222940000257781502 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1363781139966340} +--- !u!224 &224048300615382840 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1618822445019746} + 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_Children: [] + m_Father: {fileID: 224495458828153612} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224275517958138616 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1746095561317838} + 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_Children: [] + m_Father: {fileID: 224495458828153612} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224495458828153612 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1712754431308494} + 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_Children: + - {fileID: 224048300615382840} + - {fileID: 224275517958138616} + - {fileID: 224531806016218054} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224531806016218054 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1363781139966340} + 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_Children: [] + m_Father: {fileID: 224495458828153612} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 5, y: -0.5} + m_SizeDelta: {x: -30, y: -3} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Project Undercover/Assets/Resources/InteractionItem.prefab.meta b/Project Undercover/Assets/Resources/InteractionItem.prefab.meta new file mode 100644 index 0000000..df4c0ff --- /dev/null +++ b/Project Undercover/Assets/Resources/InteractionItem.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d3817b0301d837042a84f22cbeba3abe +timeCreated: 1507513530 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Project Undercover/Assets/Resources/NPC.prefab b/Project Undercover/Assets/Resources/NPC.prefab index 0eff9d5..6cdf4c9 100644 --- a/Project Undercover/Assets/Resources/NPC.prefab +++ b/Project Undercover/Assets/Resources/NPC.prefab @@ -355,7 +355,6 @@ GameObject: - component: {fileID: 114492707522239788} - component: {fileID: 114063469203119278} - component: {fileID: 136748321063637496} - - component: {fileID: 114503176627609734} - component: {fileID: 114776369420944768} m_Layer: 10 m_Name: NPC @@ -2153,26 +2152,15 @@ MonoBehaviour: _queuedInteractorId: -1 _isInteracting: 0 interactions: + - {fileID: 11400000, guid: 01a3cf8545fc70f4c90095f144ac9b01, type: 2} + spyInteractions: - {fileID: 11400000, guid: 218e2ddac8223e349a855bdae23819ab, type: 2} - spyInteractions: [] + GlowColor: {r: 0, g: 1, b: 0, a: 0} currentState: {fileID: 11400000, guid: 78ec31c429ad5074bb50d001b1a49a77, type: 2} - remainState: {fileID: 11400000, guid: 5eb84557ff3e09f42b843e0b09653774, type: 2} + remainState: {fileID: 0} navMeshAgent: {fileID: 0} animator: {fileID: 0} characterAnimator: {fileID: 0} ---- !u!114 &114503176627609734 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1249949894527080} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d597e878c9aa5f1478d29321afbd8919, type: 3} - m_Name: - m_EditorClassIdentifier: - GlowColor: {r: 0, g: 1, b: 0.006896496, a: 0} - LerpFactor: 10 --- !u!114 &114776369420944768 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Project Undercover/Assets/Resources/PhotonServerSettings.asset b/Project Undercover/Assets/Resources/PhotonServerSettings.asset index af4e331..20e982f 100644 --- a/Project Undercover/Assets/Resources/PhotonServerSettings.asset +++ b/Project Undercover/Assets/Resources/PhotonServerSettings.asset @@ -65,4 +65,5 @@ MonoBehaviour: - SetTriggerRPC - SetInteractorRPC - SetIsInteractingRPC + - SetSelectedInteractionRPC DisableAutoOpenWizard: 1 diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects.meta b/Project Undercover/Assets/Resources/ScriptableObjects.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects.meta rename to Project Undercover/Assets/Resources/ScriptableObjects.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Actions.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/NPC.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/NPC.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/NPC.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/NPC.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/NPC/Roam.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/NPC/Roam.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/NPC/Roam.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/NPC/Roam.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/NPC/Roam.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/NPC/Roam.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/NPC/Roam.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/NPC/Roam.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/CheckForInterrupts.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/CheckForInterrupts.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/CheckForInterrupts.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/CheckForInterrupts.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/CheckForInterrupts.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/CheckForInterrupts.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/CheckForInterrupts.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/CheckForInterrupts.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/IdleClick.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/IdleClick.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/IdleClick.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/IdleClick.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/IdleClick.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/IdleClick.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/IdleClick.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/IdleClick.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/PassMessage.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/PassMessage.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/PassMessage.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/PassMessage.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/PassMessage.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/PassMessage.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/PassMessage.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/PassMessage.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/PromptInteractions.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/PromptInteractions.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/PromptInteractions.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/PromptInteractions.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/PromptInteractions.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/PromptInteractions.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/PromptInteractions.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/PromptInteractions.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/SpyInteract.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/SpyInteract.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/SpyInteract.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/SpyInteract.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/SpyInteract.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/SpyInteract.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/SpyInteract.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/SpyInteract.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/WaitForInteractionAcceptance.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/WaitForInteractionAcceptance.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/WaitForInteractionAcceptance.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/WaitForInteractionAcceptance.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/WaitForInteractionAcceptance.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/WaitForInteractionAcceptance.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/Player/WaitForInteractionAcceptance.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/Player/WaitForInteractionAcceptance.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/WaitInPlace.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/WaitInPlace.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/WaitInPlace.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/WaitInPlace.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/WaitInPlace.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Actions/WaitInPlace.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Actions/WaitInPlace.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Actions/WaitInPlace.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/IsInteracting.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/IsInteracting.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/IsInteracting.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/IsInteracting.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/IsInteracting.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/IsInteracting.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/IsInteracting.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/IsInteracting.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/NPC.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/NPC.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/NPC.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/NPC.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/InitiatedInteraction.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/InitiatedInteraction.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/InitiatedInteraction.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/InitiatedInteraction.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/InitiatedInteraction.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/InitiatedInteraction.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/InitiatedInteraction.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/InitiatedInteraction.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/Interrupted.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/Interrupted.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/Interrupted.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/Interrupted.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/Interrupted.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/Interrupted.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/Interrupted.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/Interrupted.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/ObjectAcceptedInteraction.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/ObjectAcceptedInteraction.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/ObjectAcceptedInteraction.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/ObjectAcceptedInteraction.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/ObjectAcceptedInteraction.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/ObjectAcceptedInteraction.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/ObjectAcceptedInteraction.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/ObjectAcceptedInteraction.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/ObjectDeclinedInteraction.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/ObjectDeclinedInteraction.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/ObjectDeclinedInteraction.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/ObjectDeclinedInteraction.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/ObjectDeclinedInteraction.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/ObjectDeclinedInteraction.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/ObjectDeclinedInteraction.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/ObjectDeclinedInteraction.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/PassingMessageToIdleTransition.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/PassingMessageToIdleTransition.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/PassingMessageToIdleTransition.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/PassingMessageToIdleTransition.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/PassingMessageToIdleTransition.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/PassingMessageToIdleTransition.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/PassingMessageToIdleTransition.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/PassingMessageToIdleTransition.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/YouAcceptedInteraction.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/YouAcceptedInteraction.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/YouAcceptedInteraction.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/YouAcceptedInteraction.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/YouAcceptedInteraction.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/YouAcceptedInteraction.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Decisions/Player/YouAcceptedInteraction.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Decisions/Player/YouAcceptedInteraction.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Interactions.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Interactions.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Interactions.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Interactions.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Interactions/TellSecret.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Interactions/TellSecret.asset similarity index 76% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Interactions/TellSecret.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/Interactions/TellSecret.asset index 1b63288..6714bf3 100644 --- a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Interactions/TellSecret.asset +++ b/Project Undercover/Assets/Resources/ScriptableObjects/Interactions/TellSecret.asset @@ -11,8 +11,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3e84829fa9f855a42b9c35f7eb3b3dc0, type: 3} m_Name: TellSecret m_EditorClassIdentifier: - interactionDescription: Telling Secret... - characterInteraction: 1 + interactionDescription: tell a secret + receiverDescription: listen to a secret + characterInteraction: 2 result: 1 initialRotation: -60 objectInitialRotation: -60 + interactionDistance: 1 diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Interactions/TellSecret.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Interactions/TellSecret.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/Interactions/TellSecret.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/Interactions/TellSecret.asset.meta diff --git a/Project Undercover/Assets/Resources/ScriptableObjects/Interactions/Wave.asset b/Project Undercover/Assets/Resources/ScriptableObjects/Interactions/Wave.asset new file mode 100644 index 0000000..b46e011 --- /dev/null +++ b/Project Undercover/Assets/Resources/ScriptableObjects/Interactions/Wave.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e84829fa9f855a42b9c35f7eb3b3dc0, type: 3} + m_Name: Wave + m_EditorClassIdentifier: + interactionDescription: wave + receiverDescription: wave back + characterInteraction: 4 + result: 0 + initialRotation: 0 + objectInitialRotation: 0 + interactionDistance: 1 diff --git a/Project Undercover/Assets/Resources/ScriptableObjects/Interactions/Wave.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/Interactions/Wave.asset.meta new file mode 100644 index 0000000..1f02218 --- /dev/null +++ b/Project Undercover/Assets/Resources/ScriptableObjects/Interactions/Wave.asset.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 01a3cf8545fc70f4c90095f144ac9b01 +timeCreated: 1507510889 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States.meta b/Project Undercover/Assets/Resources/ScriptableObjects/States.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/States.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/NPC.meta b/Project Undercover/Assets/Resources/ScriptableObjects/States/NPC.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/NPC.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/States/NPC.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/NPC/Roam.asset b/Project Undercover/Assets/Resources/ScriptableObjects/States/NPC/Roam.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/NPC/Roam.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/States/NPC/Roam.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/NPC/Roam.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/States/NPC/Roam.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/NPC/Roam.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/States/NPC/Roam.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/NPC/WaitForInteractionToEnd.asset b/Project Undercover/Assets/Resources/ScriptableObjects/States/NPC/WaitForInteractionToEnd.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/NPC/WaitForInteractionToEnd.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/States/NPC/WaitForInteractionToEnd.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/NPC/WaitForInteractionToEnd.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/States/NPC/WaitForInteractionToEnd.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/NPC/WaitForInteractionToEnd.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/States/NPC/WaitForInteractionToEnd.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player.meta b/Project Undercover/Assets/Resources/ScriptableObjects/States/Player.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/States/Player.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/Idle.asset b/Project Undercover/Assets/Resources/ScriptableObjects/States/Player/Idle.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/Idle.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/States/Player/Idle.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/Idle.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/States/Player/Idle.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/Idle.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/States/Player/Idle.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/SpyInteract.asset b/Project Undercover/Assets/Resources/ScriptableObjects/States/Player/SpyInteract.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/SpyInteract.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/States/Player/SpyInteract.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/SpyInteract.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/States/Player/SpyInteract.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/SpyInteract.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/States/Player/SpyInteract.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/WaitingForAcceptance.asset b/Project Undercover/Assets/Resources/ScriptableObjects/States/Player/WaitingForAcceptance.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/WaitingForAcceptance.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/States/Player/WaitingForAcceptance.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/WaitingForAcceptance.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/States/Player/WaitingForAcceptance.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/WaitingForAcceptance.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/States/Player/WaitingForAcceptance.asset.meta diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/WaitingForOtherToCompleteInteraction.asset b/Project Undercover/Assets/Resources/ScriptableObjects/States/Player/WaitingForOtherToCompleteInteraction.asset similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/WaitingForOtherToCompleteInteraction.asset rename to Project Undercover/Assets/Resources/ScriptableObjects/States/Player/WaitingForOtherToCompleteInteraction.asset diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/WaitingForOtherToCompleteInteraction.asset.meta b/Project Undercover/Assets/Resources/ScriptableObjects/States/Player/WaitingForOtherToCompleteInteraction.asset.meta similarity index 100% rename from Project Undercover/Assets/Scripts/CharacterStateMachine/ScriptableObjects/States/Player/WaitingForOtherToCompleteInteraction.asset.meta rename to Project Undercover/Assets/Resources/ScriptableObjects/States/Player/WaitingForOtherToCompleteInteraction.asset.meta diff --git a/Project Undercover/Assets/Resources/Spy.prefab b/Project Undercover/Assets/Resources/Spy.prefab index 195dd5a..225d4bf 100644 --- a/Project Undercover/Assets/Resources/Spy.prefab +++ b/Project Undercover/Assets/Resources/Spy.prefab @@ -2151,11 +2151,13 @@ MonoBehaviour: m_EditorClassIdentifier: _queuedInteractorId: -1 _isInteracting: 0 - interactions: [] + interactions: + - {fileID: 11400000, guid: 01a3cf8545fc70f4c90095f144ac9b01, type: 2} spyInteractions: - {fileID: 11400000, guid: 218e2ddac8223e349a855bdae23819ab, type: 2} + GlowColor: {r: 0, g: 0, b: 1, a: 0} currentState: {fileID: 11400000, guid: 1c694dfd46dd4e44b94f7853724fa1c0, type: 2} - remainState: {fileID: 11400000, guid: 5eb84557ff3e09f42b843e0b09653774, type: 2} + remainState: {fileID: 0} navMeshAgent: {fileID: 0} animator: {fileID: 0} characterAnimator: {fileID: 0} diff --git a/Project Undercover/Assets/Scenes/NewCharactersTest.unity b/Project Undercover/Assets/Scenes/NewCharactersTest.unity index ade137c..f6ea0aa 100644 --- a/Project Undercover/Assets/Scenes/NewCharactersTest.unity +++ b/Project Undercover/Assets/Scenes/NewCharactersTest.unity @@ -176,6 +176,148 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 3938152} +--- !u!1 &99008743 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 99008744} + - component: {fileID: 99008746} + - component: {fileID: 99008745} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &99008744 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 99008743} + 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_Children: [] + m_Father: {fileID: 490755717} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -7.5, y: -0.5} + m_SizeDelta: {x: -35, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &99008745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 99008743} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Option A +--- !u!222 &99008746 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 99008743} +--- !u!1 &120123398 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 120123399} + - component: {fileID: 120123401} + - component: {fileID: 120123400} + m_Layer: 5 + m_Name: Item Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &120123399 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 120123398} + 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_Children: [] + m_Father: {fileID: 1743626538} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &120123400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 120123398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &120123401 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 120123398} --- !u!1 &231738595 GameObject: m_ObjectHideFlags: 0 @@ -246,6 +388,156 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 231738595} +--- !u!1 &266531235 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 266531236} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &266531236 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 266531235} + 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_Children: + - {fileID: 952152856} + m_Father: {fileID: 301807350} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &301807349 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 301807350} + - component: {fileID: 301807353} + - component: {fileID: 301807352} + - component: {fileID: 301807351} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &301807350 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 301807349} + 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_Children: + - {fileID: 266531236} + m_Father: {fileID: 347298536} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &301807351 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 301807349} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 952152857} + m_HandleRect: {fileID: 952152856} + m_Direction: 2 + m_Value: 0 + m_Size: 0.2 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &301807352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 301807349} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &301807353 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 301807349} --- !u!1 &311998260 GameObject: m_ObjectHideFlags: 0 @@ -272,14 +564,15 @@ RectTransform: 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_Children: [] + m_Children: + - {fileID: 490755717} m_Father: {fileID: 1617739640} m_RootOrder: 0 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: 200, y: 30} + m_SizeDelta: {x: 232.22, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &311998262 MonoBehaviour: @@ -307,19 +600,121 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: Press 'E' to Interact with NPC + m_Text: 'Press ''E'' to ' --- !u!222 &311998263 CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 311998260} +--- !u!1 &347298535 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 347298536} + - component: {fileID: 347298539} + - component: {fileID: 347298538} + - component: {fileID: 347298537} + m_Layer: 5 + m_Name: Template + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &347298536 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 347298535} + 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_Children: + - {fileID: 1891438712} + - {fileID: 301807350} + m_Father: {fileID: 490755717} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 0, y: 150} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &347298537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 347298535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 819293868} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1891438712} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 301807351} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &347298538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 347298535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &347298539 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 347298535} --- !u!1 &356728718 GameObject: m_ObjectHideFlags: 0 @@ -369,6 +764,314 @@ MonoBehaviour: progressText: {fileID: 2118539897} progressBar: {fileID: 3938152} mainPanel: {fileID: 231738595} +--- !u!1 &490755716 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 490755717} + - component: {fileID: 490755720} + - component: {fileID: 490755719} + - component: {fileID: 490755718} + m_Layer: 5 + m_Name: Dropdown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &490755717 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 490755716} + 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_Children: + - {fileID: 99008744} + - {fileID: 509433266} + - {fileID: 347298536} + m_Father: {fileID: 311998261} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -0.000015258789, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &490755718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 490755716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 853051423, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 490755719} + m_Template: {fileID: 347298536} + m_CaptionText: {fileID: 99008745} + m_CaptionImage: {fileID: 0} + m_ItemText: {fileID: 978170965} + m_ItemImage: {fileID: 0} + m_Value: 0 + m_Options: + m_Options: + - m_Text: Option A + m_Image: {fileID: 0} + - m_Text: Option B + m_Image: {fileID: 0} + - m_Text: Option C + m_Image: {fileID: 0} + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1437119778} + m_MethodName: SetSelectedInteraction + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Dropdown+DropdownEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &490755719 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 490755716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &490755720 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 490755716} +--- !u!1 &509433265 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 509433266} + - component: {fileID: 509433268} + - component: {fileID: 509433267} + m_Layer: 5 + m_Name: Arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &509433266 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 509433265} + 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_Children: [] + m_Father: {fileID: 490755717} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -15, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &509433267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 509433265} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &509433268 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 509433265} +--- !u!1 &526345897 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 526345898} + - component: {fileID: 526345900} + - component: {fileID: 526345899} + m_Layer: 5 + m_Name: Item Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &526345898 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 526345897} + 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_Children: [] + m_Father: {fileID: 1743626538} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &526345899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 526345897} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &526345900 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 526345897} +--- !u!1 &819293867 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 819293868} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &819293868 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 819293867} + 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_Children: + - {fileID: 1743626538} + m_Father: {fileID: 1891438712} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 28} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &948046785 GameObject: m_ObjectHideFlags: 0 @@ -438,6 +1141,148 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 948046785} +--- !u!1 &952152855 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 952152856} + - component: {fileID: 952152858} + - component: {fileID: 952152857} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &952152856 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 952152855} + 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_Children: [] + m_Father: {fileID: 266531236} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.2} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &952152857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 952152855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &952152858 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 952152855} +--- !u!1 &978170963 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 978170964} + - component: {fileID: 978170966} + - component: {fileID: 978170965} + m_Layer: 5 + m_Name: Item Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &978170964 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 978170963} + 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_Children: [] + m_Father: {fileID: 1743626538} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 5, y: -0.5} + m_SizeDelta: {x: -30, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &978170965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 978170963} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Option A +--- !u!222 &978170966 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 978170963} --- !u!1 &1130873136 GameObject: m_ObjectHideFlags: 0 @@ -503,6 +1348,80 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 133.04, y: -30, z: 0} +--- !u!1 &1169398161 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1169398162} + - component: {fileID: 1169398164} + - component: {fileID: 1169398163} + m_Layer: 5 + m_Name: RequestedInteractionText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1169398162 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1169398161} + 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_Children: [] + m_Father: {fileID: 1290216654} + m_RootOrder: 0 + 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: 232.22, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1169398163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1169398161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Press 'E' to Accept Interaction +--- !u!222 &1169398164 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1169398161} --- !u!1 &1285637234 GameObject: m_ObjectHideFlags: 0 @@ -565,6 +1484,75 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1290216653 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1290216654} + - component: {fileID: 1290216656} + - component: {fileID: 1290216655} + m_Layer: 5 + m_Name: RequestPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1290216654 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1290216653} + 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_Children: + - {fileID: 1169398162} + m_Father: {fileID: 1437119777} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -186.5} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1290216655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1290216653} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1290216656 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1290216653} --- !u!1 &1303335403 GameObject: m_ObjectHideFlags: 0 @@ -646,6 +1634,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1617739640} + - {fileID: 1290216654} m_Father: {fileID: 1711455460} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -667,6 +1656,11 @@ MonoBehaviour: m_EditorClassIdentifier: interactionText: {fileID: 311998262} mainPanel: {fileID: 1617739639} + interactionsDropdown: {fileID: 490755718} + interactionItemPrefab: {fileID: 1712754431308494, guid: d3817b0301d837042a84f22cbeba3abe, + type: 2} + requestPanel: {fileID: 1290216653} + requestedInteractionText: {fileID: 1169398163} --- !u!1 &1617739639 GameObject: m_ObjectHideFlags: 0 @@ -683,7 +1677,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1617739640 RectTransform: m_ObjectHideFlags: 0 @@ -837,6 +1831,88 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1743626537 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1743626538} + - component: {fileID: 1743626539} + m_Layer: 5 + m_Name: Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1743626538 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1743626537} + 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_Children: + - {fileID: 526345898} + - {fileID: 120123399} + - {fileID: 978170964} + m_Father: {fileID: 819293868} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1743626539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1743626537} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 526345899} + toggleTransition: 1 + graphic: {fileID: 120123400} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 1 --- !u!1 &1756076058 GameObject: m_ObjectHideFlags: 0 @@ -902,6 +1978,88 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1891438711 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1891438712} + - component: {fileID: 1891438715} + - component: {fileID: 1891438714} + - component: {fileID: 1891438713} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1891438712 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1891438711} + 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_Children: + - {fileID: 819293868} + m_Father: {fileID: 347298536} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -18, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1891438713 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1891438711} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1891438714 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1891438711} +--- !u!114 &1891438715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1891438711} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1001 &2060245567 Prefab: m_ObjectHideFlags: 0 @@ -956,9 +2114,55 @@ Prefab: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 114560588529924034, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: spotLight + value: + objectReference: {fileID: 2060245569} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c67fa24334c0f364cad8798522e92116, type: 2} m_IsPrefabParent: 0 +--- !u!1 &2060245568 stripped +GameObject: + m_PrefabParentObject: {fileID: 1889434021946074, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + m_PrefabInternal: {fileID: 2060245567} +--- !u!108 &2060245569 +Light: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2060245568} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 0 + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Intensity: 3 + m_Range: 10 + m_SpotAngle: 48.2 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 --- !u!1 &2107778200 GameObject: m_ObjectHideFlags: 0 diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs index 1a53285..c0a2dc1 100644 --- a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs +++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.AI; +using UnityEngine.EventSystems; [CreateAssetMenu(menuName = "CharacterStateMachine/Actions/IdleClick")] public class IdleClickAction : Action @@ -18,27 +19,32 @@ public class IdleClickAction : Action public override void Act(StateController controller) { - // Decline interactions here - if (Input.GetKeyDown(KeyCode.D)) - controller.Interactor = null; - - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); - if (Input.GetMouseButtonDown(0)) + if (Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject()) { - // Check first if the player clicked on a selectable object - SelectableObject selectableObject; - if (RaycastForSelectableObject(controller, ray, out selectableObject)) + if (controller.Interactor) { - // Debug.Log("Selected object set to " + selectableObject.name); - controller.SelectedObject = selectableObject; - return; + controller.Interactor = null; + InteractionPanelController.ActivePanel.Hide(); } + else + { + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + // Check first if the player clicked on a selectable object + SelectableObject selectableObject; + if (RaycastForSelectableObject(controller, ray, out selectableObject)) + { + controller.SelectedObject = selectableObject; + return; + } - // At this point, the player didn't click on a selectable object, - // so the player is probably issuing a move command. - controller.SelectedObject = null; - RaycastToMoveController(controller, ray); + // At this point, the player didn't click on a selectable object, + // so the player is probably issuing a move command. + controller.SelectedObject = null; + RaycastToMoveController(controller, ray); + } } + + // If the player has selected an object, move the player toward that object if (controller.SelectedObject && !controller.IsInteracting) controller.Destination = controller.SelectedObject.transform.position; } diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/PromptInteractionsAction.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/PromptInteractionsAction.cs index 5e400b9..55da369 100644 --- a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/PromptInteractionsAction.cs +++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/PromptInteractionsAction.cs @@ -7,24 +7,23 @@ public class PromptInteractionsAction : Action { public override void Act(StateController controller) { - string objectInteractionText = "Press 'E' to interact with "; if (ReceivedInteraction(controller)) { - InteractionPanelController.Reveal(controller.Interactor.name/* + " is trying to " + controller.Interactor.SelectedInteraction.interactionDescription*/); + InteractionPanelController.ActivePanel.AcceptInteractionReveal(controller); } else if (SelectedObjectAvailable(controller)) { - InteractionPanelController.Reveal(objectInteractionText + controller.SelectedObject.name); + InteractionPanelController.ActivePanel.SelectInteractionReveal(controller); } else { - InteractionPanelController.Hide(); + //InteractionPanelController.Hide(); } } public override void EndAct(StateController controller) { - InteractionPanelController.Hide(); + InteractionPanelController.ActivePanel.Hide(); } // Other controller is attempting to interact with this controller diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/WaitForInteractionAcceptance.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/WaitForInteractionAcceptance.cs index c88c455..633512f 100644 --- a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/WaitForInteractionAcceptance.cs +++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/WaitForInteractionAcceptance.cs @@ -5,8 +5,6 @@ public class WaitForInteractionAcceptance : Action { public override void StartAct(StateController controller) { - // Todo: Remove this line once the "interaction selector" UI is finished - controller.SelectedInteraction = GetFirstInteraction(controller); controller.InitiateInteractionWithSelectedObject(); ProgressPanelController.ActivePanel.Reveal(controller.SelectedInteraction.interactionDescription); } diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/CharacterAnimator.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/CharacterAnimator.cs index e3f7dc7..c050df0 100644 --- a/Project Undercover/Assets/Scripts/CharacterStateMachine/CharacterAnimator.cs +++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/CharacterAnimator.cs @@ -9,7 +9,7 @@ public class CharacterAnimator : Photon.PunBehaviour public enum Params { - MoveSpeed = 0, PassingMessage, Interrupted + Idle, MoveSpeed, PassingMessage, Interrupted, Wave } protected virtual void Awake() diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/DecisionScripts/InitiatedInteractionDecision.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/DecisionScripts/InitiatedInteractionDecision.cs index 128b1a6..b7be89e 100644 --- a/Project Undercover/Assets/Scripts/CharacterStateMachine/DecisionScripts/InitiatedInteractionDecision.cs +++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/DecisionScripts/InitiatedInteractionDecision.cs @@ -9,6 +9,7 @@ public class InitiatedInteractionDecision : Decision { return Input.GetKeyDown(KeyCode.E) && InteractionPanelController.InteractionPrompted() && - controller.SelectedObject != null; + controller.SelectedObject != null && + controller.SelectedInteraction != null; } } \ No newline at end of file diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/DecisionScripts/WaitForTransitionDecision.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/DecisionScripts/WaitForTransitionDecision.cs index adb3a02..8c1f209 100644 --- a/Project Undercover/Assets/Scripts/CharacterStateMachine/DecisionScripts/WaitForTransitionDecision.cs +++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/DecisionScripts/WaitForTransitionDecision.cs @@ -5,10 +5,10 @@ using UnityEngine; [CreateAssetMenu(menuName = "CharacterStateMachine/Decisions/WaitForTransition")] public class WaitForTransitionDecision : Decision { - public string fromState, toState; - public override bool Decide(StateController controller) { + string fromState = CharacterAnimator.GetParamName(controller.SelectedInteraction.characterInteraction); + string toState = CharacterAnimator.GetParamName(CharacterAnimator.Params.Idle); string transitionName = fromState + " -> " + toState; var currentTransition = controller.animator.GetAnimatorTransitionInfo(0); if (currentTransition.IsName(transitionName)) diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/Interfaces/Interaction.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/Interfaces/Interaction.cs index 6815f8e..2ee5964 100644 --- a/Project Undercover/Assets/Scripts/CharacterStateMachine/Interfaces/Interaction.cs +++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/Interfaces/Interaction.cs @@ -4,7 +4,10 @@ public class Interaction : ScriptableObject { // Animation performed by the character + [Tooltip("Descriptions follow the prompt \"Press 'E' to ...\"")] public string interactionDescription; + [Tooltip("Descriptions follow the prompt \"Press 'E' to ...\"")] + public string receiverDescription; public CharacterAnimator.Params characterInteraction; public InteractionResult result; public float initialRotation; @@ -16,6 +19,11 @@ public class Interaction : ScriptableObject Nothing, SpyMissionComplete } + public override int GetHashCode() + { + return interactionDescription.GetHashCode() ^ (int)characterInteraction; + } + public void ExecuteResult(StateController controller) { switch(result) diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/Interfaces/SelectableObject.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/Interfaces/SelectableObject.cs index fc08303..b215f5d 100644 --- a/Project Undercover/Assets/Scripts/CharacterStateMachine/Interfaces/SelectableObject.cs +++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/Interfaces/SelectableObject.cs @@ -17,33 +17,37 @@ public abstract class SelectableObject : Photon.PunBehaviour, IEquatable _materials = new List(); + private Color _currentColor; + private bool isSpy; + + public Renderer[] Renderers { + get; + private set; } - public virtual void Deselected() + public Color CurrentColor { + get { return _currentColor; } } - public virtual void Update() + public bool IsInteracting { - if (Interactor != null) + get { - AcceptInteraction(); + return _isInteracting; + } + set + { + photonView.RPC("SetIsInteractingRPC", PhotonTargets.All, value); } } - public bool HasInteractions() - { - return (interactions.Length + spyInteractions.Length) > 0; - } - - public virtual string GetInteractionTitle() - { - return ""; - } - - // Manages other StateControllers signalling this controller for an interaction public StateController Interactor { get @@ -68,6 +72,83 @@ public abstract class SelectableObject : Photon.PunBehaviour, IEquatable(); + AvailableColor = Color.green; + InteractingColor = Color.yellow; + foreach (var renderer in Renderers) + { + _materials.AddRange(renderer.materials); + } + } + + public Color TargetColor + { + get + { + if (isMousedOver) + { + if (Interactor) + return InteractingColor; + else + return AvailableColor; + } + else + { + Color color = Color.black; + color.a = 0.0f; + return color; + } + } + } + + protected virtual void Update() + { + _currentColor = Color.Lerp(_currentColor, TargetColor, Time.deltaTime * LerpFactor); + + for (int i = 0; i < _materials.Count; i++) + { + _materials[i].SetColor("_GlowColor", _currentColor); + } + + if (Interactor != null && !isSpy) + AcceptInteraction(); + } + + private void OnMouseEnter() + { + if (!isSpy) + isMousedOver = true; + else if (!photonView.isMine) + isMousedOver = true; + + } + + private void OnMouseExit() + { + isMousedOver = false; + } + + public virtual void Selected() + { + } + + public virtual void Deselected() + { + } + + public bool HasInteractions() + { + return (interactions.Length + spyInteractions.Length) > 0; + } + + public virtual string GetInteractionTitle() + { + return ""; + } + public void AcceptInteraction() { IsInteracting = true; @@ -78,17 +159,6 @@ public abstract class SelectableObject : Photon.PunBehaviour, IEquatable(); } - public void Start() + protected override void Start() { + base.Start(); if (photonView.isMine) currentState.DoStartActions(this); } - public override void Update() + protected override void Update() { + base.Update(); if (photonView.isMine) { currentState.UpdateState(this); @@ -108,7 +110,9 @@ public class StateController : SelectableObject set { if (_selectedObject != null) + { _selectedObject.Deselected(); + } _selectedObject = value; if (_selectedObject != null) { @@ -156,7 +160,10 @@ public class StateController : SelectableObject if (SelectedObject) { if (SelectedObject.IsInteracting) + { SelectedObject.IsInteracting = false; + } + SelectedObject.Interactor = null; SelectedObject = null; } } @@ -169,10 +176,28 @@ public class StateController : SelectableObject } set { - _selectedInteraction = value; + int hash = 0; + if (value != null) + hash = value.GetHashCode(); + photonView.RPC("SetSelectedInteractionRPC", PhotonTargets.All, hash); } } + [PunRPC] + private void SetSelectedInteractionRPC(int hash) + { + Interaction[] foundInteractions = (Interaction[])Resources.FindObjectsOfTypeAll(typeof(Interaction)); + foreach (var interaction in foundInteractions) + { + if (interaction.GetHashCode() == hash) + { + _selectedInteraction = interaction; + return; + } + } + _selectedInteraction = null; + } + public void StartRoaming() { _roamCoroutine = StartCoroutine(Roam()); @@ -203,7 +228,7 @@ public class StateController : SelectableObject public void FaceInteractor() { if (Interactor == null) - Debug.LogError("Cannot face a null Interactor"); + return; float progress = Interactor.animator.GetCurrentAnimatorStateInfo(0).normalizedTime; Vector3 otherPos = Interactor.transform.position; @@ -225,11 +250,11 @@ public class StateController : SelectableObject if (progress < _startInteractionProgressLimit) { Quaternion adjustedRotation = facingRotation * Quaternion.Euler(0, initialRotation, 0); - transform.rotation = Quaternion.Slerp(transform.rotation, adjustedRotation, Time.deltaTime * 5.0f); + transform.rotation = Quaternion.Slerp(transform.rotation, adjustedRotation, Time.deltaTime * 10.0f); } else { - transform.rotation = Quaternion.Slerp(transform.rotation, facingRotation, Time.deltaTime * 5.0f); + transform.rotation = Quaternion.Slerp(transform.rotation, facingRotation, Time.deltaTime * 10.0f); } } } diff --git a/Project Undercover/Assets/Scripts/Glow/GlowObject.cs b/Project Undercover/Assets/Scripts/Glow/GlowObject.cs index 6e0b58c..d7d144f 100644 --- a/Project Undercover/Assets/Scripts/Glow/GlowObject.cs +++ b/Project Undercover/Assets/Scripts/Glow/GlowObject.cs @@ -17,11 +17,11 @@ public class GlowObject : MonoBehaviour get { return _currentColor; } } - private List _materials = new List(); - private Color _currentColor; - private Color _targetColor; + private List _materials = new List(); + private Color _currentColor; + private Color _targetColor; - void Start() + protected virtual void Start() { Renderers = GetComponentsInChildren(); @@ -31,23 +31,23 @@ public class GlowObject : MonoBehaviour } } - private void OnMouseEnter() + protected void OnMouseEnter() { _targetColor = GlowColor; enabled = true; } - private void OnMouseExit() + protected void OnMouseExit() { _targetColor = Color.black; _targetColor.a = 0.0f; enabled = true; } - /// - /// Loop over all cached materials and update their color, disable self if we reach our target color. - /// - private void Update() + /// + /// Loop over all cached materials and update their color, disable self if we reach our target color. + /// + protected void Update() { _currentColor = Color.Lerp(_currentColor, _targetColor, Time.deltaTime * LerpFactor); diff --git a/Project Undercover/Assets/Scripts/Guard/GuardCamera.cs b/Project Undercover/Assets/Scripts/Guard/GuardCamera.cs index e7f37ae..98c75e1 100644 --- a/Project Undercover/Assets/Scripts/Guard/GuardCamera.cs +++ b/Project Undercover/Assets/Scripts/Guard/GuardCamera.cs @@ -6,8 +6,7 @@ public class GuardCamera : Photon.PunBehaviour { public float xRotation = 0.0f; public float yRotation = 0.0f; - public bool laserSightEnabled = false; - private GameObject line; + public Light spotLight; void Start () { xRotation = transform.eulerAngles.y; @@ -18,22 +17,6 @@ public class GuardCamera : Photon.PunBehaviour { Quaternion newRotation = Quaternion.AngleAxis(xRotation, Vector3.up); newRotation *= Quaternion.AngleAxis(-yRotation, -Vector3.right); transform.localRotation = Quaternion.Slerp(transform.rotation, newRotation, Time.time * 0.01f); - - if (laserSightEnabled) - { - if (line == null) - line = LineDrawer.MakeLine(); - RaycastHit hit; - if (Physics.Raycast(transform.position, transform.forward, out hit)) - LineDrawer.DrawLine(line, transform.position, hit.point); - else - LineDrawer.DrawLine(line, transform.position, transform.position + transform.forward * 20.0f); - } - else - { - if (line != null) - Destroy(line); - } } public void UpdateRotation() @@ -51,6 +34,6 @@ public class GuardCamera : Photon.PunBehaviour { [PunRPC] void SetEnabledRPC(bool enabled) { - laserSightEnabled = enabled; + spotLight.enabled = enabled; } } diff --git a/Project Undercover/Assets/Scripts/Lobby/GameManager.cs b/Project Undercover/Assets/Scripts/Lobby/GameManager.cs index 1200bdb..83aa37a 100644 --- a/Project Undercover/Assets/Scripts/Lobby/GameManager.cs +++ b/Project Undercover/Assets/Scripts/Lobby/GameManager.cs @@ -52,7 +52,7 @@ public class GameManager : Photon.PunBehaviour { } else { - guardCamera.GetComponent().laserSightEnabled = true; + guardCamera.GetComponent().spotLight.enabled = true; Vector3 randPos = StateController.GetRandomLocation(); var spy = PhotonNetwork.Instantiate(spyPrefab.name, randPos, Quaternion.identity, 0); diff --git a/Project Undercover/Assets/Scripts/UI/InteractionItemController.cs b/Project Undercover/Assets/Scripts/UI/InteractionItemController.cs new file mode 100644 index 0000000..d088669 --- /dev/null +++ b/Project Undercover/Assets/Scripts/UI/InteractionItemController.cs @@ -0,0 +1,23 @@ +using UnityEngine; +using UnityEngine.UI; + + + +class InteractionItemController : MonoBehaviour +{ + [SerializeField] + private Text label; + [SerializeField] + private Image background; + + public void SetLabelText(string text) + { + label.text = text; + } + + public void SetSpyColor() + { + background.color = Color.yellow; + } +} + diff --git a/Project Undercover/Assets/Scripts/UI/InteractionItemController.cs.meta b/Project Undercover/Assets/Scripts/UI/InteractionItemController.cs.meta new file mode 100644 index 0000000..20601ba --- /dev/null +++ b/Project Undercover/Assets/Scripts/UI/InteractionItemController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a504f94575329234aa42f32c65d42f3e +timeCreated: 1507513336 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Project Undercover/Assets/Scripts/UI/InteractionPanelController.cs b/Project Undercover/Assets/Scripts/UI/InteractionPanelController.cs index ab5151c..0a4c1d3 100644 --- a/Project Undercover/Assets/Scripts/UI/InteractionPanelController.cs +++ b/Project Undercover/Assets/Scripts/UI/InteractionPanelController.cs @@ -5,25 +5,83 @@ using UnityEngine.UI; public class InteractionPanelController : MonoBehaviour { - public Text interactionText; - public GameObject mainPanel; + [SerializeField] + private Text interactionText; + [SerializeField] + private GameObject mainPanel; + [SerializeField] + private Dropdown interactionsDropdown; + [SerializeField] + private GameObject interactionItemPrefab; + [SerializeField] + private GameObject requestPanel; + [SerializeField] + private Text requestedInteractionText; private static InteractionPanelController activePanel; + private List optionsList; + private StateController _controller; + + public class InteractionData : Dropdown.OptionData + { + public Interaction interaction; + public bool isSpyInteraction; + public InteractionData(Interaction interaction, bool isSpyInteraction) + { + this.interaction = interaction; + this.isSpyInteraction = isSpyInteraction; + text = interaction.interactionDescription; + if (isSpyInteraction) + text = text + " (Spy)"; + } + } void Start() { ActivePanel = this; + optionsList = new List(); Hide(); } - public static void Reveal(string interactionText) + public void SelectInteractionReveal(StateController controller) { - ActivePanel.interactionText.text = interactionText; + _controller = controller; + if (mainPanel.activeInHierarchy) + return; + interactionsDropdown.ClearOptions(); + var optionsList = new List(); + foreach (Interaction interaction in controller.SelectedObject.interactions) + { + var data = new InteractionData(interaction, false); + optionsList.Add(data); + } + foreach (Interaction interaction in controller.SelectedObject.spyInteractions) + { + var data = new InteractionData(interaction, true); + optionsList.Add(data); + } + interactionsDropdown.AddOptions(optionsList); + _controller.SelectedInteraction = ((InteractionData)(interactionsDropdown.options[interactionsDropdown.value])).interaction; ActivePanel.mainPanel.SetActive(true); } - public static void Hide() + public void SetSelectedInteraction() { - ActivePanel.mainPanel.SetActive(false); + _controller.SelectedInteraction = ((InteractionData)(interactionsDropdown.options[interactionsDropdown.value])).interaction; + } + + public void AcceptInteractionReveal(StateController controller) + { + _controller = controller; + requestPanel.SetActive(true); + string description = controller.Interactor.SelectedInteraction.receiverDescription; + requestedInteractionText.GetComponent().text = "Press 'E' to " + description; //+ "\n(or press 'D' to decline)"; + } + + public void Hide() + { + mainPanel.SetActive(false); + requestPanel.SetActive(false); + interactionsDropdown.Hide(); } public static InteractionPanelController ActivePanel