Skip to content

Commit

Permalink
Fixes card4 navmesh again
Browse files Browse the repository at this point in the history
  • Loading branch information
thewithz committed Nov 4, 2020
1 parent 752d1f8 commit 11c81c5
Show file tree
Hide file tree
Showing 15 changed files with 10 additions and 41 deletions.
7 changes: 4 additions & 3 deletions OdysseyNow/Assets/ModeDirector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ private void Awake() {
case "Cat and Mouse":
// load cat and mouse after calibration
calibration.GetComponent<CalibrationDirectorNew>().afterCalibration.AddListener(StartCatAndMouse);
AI.transform.Find("CatAndMouse").gameObject.SetActive(true);
break;
case "Super Cat and Mouse":
calibration.GetComponent<CalibrationDirectorNew>().afterCalibration.AddListener(StartSuperCatAndMouse);
AI.transform.Find("SCAM-Stonehenge").gameObject.SetActive(true);
break;
case "Haunted House":
break;
Expand All @@ -32,9 +34,8 @@ private void Awake() {
var p2Input = (LocalInputManager.ControlScheme) System.Enum.Parse(typeof(LocalInputManager.ControlScheme),
PlayerPrefs.GetString("P2Input"));
// if both input schemes are keyboard, then no need for overlay
if ((p1Input == LocalInputManager.ControlScheme.Keyboard &&
p2Input == LocalInputManager.ControlScheme.Keyboard) ||
(p1Input == LocalInputManager.ControlScheme.AI && p2Input == LocalInputManager.ControlScheme.AI))
if ((p1Input == LocalInputManager.ControlScheme.Keyboard || p1Input == LocalInputManager.ControlScheme.AI) &&
(p2Input == LocalInputManager.ControlScheme.Keyboard || p2Input == LocalInputManager.ControlScheme.AI))
calibration.GetComponent<CalibrationOdysseySettings>().useOverlay = false;
else
calibration.GetComponent<CalibrationOdysseySettings>().useOverlay = true;
Expand Down
Binary file not shown.
8 changes: 0 additions & 8 deletions OdysseyNow/Assets/Scenes/Card1/NavMesh-P1NavMesh.asset.meta

This file was deleted.

10 changes: 5 additions & 5 deletions OdysseyNow/Assets/Scenes/Card4.unity
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ GameObject:
- component: {fileID: 93647768}
- component: {fileID: 93647769}
m_Layer: 0
m_Name: AI-SuperCatAndMouseStonehenge
m_Name: SCAM-Stonehenge
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -6467,7 +6467,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1354274593
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -7947,7 +7947,7 @@ GameObject:
- component: {fileID: 1405386638}
- component: {fileID: 1405386639}
m_Layer: 0
m_Name: AI-CatAndMouse
m_Name: CatAndMouse
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -33061,7 +33061,7 @@ MonoBehaviour:
m_OverrideVoxelSize: 0
m_VoxelSize: 0.016666668
m_BuildHeightMesh: 0
m_NavMeshData: {fileID: 23800000, guid: 0b3a1d0272060e04fbbacabcd21141e1, type: 2}
m_NavMeshData: {fileID: 23800000, guid: d417c732518afab4e9956bdcec3a9b7d, type: 2}
--- !u!850595691 &2024151680
LightingSettings:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -33635,7 +33635,7 @@ MonoBehaviour:
m_OverrideVoxelSize: 0
m_VoxelSize: 0.016666668
m_BuildHeightMesh: 0
m_NavMeshData: {fileID: 23800000, guid: 808909ec7f6693b40a289020769e0c72, type: 2}
m_NavMeshData: {fileID: 23800000, guid: cd50da1caa3ec4f4eb641a9ff3216653, type: 2}
--- !u!1 &2127914509
GameObject:
m_ObjectHideFlags: 0
Expand Down
8 changes: 0 additions & 8 deletions OdysseyNow/Assets/Scenes/Card4/NavMesh-CatNavMesh.asset.meta

This file was deleted.

Binary file not shown.
8 changes: 0 additions & 8 deletions OdysseyNow/Assets/Scenes/Card4/NavMesh-NavMesh 1.asset.meta

This file was deleted.

Binary file removed OdysseyNow/Assets/Scenes/Card4/NavMesh-NavMesh.asset
Binary file not shown.
Binary file removed OdysseyNow/Assets/Scenes/Card4/NavMesh.asset
Binary file not shown.
8 changes: 0 additions & 8 deletions OdysseyNow/Assets/Scenes/Card4/NavMesh.asset.meta

This file was deleted.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 11c81c5

Please sign in to comment.