|
@@ -706,18 +706,46 @@ public class PlayerController : MoveCharacter
|
|
|
if(conductTime >= totalCacheSummonTime + canConductTime[nowConductButton] * timeSlowingMultiplier)
|
|
if(conductTime >= totalCacheSummonTime + canConductTime[nowConductButton] * timeSlowingMultiplier)
|
|
|
{
|
|
{
|
|
|
isReadyConduct = true;
|
|
isReadyConduct = true;
|
|
|
- if (!conductReadyTip.isShowing1)
|
|
|
|
|
|
|
+ if (!conductReadyTip.isShowing1 && !conductReadyTip.isShowingNoDemonic)
|
|
|
{
|
|
{
|
|
|
- conductReadyTip.Show(1);
|
|
|
|
|
|
|
+ int boostNum = demonicDic[nowConductButton].Count;
|
|
|
|
|
+ int dienum = Mathf.RoundToInt(boostNum * conversionRate[nowConductButton]);
|
|
|
|
|
+ if (boostNum == 1)
|
|
|
|
|
+ {
|
|
|
|
|
+ dienum = 1;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (dienum > 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ conductReadyTip.Show(1);
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ conductReadyTip.Show(3, nowConductButton);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
else if( conductTime >= totalCacheSummonTime + (canConductTime[nowConductButton] - readyTipFxTime) * timeSlowingMultiplier)
|
|
else if( conductTime >= totalCacheSummonTime + (canConductTime[nowConductButton] - readyTipFxTime) * timeSlowingMultiplier)
|
|
|
{
|
|
{
|
|
|
- if (!conductReadyTip.isShowing0)
|
|
|
|
|
|
|
+ if (!conductReadyTip.isShowing0 && !conductReadyTip.isShowingNoDemonic)
|
|
|
{
|
|
{
|
|
|
Time.timeScale = timeSlowingMultiplier;
|
|
Time.timeScale = timeSlowingMultiplier;
|
|
|
- conductReadyTip.Show(0);
|
|
|
|
|
|
|
+ int boostNum = demonicDic[nowConductButton].Count;
|
|
|
|
|
+ int dienum = Mathf.RoundToInt(boostNum * conversionRate[nowConductButton]);
|
|
|
|
|
+ if (boostNum == 1)
|
|
|
|
|
+ {
|
|
|
|
|
+ dienum = 1;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (dienum > 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ conductReadyTip.Show(0);
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ conductReadyTip.Show(2, nowConductButton);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -900,6 +928,7 @@ public class PlayerController : MoveCharacter
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
print("ʹħ²»×ã");
|
|
print("ʹħ²»×ã");
|
|
|
|
|
+ conductReadyTip.activeFalse();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|