Commit fd986c88 authored by 18김민수's avatar 18김민수

Ending game rebalanced

parent 839efcac
...@@ -60,30 +60,33 @@ public abstract class EndingGameUnit : MonoBehaviour ...@@ -60,30 +60,33 @@ public abstract class EndingGameUnit : MonoBehaviour
int moveSpeed; int moveSpeed;
if (isAllyUnit) if (!isTooCloseFrontUnit)
{ {
moveSpeed = speed; if (isAllyUnit)
if (endingGame.deployedEnemyUnits.FirstOrDefault() != null)
{ {
if (endingGame.deployedEnemyUnits.First().transform.position.x - transform.position.x moveSpeed = speed;
>= (unitSize + endingGame.deployedEnemyUnits.First().GetComponent<EndingGameUnit>().unitSize) / 2) if (endingGame.deployedEnemyUnits.FirstOrDefault() != null)
{
if (endingGame.deployedEnemyUnits.First().transform.position.x - transform.position.x
>= (unitSize + endingGame.deployedEnemyUnits.First().GetComponent<EndingGameUnit>().unitSize) / 2)
transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
}
else
transform.Translate(moveSpeed * Time.deltaTime, 0, 0); transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
} }
else else
transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
}
else
{
moveSpeed = -speed;
if (endingGame.deployedAllyUnits.FirstOrDefault() != null)
{ {
if (-endingGame.deployedAllyUnits.First().transform.position.x + transform.position.x moveSpeed = -speed;
>= unitSize + endingGame.deployedAllyUnits.First().GetComponent<EndingGameUnit>().unitSize) if (endingGame.deployedAllyUnits.FirstOrDefault() != null)
{
if (-endingGame.deployedAllyUnits.First().transform.position.x + transform.position.x
>= unitSize + endingGame.deployedAllyUnits.First().GetComponent<EndingGameUnit>().unitSize)
transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
}
else
transform.Translate(moveSpeed * Time.deltaTime, 0, 0); transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
} }
else
transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
} }
} }
......
...@@ -26,15 +26,18 @@ public class NKSoldier : EndingGameUnit ...@@ -26,15 +26,18 @@ public class NKSoldier : EndingGameUnit
int moveSpeed; int moveSpeed;
moveSpeed = -speed; if (!isTooCloseFrontUnit)
if (endingGame.deployedAllyUnits.FirstOrDefault() != null)
{ {
if (-endingGame.deployedAllyUnits.First().transform.position.x + transform.position.x moveSpeed = -speed;
>= unitSize + endingGame.deployedAllyUnits.First().GetComponent<EndingGameUnit>().unitSize) if (endingGame.deployedAllyUnits.FirstOrDefault() != null)
{
if (-endingGame.deployedAllyUnits.First().transform.position.x + transform.position.x
>= unitSize + endingGame.deployedAllyUnits.First().GetComponent<EndingGameUnit>().unitSize)
transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
}
else
transform.Translate(moveSpeed * Time.deltaTime, 0, 0); transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
} }
else
transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
if (endingGame.deployedAllyUnits.Count > 0) if (endingGame.deployedAllyUnits.Count > 0)
......
...@@ -8,7 +8,7 @@ public class Pikeman : EndingGameUnit ...@@ -8,7 +8,7 @@ public class Pikeman : EndingGameUnit
public override int unitNumber => 2; public override int unitNumber => 2;
public override string unitName { get { return "파이크병"; } } public override string unitName { get { return "파이크병"; } }
public override int attackSpeed { get { return 2; } } public override int attackSpeed { get { return 2; } }
public override int attackRange { get { return 1; } } public override int attackRange { get { return 2; } }
public override bool isAllyUnit => true; public override bool isAllyUnit => true;
} }
...@@ -66,6 +66,8 @@ public class RubyText : MonoBehaviour ...@@ -66,6 +66,8 @@ public class RubyText : MonoBehaviour
} }
} }
// TextPrefab をインスタンス化して配置する // TextPrefab をインスタンス化して配置する
void PlaceRuby(float x, float y, string text) void PlaceRuby(float x, float y, string text)
{ {
......
...@@ -21,7 +21,7 @@ public class UIEventManager : MonoBehaviour ...@@ -21,7 +21,7 @@ public class UIEventManager : MonoBehaviour
public EventManager eventManager; public EventManager eventManager;
void Start() void Awake()
{ {
containerChoice.SetActive(false); containerChoice.SetActive(false);
containerConversation.SetActive(false); containerConversation.SetActive(false);
......
...@@ -139,7 +139,7 @@ MonoBehaviour: ...@@ -139,7 +139,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 413a96063715a1b4f902d16d4ec537b0, type: 3} m_Script: {fileID: 11500000, guid: 413a96063715a1b4f902d16d4ec537b0, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hp: 50 hp: 100
attackPower: 25 attackPower: 25
isInBattleState: 0 isInBattleState: 0
frontUnit: {fileID: 0} frontUnit: {fileID: 0}
...@@ -283,7 +283,7 @@ MonoBehaviour: ...@@ -283,7 +283,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a87e57f34de0ceb4ab4ef8bad072008c, type: 3} m_Script: {fileID: 11500000, guid: a87e57f34de0ceb4ab4ef8bad072008c, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hp: 20 hp: 40
attackPower: 10 attackPower: 10
isInBattleState: 0 isInBattleState: 0
frontUnit: {fileID: 0} frontUnit: {fileID: 0}
...@@ -609,7 +609,7 @@ MonoBehaviour: ...@@ -609,7 +609,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bdfec5ebf583e24488cd5c91adaebdfb, type: 3} m_Script: {fileID: 11500000, guid: bdfec5ebf583e24488cd5c91adaebdfb, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hp: 20 hp: 40
attackPower: 6 attackPower: 6
isInBattleState: 0 isInBattleState: 0
frontUnit: {fileID: 0} frontUnit: {fileID: 0}
...@@ -1345,7 +1345,7 @@ MonoBehaviour: ...@@ -1345,7 +1345,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 207e4c2da994a5a4db8417fbb7882a3c, type: 3} m_Script: {fileID: 11500000, guid: 207e4c2da994a5a4db8417fbb7882a3c, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hp: 100 hp: 200
attackPower: 40 attackPower: 40
isInBattleState: 0 isInBattleState: 0
frontUnit: {fileID: 0} frontUnit: {fileID: 0}
...@@ -2025,7 +2025,7 @@ MonoBehaviour: ...@@ -2025,7 +2025,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 38f27e2f6af0c6e4b8b4594f12815bd4, type: 3} m_Script: {fileID: 11500000, guid: 38f27e2f6af0c6e4b8b4594f12815bd4, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hp: 20 hp: 40
attackPower: 10 attackPower: 10
isInBattleState: 0 isInBattleState: 0
frontUnit: {fileID: 0} frontUnit: {fileID: 0}
...@@ -2167,7 +2167,7 @@ MonoBehaviour: ...@@ -2167,7 +2167,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a13c82786fad785418474bbe47cd4fc3, type: 3} m_Script: {fileID: 11500000, guid: a13c82786fad785418474bbe47cd4fc3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hp: 100 hp: 200
attackPower: 100 attackPower: 100
isInBattleState: 0 isInBattleState: 0
frontUnit: {fileID: 0} frontUnit: {fileID: 0}
...@@ -2766,7 +2766,7 @@ MonoBehaviour: ...@@ -2766,7 +2766,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c87edfaef174f0743a9d72ff87f5bce2, type: 3} m_Script: {fileID: 11500000, guid: c87edfaef174f0743a9d72ff87f5bce2, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hp: 15 hp: 30
attackPower: 5 attackPower: 5
isInBattleState: 0 isInBattleState: 0
frontUnit: {fileID: 0} frontUnit: {fileID: 0}
...@@ -3329,7 +3329,7 @@ MonoBehaviour: ...@@ -3329,7 +3329,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a13c82786fad785418474bbe47cd4fc3, type: 3} m_Script: {fileID: 11500000, guid: a13c82786fad785418474bbe47cd4fc3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hp: 10 hp: 20
attackPower: 5 attackPower: 5
isInBattleState: 0 isInBattleState: 0
frontUnit: {fileID: 0} frontUnit: {fileID: 0}
...@@ -3653,7 +3653,7 @@ MonoBehaviour: ...@@ -3653,7 +3653,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bd5828989b7e26a4abf18227c1442abb, type: 3} m_Script: {fileID: 11500000, guid: bd5828989b7e26a4abf18227c1442abb, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hp: 50 hp: 100
attackPower: 20 attackPower: 20
isInBattleState: 0 isInBattleState: 0
frontUnit: {fileID: 0} frontUnit: {fileID: 0}
...@@ -3795,7 +3795,7 @@ MonoBehaviour: ...@@ -3795,7 +3795,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 50209c85b5796c64d81cc77ef008689b, type: 3} m_Script: {fileID: 11500000, guid: 50209c85b5796c64d81cc77ef008689b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hp: 50 hp: 100
attackPower: 20 attackPower: 20
isInBattleState: 0 isInBattleState: 0
frontUnit: {fileID: 0} frontUnit: {fileID: 0}
...@@ -3937,7 +3937,7 @@ MonoBehaviour: ...@@ -3937,7 +3937,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4e0f51bf7f4b42e469cd8b0adfcc699e, type: 3} m_Script: {fileID: 11500000, guid: 4e0f51bf7f4b42e469cd8b0adfcc699e, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hp: 20 hp: 40
attackPower: 20 attackPower: 20
isInBattleState: 0 isInBattleState: 0
frontUnit: {fileID: 0} frontUnit: {fileID: 0}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment