Skip to content

Commit

Permalink
Merge pull request #17 from OUCC/#3-戦闘シーン
Browse files Browse the repository at this point in the history
fix BattleManager^^;(1)
  • Loading branch information
aiueo-1234 authored Jun 18, 2023
2 parents 83a38c7 + 53ab711 commit cdd939c
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions Assets/Scripts/BattleManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ namespace HackathonA
{
public class BattleManager : MonoBehaviour
{
const int attacking = 0;
const int magicAttacking = 1;
const int healing = 2;
const int counter = 3;
const int magicCounter = 4;
private const int Attacking = 0;
private const int MagicAttacking = 1;
private const int Healing = 2;
private const int Counter = 3;
private const int MagicCounter = 4;
private BattleSystem battleSystem;

// Start is called before the first frame update
Expand Down Expand Up @@ -65,18 +65,18 @@ private string GenerateMessage(ICharacter character)
bool counterJudge = character.CounterJudge;
switch (character.ActionType)
{
case attacking:
case Attacking:
message += $"{actor}の攻撃!\n";
message += $"{target}{damageValue}のダメージを受けた";
break;
case magicAttacking:
case MagicAttacking:
message += $"{actor}の魔法攻撃!\n";
message += $"{target}{damageValue}のダメージを受けた";
break;
case healing:
case Healing:
message += $"{actor}{damageValue}回復した";
break;
case counter:
case Counter:
message += $"{actor}のカウンター攻撃!\n";
if (counterJudge)
{
Expand All @@ -87,7 +87,7 @@ private string GenerateMessage(ICharacter character)
message += "しかし失敗に終わった。";
}
break;
case magicCounter:
case MagicCounter:
message += $"{actor}の魔法カウンター攻撃!\n";
if (counterJudge)
{
Expand Down

0 comments on commit cdd939c

Please sign in to comment.