ada/project-undercover
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed extraneous debug statements

Browse source
This commit is contained in:
Steven 2017-10-05 13:53:29 -05:00
parent a3658418a2
commit 6a72fda395
8 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Project Undercover/Assets/Resources/NPC.prefab
View file

@ -2150,6 +2150,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eaa73f69e18e25947894aebb6dc9932f, type: 3}
m_Name:
m_EditorClassIdentifier:
_queuedInteractorId: -1
_isInteracting: 0
interactions:
- {fileID: 11400000, guid: 218e2ddac8223e349a855bdae23819ab, type: 2}
spyInteractions: []
@ -2228,9 +2230,9 @@ MonoBehaviour:
DrawErrorGizmo: 1
m_RotationModel:
SynchronizeEnabled: 1
InterpolateOption: 1
InterpolateRotateTowardsSpeed: 180
InterpolateLerpSpeed: 5
InterpolateOption: 2
InterpolateRotateTowardsSpeed: 300
InterpolateLerpSpeed: 15
m_ScaleModel:
SynchronizeEnabled: 0
InterpolateOption: 0

8
Project Undercover/Assets/Resources/Spy.prefab
View file

@ -2149,6 +2149,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eaa73f69e18e25947894aebb6dc9932f, type: 3}
m_Name:
m_EditorClassIdentifier:
_queuedInteractorId: -1
_isInteracting: 0
interactions: []
spyInteractions: []
currentState: {fileID: 11400000, guid: 1c694dfd46dd4e44b94f7853724fa1c0, type: 2}
@ -2213,9 +2215,9 @@ MonoBehaviour:
DrawErrorGizmo: 1
m_RotationModel:
SynchronizeEnabled: 1
InterpolateOption: 1
InterpolateRotateTowardsSpeed: 180
InterpolateLerpSpeed: 5
InterpolateOption: 2
InterpolateRotateTowardsSpeed: 300
InterpolateLerpSpeed: 15
m_ScaleModel:
SynchronizeEnabled: 0
InterpolateOption: 0

3
Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs
View file

@ -23,7 +23,7 @@ public class IdleClickAction : Action
SelectableObject selectableObject;
if (RaycastForSelectableObject(controller, ray, out selectableObject))
{
Debug.Log("Selected object set to " + selectableObject.name);
// Debug.Log("Selected object set to " + selectableObject.name);
controller.SelectedObject = selectableObject;
controller.Destination = selectableObject.gameObject.transform.position;
return;
@ -32,7 +32,6 @@ public class IdleClickAction : Action
// At this point, the player didn't click on a selectable object,
// so the player is probably issuing a move command.
controller.SelectedObject = null;
Debug.Log("Moving Spy");
RaycastToMoveController(controller, ray);
}
}

6
Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/RoamAction.cs
View file

@ -7,7 +7,7 @@ public class RoamAction : Action
{
public override void StartAct(StateController controller)
{
Debug.Log("Started Roaming");
// Debug.Log("Started Roaming");
controller.StartRoaming();
}
@ -15,14 +15,14 @@ public class RoamAction : Action
{
if (controller.Interactor != null && !controller.IsInteracting)
{
Debug.Log("Accepting incomming interaction!");
// Debug.Log("Accepting incomming interaction!");
controller.AcceptInteraction();
}
}
public override void EndAct(StateController controller)
{
Debug.Log("Stopping coroutine");
// Debug.Log("Stopping coroutine");
controller.StopRoaming();
}
}

9
Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/SpyInteractAction.cs
View file

@ -13,13 +13,16 @@ public class SpyInteractAction : Action
public override void Act(StateController controller)
{
AnimatorStateInfo info = controller.animator.GetCurrentAnimatorStateInfo(0);
float progress = info.normalizedTime;
ProgressPanelController.ActivePanel.Progress = progress;
if (info.IsName(CharacterAnimator.GetParamName(controller.SelectedInteraction.characterInteraction)))
{
float progress = info.normalizedTime;
ProgressPanelController.ActivePanel.Progress = progress;
}
}
public override void EndAct(StateController controller)
{
Debug.Log("Ending SpyInteract");
// Debug.Log("Ending SpyInteract");
ProgressPanelController.ActivePanel.Hide();
controller.FinishInteraction();
}

4
Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/WaitInPlaceAction.cs
View file

@ -7,14 +7,14 @@ public class WaitInPlaceAction : Action {
public override void StartAct(StateController controller)
{
Debug.Log("Waiting in place!");
// Debug.Log("Waiting in place!");
controller.FaceInteractor();
controller.Destination = controller.transform.position;
}
public override void EndAct(StateController controller)
{
Debug.Log("Done waiting in place!");
// Debug.Log("Done waiting in place!");
}
}

4
Project Undercover/Assets/Scripts/CharacterStateMachine/StateController.cs
View file

@ -94,7 +94,7 @@ public class StateController : SelectableObject
if (SelectedObject.IsInteracting)
Debug.Log(SelectedObject.name + " is busy and cannot interact with " + name);
Debug.Log("Sending interaction request...");
// Debug.Log("Sending interaction request...");
IsInteracting = true;
SelectedObject.Interactor = this;
}
@ -113,7 +113,7 @@ public class StateController : SelectableObject
if (_selectedObject != null)
{
_selectedObject.Selected();
navMeshAgent.stoppingDistance = INTERACT_RANGE;
navMeshAgent.stoppingDistance = INTERACT_RANGE * 0.8f;
}
else
{

3
Project Undercover/Assets/Scripts/UI/ProgressPanelController.cs
View file

@ -54,7 +54,8 @@ public class ProgressPanelController : MonoBehaviour {
}
public static ProgressPanelController ActivePanel {
public static ProgressPanelController ActivePanel
{
get
{
if (activePanel)