init commit

Project Undercover/Assets/Materials/Statue.mat

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Statue
+  m_Shader: {fileID: 4800000, guid: 138071fa1e289e345881d6208d5c5573, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Project Undercover/Assets/Materials/Statue.mat.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 36f8514d2d781234ba875e9155399049
+timeCreated: 1509474085
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Project Undercover/Assets/Scenes/Player-Object-Interactions.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: e496172999d202948be110cc90eba6e2
+folderAsset: yes
+timeCreated: 1509473891
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Project Undercover/Assets/Scenes/Player-Object-Interactions.unity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f1d38ea6f4a30c14e826037e86106cfb
+timeCreated: 1509473003
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Project Undercover/Assets/Scenes/Player-Object-Interactions/NavMesh.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 3b44e343791674a4692df18a304a5e9d
+timeCreated: 1509473920
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/HighlightInteractableAction.cs

@@ -1,16 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class HighlightInteractableAction : MonoBehaviour {
-
-	// Use this for initialization
-	void Start () {
-		
-	}
-	
-	// Update is called once per frame
-	void Update () {
-		
-	}
-}

Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/HighlightInteractableAction.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 9fbeeedae6595654db10065b82213fc0
-timeCreated: 1506994655
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs

@@ -58,6 +58,7 @@ public class IdleClickAction : Action
         RaycastHit hit;
         if (Physics.Raycast(ray, out hit, 100.0f, mask))
         {
+            Debug.Log("Found SelectableObject");
             SelectableObject selectable = hit.collider.gameObject.GetComponentInParent<SelectableObject>();
             if (selectable != null && selectable != controller && selectable.HasInteractions())
             {

Project Undercover/Assets/Scripts/CharacterStateMachine/Interfaces/SelectableObject.cs

@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public abstract class SelectableObject : Photon.PunBehaviour, IEquatable<SelectableObject>
+public class SelectableObject : Photon.PunBehaviour, IEquatable<SelectableObject>
 {
     // PhotonView Id of interacting character
     [SerializeField]

Project Undercover/Assets/Scripts/Lobby/GameManager.cs

@@ -60,7 +60,7 @@ public class GameManager : Photon.PunBehaviour {
             cameraRig.GetComponentInChildren<ThirdPersonCameraController>().SetTarget(spy.transform);
             //spyPanel.SetActive(true);
         }
-        
+        /*
         if (PhotonNetwork.isMasterClient)
         {
 			for (int i = 0; i < numNpcs; i++)
@@ -68,7 +68,7 @@ public class GameManager : Photon.PunBehaviour {
                 Vector3 randPos = StateController.GetRandomLocation();
 				PhotonNetwork.Instantiate(NPCPrefab.name, randPos, Quaternion.identity, 0);
             }
-        }
+        }*/
     }
 
     [PunRPC]

Project Undercover/Assets/Scripts/Lobby/LobbyManager.cs

@@ -38,7 +38,7 @@ public class LobbyManager : Photon.PunBehaviour {
     public void StartGame()
     {
         if (PhotonNetwork.isMasterClient)
-            PhotonNetwork.LoadLevel("NewCharactersTest");
+            PhotonNetwork.LoadLevel("Player-Object-Interactions");
     }
 
     public override void OnPhotonPlayerConnected(PhotonPlayer other)

Project Undercover/ProjectSettings/EditorBuildSettings.asset

@@ -18,5 +18,8 @@ EditorBuildSettings:
     path: Assets/Scenes/NewCharactersTest.unity
     guid: 89e17cc55d8d66942862d86930906b5f
   - enabled: 0
-    path: Assets/Scenes/GuardCameraTest.unity
+    path: 
     guid: e6ffeb27a9cb4a244bc7c814c7346df2
+  - enabled: 1
+    path: Assets/Scenes/Player-Object-Interactions.unity
+    guid: f1d38ea6f4a30c14e826037e86106cfb