|
@@ -105,11 +105,12 @@ public class ConductController : MonoBehaviour
|
|
|
+ gameManager.damage;
|
|
+ gameManager.damage;
|
|
|
List<int> myTreasureTag = gameManager.myTreasuresTag;
|
|
List<int> myTreasureTag = gameManager.myTreasuresTag;
|
|
|
float tagAdd = 1;
|
|
float tagAdd = 1;
|
|
|
|
|
+ int demonicRarity = rarity[demonicId];
|
|
|
switch (conductSkills[demonicId])
|
|
switch (conductSkills[demonicId])
|
|
|
{
|
|
{
|
|
|
case ConductSkills.NetherfireRebirth:
|
|
case ConductSkills.NetherfireRebirth:
|
|
|
ConductManager.NetherfireRebirth netherfireRebirth = conductManager.netherfireRebirth;
|
|
ConductManager.NetherfireRebirth netherfireRebirth = conductManager.netherfireRebirth;
|
|
|
- for (int i = 0;i<dienum * netherfireRebirth.power[rarity[demonicId]]; i++)
|
|
|
|
|
|
|
+ for (int i = 0;i<dienum * netherfireRebirth.power[demonicRarity]; i++)
|
|
|
{
|
|
{
|
|
|
Demonic demonic = playerController.CreateDemonic(demonicId);
|
|
Demonic demonic = playerController.CreateDemonic(demonicId);
|
|
|
if (netherfireRebirth.canDie)
|
|
if (netherfireRebirth.canDie)
|
|
@@ -126,7 +127,7 @@ public class ConductController : MonoBehaviour
|
|
|
}
|
|
}
|
|
|
demonic.gameObject.transform.position = targetPos;
|
|
demonic.gameObject.transform.position = targetPos;
|
|
|
demonic.attackController.attackSummonId = 0;
|
|
demonic.attackController.attackSummonId = 0;
|
|
|
- tagAdd += netherfireRebirth.effectBonus * myTreasureTag [(int)netherfireRebirth.attributeTag - 1]/ 100;
|
|
|
|
|
|
|
+ tagAdd += netherfireRebirth.effectBonus[demonicRarity] * myTreasureTag [(int)netherfireRebirth.attributeTag - 1]/ 100;
|
|
|
int damage = demonic.attackController.attackMethod_summon[0].attackInfo.damage;
|
|
int damage = demonic.attackController.attackMethod_summon[0].attackInfo.damage;
|
|
|
damage = (int)(damage * tagAdd);
|
|
damage = (int)(damage * tagAdd);
|
|
|
demonic.attackController.attackMethod_summon[0].attackInfo.damage = damage;
|
|
demonic.attackController.attackMethod_summon[0].attackInfo.damage = damage;
|
|
@@ -139,8 +140,8 @@ public class ConductController : MonoBehaviour
|
|
|
obj = PoolManager.Instantiate(flyingSwords.obj);
|
|
obj = PoolManager.Instantiate(flyingSwords.obj);
|
|
|
FanFlyingSwords FFS = obj.GetComponent<FanFlyingSwords>();
|
|
FanFlyingSwords FFS = obj.GetComponent<FanFlyingSwords>();
|
|
|
FFS.owner = playerController;
|
|
FFS.owner = playerController;
|
|
|
- FFS.swordsNum = dienum * flyingSwords.power[rarity[demonicId]];
|
|
|
|
|
- tagAdd += flyingSwords.effectBonus * myTreasureTag[(int)flyingSwords.attributeTag - 1] / 100;
|
|
|
|
|
|
|
+ FFS.swordsNum = dienum * flyingSwords.power[demonicRarity];
|
|
|
|
|
+ tagAdd += flyingSwords.effectBonus[demonicRarity] * myTreasureTag[(int)flyingSwords.attributeTag - 1] / 100;
|
|
|
FFS.damage = (int)(attackDamage * tagAdd);
|
|
FFS.damage = (int)(attackDamage * tagAdd);
|
|
|
FFS.Biu();
|
|
FFS.Biu();
|
|
|
break;
|
|
break;
|
|
@@ -149,8 +150,8 @@ public class ConductController : MonoBehaviour
|
|
|
obj = PoolManager.Instantiate(iceRain.obj);
|
|
obj = PoolManager.Instantiate(iceRain.obj);
|
|
|
IceRainController iceRainController = obj.GetComponent<IceRainController>();
|
|
IceRainController iceRainController = obj.GetComponent<IceRainController>();
|
|
|
iceRainController.owner = playerController;
|
|
iceRainController.owner = playerController;
|
|
|
- iceRainController.swordsNum = dienum * iceRain.power[rarity[demonicId]];
|
|
|
|
|
- tagAdd += iceRain.effectBonus * myTreasureTag[(int)iceRain.attributeTag - 1] / 100;
|
|
|
|
|
|
|
+ iceRainController.swordsNum = dienum * iceRain.power[demonicRarity];
|
|
|
|
|
+ tagAdd += iceRain.effectBonus[demonicRarity] * myTreasureTag[(int)iceRain.attributeTag - 1] / 100;
|
|
|
iceRainController.damage = (int)(attackDamage * tagAdd);
|
|
iceRainController.damage = (int)(attackDamage * tagAdd);
|
|
|
iceRainController.Biu();
|
|
iceRainController.Biu();
|
|
|
break;
|
|
break;
|