|
@@ -140,6 +140,7 @@ public class PlayerController : MoveCharacter
|
|
|
[Header("时间倍率")] [Tooltip("时间速度放慢到正常的几倍")] public float timeSlowingMultiplier;
|
|
[Header("时间倍率")] [Tooltip("时间速度放慢到正常的几倍")] public float timeSlowingMultiplier;
|
|
|
[DisplayOnly]public float fixedDeltaTime;
|
|
[DisplayOnly]public float fixedDeltaTime;
|
|
|
public float readyTipFxTime;
|
|
public float readyTipFxTime;
|
|
|
|
|
+ public int dienum;
|
|
|
|
|
|
|
|
//攻击力
|
|
//攻击力
|
|
|
[Header("增加攻击力特效")]
|
|
[Header("增加攻击力特效")]
|
|
@@ -568,7 +569,7 @@ public class PlayerController : MoveCharacter
|
|
|
if (isReadyConduct)
|
|
if (isReadyConduct)
|
|
|
{
|
|
{
|
|
|
cacheSummonTime = 0;
|
|
cacheSummonTime = 0;
|
|
|
- conductController.Conduct(cacheConductId);
|
|
|
|
|
|
|
+ conductController.Conduct(cacheConductId, dienum);
|
|
|
}
|
|
}
|
|
|
isReadyConduct = false;
|
|
isReadyConduct = false;
|
|
|
return true;
|
|
return true;
|
|
@@ -577,7 +578,6 @@ public class PlayerController : MoveCharacter
|
|
|
if (!isReadyConduct && nowConductButton != -1)
|
|
if (!isReadyConduct && nowConductButton != -1)
|
|
|
{
|
|
{
|
|
|
int boostNum = demonicDic[nowConductButton].Count;
|
|
int boostNum = demonicDic[nowConductButton].Count;
|
|
|
- int dienum;
|
|
|
|
|
if (conductController.bUseFixedSacrifice[nowConductButton])
|
|
if (conductController.bUseFixedSacrifice[nowConductButton])
|
|
|
{
|
|
{
|
|
|
dienum = conductController.sacrificeValue[nowConductButton];
|
|
dienum = conductController.sacrificeValue[nowConductButton];
|