|
|
@@ -169,6 +169,8 @@ public class PlayerController : MoveCharacter
|
|
|
public bool[] conductCanRelease; //能否进入指挥技蓄力状态
|
|
|
public ConductReadyTip conductReadyTip; //指挥技就绪
|
|
|
private bool isReadyConduct;
|
|
|
+ [Header("时间倍率")] [Tooltip("时间速度放慢到正常的几倍")] public float timeSlowingMultiplier;
|
|
|
+ public float readyTipFxTime;
|
|
|
//大胖子
|
|
|
public GameObject bigGiant;
|
|
|
public float[] stageSize;
|
|
|
@@ -694,10 +696,19 @@ public class PlayerController : MoveCharacter
|
|
|
isReadyConduct = false;
|
|
|
return true;
|
|
|
}
|
|
|
- if (!isReadyConduct && nowConductButton != -1 && conductTime >= canConductTime[nowConductButton])
|
|
|
+ if (!isReadyConduct && nowConductButton != -1)
|
|
|
{
|
|
|
- conductReadyTip.Show();
|
|
|
- isReadyConduct = true;
|
|
|
+ if(conductTime >= canConductTime[nowConductButton])
|
|
|
+ {
|
|
|
+ isReadyConduct = true;
|
|
|
+ }
|
|
|
+ else if(conductTime >= canConductTime[nowConductButton] - readyTipFxTime && conductTime >= totalCacheSummonTime)
|
|
|
+ {
|
|
|
+ Time.timeScale = timeSlowingMultiplier;
|
|
|
+ conductReadyTip.Show();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
return false;
|
|
|
@@ -1835,6 +1846,7 @@ public class PlayerController : MoveCharacter
|
|
|
break;
|
|
|
case CharacterState.Conduct:
|
|
|
rb.isKinematic = false;
|
|
|
+ Time.timeScale = 1;
|
|
|
break;
|
|
|
default:
|
|
|
break;
|