Skip to content

Commit 7bea7e8

Browse files
committed
Add following moving unit feature
1 parent be16a2e commit 7bea7e8

File tree

5 files changed

+33
-4
lines changed

5 files changed

+33
-4
lines changed

RogueTactics/Assets/Scenes/MainGame.unity

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4910,6 +4910,7 @@ MonoBehaviour:
49104910
doCollide: 0
49114911
distanceFromStartTile: 0
49124912
position: {x: 0, y: 0}
4913+
inTransition: 0
49134914
--- !u!114 &674644804
49144915
MonoBehaviour:
49154916
m_ObjectHideFlags: 0
@@ -5017,7 +5018,7 @@ SpriteRenderer:
50175018
m_LightmapParameters: {fileID: 0}
50185019
m_SortingLayerID: 0
50195020
m_SortingLayer: 0
5020-
m_SortingOrder: 1
5021+
m_SortingOrder: 2
50215022
m_Sprite: {fileID: 21300000, guid: 2bb0a0c210c09714cb16eb8f6c4f4fb1, type: 3}
50225023
m_Color: {r: 1, g: 1, b: 1, a: 0.7058824}
50235024
m_FlipX: 0

RogueTactics/Assets/Scripts/Controllers/BattleController.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ public class BattleController : StateMachine
7878
/// </summary>
7979
[HideInInspector] public Vector2 position;
8080

81+
[HideInInspector] public bool inTransition;
82+
8183
private void Awake()
8284
{
8385
if (Instance != null && Instance != this)

RogueTactics/Assets/Scripts/Controllers/BattleStates/MoveSequenceState.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public override void Enter()
2222
private IEnumerator Sequence()
2323
{
2424
var m = owner.turn.actor.GetComponent<UnitMovement>();
25+
BattleController.Instance.inTransition = true;
2526
yield return StartCoroutine(m.Traverse(currentSelectedTile));
27+
BattleController.Instance.inTransition = false;
2628
if (_driver.Current == Drivers.Human)
2729
{
2830
owner.ChangeState<CommandSelectionState>();
@@ -38,7 +40,6 @@ private IEnumerator Sequence()
3840
{
3941
owner.ChangeState<TurnManagerState>();
4042
}
41-
4243
}
4344

4445
}

RogueTactics/Assets/Scripts/Controllers/CameraController.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private void Start()
4343
private void LateUpdate()
4444
{
4545
//if (follow) _transform.position = Vector3.Lerp(_transform.position, new Vector3(follow.position.x, follow.position.y, _transform.position.z), speed * Time.fixedDeltaTime);
46-
if (Mouse.current.enabled)
46+
if (!BattleController.Instance.inTransition)
4747
{
4848

4949
//Vector2 cursorScreenPos = Mouse.current.position.ReadValue();
@@ -69,7 +69,12 @@ private void LateUpdate()
6969
{
7070
_transformPosition.y -= speed * Time.fixedDeltaTime;
7171
}
72-
72+
73+
transform.position = Vector3.Lerp(transform.position, new Vector3(_transformPosition.x, _transformPosition.y, transform.position.z), speed * Time.fixedDeltaTime);
74+
}
75+
else
76+
{
77+
_transformPosition = BattleController.Instance.turn.actor.transform.position;
7378
transform.position = Vector3.Lerp(transform.position, new Vector3(_transformPosition.x, _transformPosition.y, transform.position.z), speed * Time.fixedDeltaTime);
7479
}
7580
}

RogueTactics/Logs/ApiUpdaterCheck.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9106,3 +9106,23 @@ C# parse time : 156ms
91069106
candidates check time : 24ms
91079107
console write time : 0ms
91089108

9109+
[api-updater (non-obsolete-error-filter)] 16/09/2021 16:58:26 : Starting A:/__OUTILS/__UNITY/2020.3.14f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
9110+
[api-updater (non-obsolete-error-filter)]
9111+
----------------------------------
9112+
jit/startup time : 64,1997ms
9113+
moved types parse time: 41ms
9114+
candidates parse time : 1ms
9115+
C# parse time : 162ms
9116+
candidates check time : 23ms
9117+
console write time : 0ms
9118+
9119+
[api-updater (non-obsolete-error-filter)] 16/09/2021 17:03:11 : Starting A:/__OUTILS/__UNITY/2020.3.14f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
9120+
[api-updater (non-obsolete-error-filter)]
9121+
----------------------------------
9122+
jit/startup time : 53,2952ms
9123+
moved types parse time: 41ms
9124+
candidates parse time : 1ms
9125+
C# parse time : 166ms
9126+
candidates check time : 25ms
9127+
console write time : 0ms
9128+

0 commit comments

Comments
 (0)