removed extraneous debug statements
This commit is contained in:
parent
a3658418a2
commit
6a72fda395
8 changed files with 26 additions and 19 deletions
|
@ -2150,6 +2150,8 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: eaa73f69e18e25947894aebb6dc9932f, type: 3}
|
m_Script: {fileID: 11500000, guid: eaa73f69e18e25947894aebb6dc9932f, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
_queuedInteractorId: -1
|
||||||
|
_isInteracting: 0
|
||||||
interactions:
|
interactions:
|
||||||
- {fileID: 11400000, guid: 218e2ddac8223e349a855bdae23819ab, type: 2}
|
- {fileID: 11400000, guid: 218e2ddac8223e349a855bdae23819ab, type: 2}
|
||||||
spyInteractions: []
|
spyInteractions: []
|
||||||
|
@ -2228,9 +2230,9 @@ MonoBehaviour:
|
||||||
DrawErrorGizmo: 1
|
DrawErrorGizmo: 1
|
||||||
m_RotationModel:
|
m_RotationModel:
|
||||||
SynchronizeEnabled: 1
|
SynchronizeEnabled: 1
|
||||||
InterpolateOption: 1
|
InterpolateOption: 2
|
||||||
InterpolateRotateTowardsSpeed: 180
|
InterpolateRotateTowardsSpeed: 300
|
||||||
InterpolateLerpSpeed: 5
|
InterpolateLerpSpeed: 15
|
||||||
m_ScaleModel:
|
m_ScaleModel:
|
||||||
SynchronizeEnabled: 0
|
SynchronizeEnabled: 0
|
||||||
InterpolateOption: 0
|
InterpolateOption: 0
|
||||||
|
|
|
@ -2149,6 +2149,8 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: eaa73f69e18e25947894aebb6dc9932f, type: 3}
|
m_Script: {fileID: 11500000, guid: eaa73f69e18e25947894aebb6dc9932f, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
_queuedInteractorId: -1
|
||||||
|
_isInteracting: 0
|
||||||
interactions: []
|
interactions: []
|
||||||
spyInteractions: []
|
spyInteractions: []
|
||||||
currentState: {fileID: 11400000, guid: 1c694dfd46dd4e44b94f7853724fa1c0, type: 2}
|
currentState: {fileID: 11400000, guid: 1c694dfd46dd4e44b94f7853724fa1c0, type: 2}
|
||||||
|
@ -2213,9 +2215,9 @@ MonoBehaviour:
|
||||||
DrawErrorGizmo: 1
|
DrawErrorGizmo: 1
|
||||||
m_RotationModel:
|
m_RotationModel:
|
||||||
SynchronizeEnabled: 1
|
SynchronizeEnabled: 1
|
||||||
InterpolateOption: 1
|
InterpolateOption: 2
|
||||||
InterpolateRotateTowardsSpeed: 180
|
InterpolateRotateTowardsSpeed: 300
|
||||||
InterpolateLerpSpeed: 5
|
InterpolateLerpSpeed: 15
|
||||||
m_ScaleModel:
|
m_ScaleModel:
|
||||||
SynchronizeEnabled: 0
|
SynchronizeEnabled: 0
|
||||||
InterpolateOption: 0
|
InterpolateOption: 0
|
||||||
|
|
|
@ -23,7 +23,7 @@ public class IdleClickAction : Action
|
||||||
SelectableObject selectableObject;
|
SelectableObject selectableObject;
|
||||||
if (RaycastForSelectableObject(controller, ray, out 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.SelectedObject = selectableObject;
|
||||||
controller.Destination = selectableObject.gameObject.transform.position;
|
controller.Destination = selectableObject.gameObject.transform.position;
|
||||||
return;
|
return;
|
||||||
|
@ -32,7 +32,6 @@ public class IdleClickAction : Action
|
||||||
// At this point, the player didn't click on a selectable object,
|
// At this point, the player didn't click on a selectable object,
|
||||||
// so the player is probably issuing a move command.
|
// so the player is probably issuing a move command.
|
||||||
controller.SelectedObject = null;
|
controller.SelectedObject = null;
|
||||||
Debug.Log("Moving Spy");
|
|
||||||
RaycastToMoveController(controller, ray);
|
RaycastToMoveController(controller, ray);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ public class RoamAction : Action
|
||||||
{
|
{
|
||||||
public override void StartAct(StateController controller)
|
public override void StartAct(StateController controller)
|
||||||
{
|
{
|
||||||
Debug.Log("Started Roaming");
|
// Debug.Log("Started Roaming");
|
||||||
controller.StartRoaming();
|
controller.StartRoaming();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,14 +15,14 @@ public class RoamAction : Action
|
||||||
{
|
{
|
||||||
if (controller.Interactor != null && !controller.IsInteracting)
|
if (controller.Interactor != null && !controller.IsInteracting)
|
||||||
{
|
{
|
||||||
Debug.Log("Accepting incomming interaction!");
|
// Debug.Log("Accepting incomming interaction!");
|
||||||
controller.AcceptInteraction();
|
controller.AcceptInteraction();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void EndAct(StateController controller)
|
public override void EndAct(StateController controller)
|
||||||
{
|
{
|
||||||
Debug.Log("Stopping coroutine");
|
// Debug.Log("Stopping coroutine");
|
||||||
controller.StopRoaming();
|
controller.StopRoaming();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,13 +13,16 @@ public class SpyInteractAction : Action
|
||||||
public override void Act(StateController controller)
|
public override void Act(StateController controller)
|
||||||
{
|
{
|
||||||
AnimatorStateInfo info = controller.animator.GetCurrentAnimatorStateInfo(0);
|
AnimatorStateInfo info = controller.animator.GetCurrentAnimatorStateInfo(0);
|
||||||
float progress = info.normalizedTime;
|
if (info.IsName(CharacterAnimator.GetParamName(controller.SelectedInteraction.characterInteraction)))
|
||||||
ProgressPanelController.ActivePanel.Progress = progress;
|
{
|
||||||
|
float progress = info.normalizedTime;
|
||||||
|
ProgressPanelController.ActivePanel.Progress = progress;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void EndAct(StateController controller)
|
public override void EndAct(StateController controller)
|
||||||
{
|
{
|
||||||
Debug.Log("Ending SpyInteract");
|
// Debug.Log("Ending SpyInteract");
|
||||||
ProgressPanelController.ActivePanel.Hide();
|
ProgressPanelController.ActivePanel.Hide();
|
||||||
controller.FinishInteraction();
|
controller.FinishInteraction();
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,14 +7,14 @@ public class WaitInPlaceAction : Action {
|
||||||
|
|
||||||
public override void StartAct(StateController controller)
|
public override void StartAct(StateController controller)
|
||||||
{
|
{
|
||||||
Debug.Log("Waiting in place!");
|
// Debug.Log("Waiting in place!");
|
||||||
controller.FaceInteractor();
|
controller.FaceInteractor();
|
||||||
controller.Destination = controller.transform.position;
|
controller.Destination = controller.transform.position;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void EndAct(StateController controller)
|
public override void EndAct(StateController controller)
|
||||||
{
|
{
|
||||||
Debug.Log("Done waiting in place!");
|
// Debug.Log("Done waiting in place!");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,7 +94,7 @@ public class StateController : SelectableObject
|
||||||
if (SelectedObject.IsInteracting)
|
if (SelectedObject.IsInteracting)
|
||||||
Debug.Log(SelectedObject.name + " is busy and cannot interact with " + name);
|
Debug.Log(SelectedObject.name + " is busy and cannot interact with " + name);
|
||||||
|
|
||||||
Debug.Log("Sending interaction request...");
|
// Debug.Log("Sending interaction request...");
|
||||||
IsInteracting = true;
|
IsInteracting = true;
|
||||||
SelectedObject.Interactor = this;
|
SelectedObject.Interactor = this;
|
||||||
}
|
}
|
||||||
|
@ -113,7 +113,7 @@ public class StateController : SelectableObject
|
||||||
if (_selectedObject != null)
|
if (_selectedObject != null)
|
||||||
{
|
{
|
||||||
_selectedObject.Selected();
|
_selectedObject.Selected();
|
||||||
navMeshAgent.stoppingDistance = INTERACT_RANGE;
|
navMeshAgent.stoppingDistance = INTERACT_RANGE * 0.8f;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -54,7 +54,8 @@ public class ProgressPanelController : MonoBehaviour {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ProgressPanelController ActivePanel {
|
public static ProgressPanelController ActivePanel
|
||||||
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (activePanel)
|
if (activePanel)
|
||||||
|
|
Reference in a new issue