|
@@ -1856,7 +1856,6 @@ public class PlayerController : MoveCharacter
|
|
|
rb.isKinematic = false;
|
|
rb.isKinematic = false;
|
|
|
Time.timeScale = 1;
|
|
Time.timeScale = 1;
|
|
|
Time.fixedDeltaTime = fixedDeltaTime * Time.timeScale;
|
|
Time.fixedDeltaTime = fixedDeltaTime * Time.timeScale;
|
|
|
- Debug.Log(222);
|
|
|
|
|
conductReadyTip.activeFalse();
|
|
conductReadyTip.activeFalse();
|
|
|
break;
|
|
break;
|
|
|
default:
|
|
default:
|
|
@@ -1970,7 +1969,6 @@ public class PlayerController : MoveCharacter
|
|
|
//hurtKeepTime = minHurtKeepTime;
|
|
//hurtKeepTime = minHurtKeepTime;
|
|
|
break;
|
|
break;
|
|
|
case CharacterState.Conduct:
|
|
case CharacterState.Conduct:
|
|
|
- Debug.Log(oldState);
|
|
|
|
|
conductTime = 0;
|
|
conductTime = 0;
|
|
|
rb.velocity = Vector3.zero;
|
|
rb.velocity = Vector3.zero;
|
|
|
rb.isKinematic = true;
|
|
rb.isKinematic = true;
|
