Skip to content

Commit 5811257

Browse files
authored
Merge pull request #14 from k-okawa/develop/fix_warning
Fix compile warning
2 parents 5f6cd3e + 2b35629 commit 5811257

File tree

11 files changed

+56
-38
lines changed

11 files changed

+56
-38
lines changed

Assets/Bg/UniTaskStateMachine/Editor/CustomInspectors/TransitionInspector.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ namespace Bg.UniTaskStateMachine.Editor
1010
[CustomEditor(typeof(TransitionInspectorHelper))]
1111
public class TransitionInspector : UnityEditor.Editor
1212
{
13-
private readonly int LabelWidth = 80;
14-
1513
private SerializedObject serializedStateMachineObject = null;
1614

1715
private SerializedProperty conditionMethodNameProperty = null;

Assets/Bg/UniTaskStateMachine/Runtime/Base/BaseState.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ public void Init(BaseNode baseNode)
1616
this.baseNode = baseNode;
1717
}
1818

19-
public virtual async UniTask OnEnter(CancellationToken ct = default)
19+
public virtual UniTask OnEnter(CancellationToken ct = default)
2020
{
21-
21+
return UniTask.CompletedTask;
2222
}
2323

24-
public virtual async UniTask OnUpdate(CancellationToken ct = default)
24+
public virtual UniTask OnUpdate(CancellationToken ct = default)
2525
{
26-
26+
return UniTask.CompletedTask;
2727
}
2828

29-
public virtual async UniTask OnExit(CancellationToken ct = default)
29+
public virtual UniTask OnExit(CancellationToken ct = default)
3030
{
31-
31+
return UniTask.CompletedTask;
3232
}
3333
}
3434
}

Assets/Bg/UniTaskStateMachine/Runtime/Base/StateMachine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public async void Start()
5555
}
5656
CurrentNode = nextNode;
5757
}
58-
catch (OperationCanceledException e)
58+
catch (OperationCanceledException)
5959
{
6060
CurrentState = State.STOP;
6161
return;

Assets/Bg/UniTaskStateMachine/Runtime/Components/BaseStateComponent.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ public virtual void Init(BaseNode baseNode)
1717
this.baseNode = baseNode;
1818
}
1919

20-
public virtual async UniTask OnEnter(CancellationToken ct = default)
20+
public virtual UniTask OnEnter(CancellationToken ct = default)
2121
{
22-
22+
return UniTask.CompletedTask;
2323
}
2424

25-
public virtual async UniTask OnUpdate(CancellationToken ct = default)
25+
public virtual UniTask OnUpdate(CancellationToken ct = default)
2626
{
27-
27+
return UniTask.CompletedTask;
2828
}
2929

30-
public virtual async UniTask OnExit(CancellationToken ct = default)
30+
public virtual UniTask OnExit(CancellationToken ct = default)
3131
{
32-
32+
return UniTask.CompletedTask;
3333
}
3434
}
3535
}

Assets/Bg/UniTaskStateMachine/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "com.bg.unitaskstatemachine",
33
"displayName": "UniTaskStateMachine",
4-
"version": "1.0.2",
4+
"version": "1.0.3",
55
"unity": "2019.4",
66
"description": "UniTaskStateMachine",
77
"author": {

Assets/Bg/UniTaskStateMachineTest/Runtime/PlayModeTest/StateMachineLoopTest.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,25 @@ public class StateMachineLoopTest
1919
public static float time = 0f;
2020

2121
public class PlayState : BaseState {
22-
public override async UniTask OnEnter(CancellationToken ct = default)
22+
public override UniTask OnEnter(CancellationToken ct = default)
2323
{
2424
time = 0f;
25+
return UniTask.CompletedTask;
2526
}
2627

27-
public override async UniTask OnUpdate(CancellationToken ct = default)
28+
public override UniTask OnUpdate(CancellationToken ct = default)
2829
{
2930
time += Time.deltaTime;
3031
Debug.Log($"Time:{time}");
3132
if (time >= 2f) {
3233
baseNode.StateMachine.Stop();
3334
}
35+
return UniTask.CompletedTask;
3436
}
3537

36-
public override async UniTask OnExit(CancellationToken ct = default)
38+
public override UniTask OnExit(CancellationToken ct = default)
3739
{
38-
40+
return UniTask.CompletedTask;
3941
}
4042
}
4143

Assets/Bg/UniTaskStateMachineTest/Runtime/PlayModeTest/StateMachineSimpleTest.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ public static class GameManager
2121

2222
public class StartState : BaseState
2323
{
24-
public override async UniTask OnEnter(CancellationToken ct = default)
24+
public override UniTask OnEnter(CancellationToken ct = default)
2525
{
2626
UnityEngine.Debug.Log("Init Start");
27+
return UniTask.CompletedTask;
2728
}
2829

2930
public override async UniTask OnUpdate(CancellationToken ct = default)
@@ -32,18 +33,20 @@ public override async UniTask OnUpdate(CancellationToken ct = default)
3233
GameManager.isInit = true;
3334
}
3435

35-
public override async UniTask OnExit(CancellationToken ct = default)
36+
public override UniTask OnExit(CancellationToken ct = default)
3637
{
3738
UnityEngine.Debug.Log("Init End");
39+
return UniTask.CompletedTask;
3840
}
3941
}
4042

4143
public class PlayState : BaseState
4244
{
43-
public override async UniTask OnEnter(CancellationToken ct = default)
45+
public override UniTask OnEnter(CancellationToken ct = default)
4446
{
4547
UnityEngine.Debug.Log("Play Start");
4648
UnityEngine.Debug.Log($"Boss Hp = {GameManager.bossHp}");
49+
return UniTask.CompletedTask;
4750
}
4851

4952
public override async UniTask OnUpdate(CancellationToken ct = default)
@@ -58,18 +61,20 @@ public override async UniTask OnUpdate(CancellationToken ct = default)
5861
UnityEngine.Debug.Log($"Boss Hp = {GameManager.bossHp}");
5962
}
6063

61-
public override async UniTask OnExit(CancellationToken ct = default)
64+
public override UniTask OnExit(CancellationToken ct = default)
6265
{
6366
UnityEngine.Debug.Log("Play End");
67+
return UniTask.CompletedTask;
6468
}
6569
}
6670

6771
public class EndState : BaseState
6872
{
69-
public override async UniTask OnEnter(CancellationToken ct = default)
73+
public override UniTask OnEnter(CancellationToken ct = default)
7074
{
7175
UnityEngine.Debug.Log("Game End");
7276
baseNode.StateMachine.Stop();
77+
return UniTask.CompletedTask;
7378
}
7479
}
7580

Assets/Bg/UniTaskStateMachineTest/Runtime/PlayModeTest/StateMachineTriggerTest.cs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ public static class GameManager
2020

2121
public class StartState : BaseState
2222
{
23-
public override async UniTask OnEnter(CancellationToken ct = default)
23+
public override UniTask OnEnter(CancellationToken ct = default)
2424
{
2525
UnityEngine.Debug.Log("Init Start");
26+
return UniTask.CompletedTask;
2627
}
2728

2829
public override async UniTask OnUpdate(CancellationToken ct = default)
@@ -32,18 +33,20 @@ public override async UniTask OnUpdate(CancellationToken ct = default)
3233
baseNode.StateMachine.TriggerNextTransition("IsStart");
3334
}
3435

35-
public override async UniTask OnExit(CancellationToken ct = default)
36+
public override UniTask OnExit(CancellationToken ct = default)
3637
{
3738
UnityEngine.Debug.Log("Init End");
39+
return UniTask.CompletedTask;
3840
}
3941
}
4042

4143
public class PlayState : BaseState
4244
{
43-
public override async UniTask OnEnter(CancellationToken ct = default)
45+
public override UniTask OnEnter(CancellationToken ct = default)
4446
{
4547
UnityEngine.Debug.Log("Play Start");
4648
UnityEngine.Debug.Log($"Boss Hp = {GameManager.bossHp}");
49+
return UniTask.CompletedTask;
4750
}
4851

4952
public override async UniTask OnUpdate(CancellationToken ct = default)
@@ -62,17 +65,19 @@ public override async UniTask OnUpdate(CancellationToken ct = default)
6265

6366
}
6467

65-
public override async UniTask OnExit(CancellationToken ct = default)
68+
public override UniTask OnExit(CancellationToken ct = default)
6669
{
6770
UnityEngine.Debug.Log("Play End");
71+
return UniTask.CompletedTask;
6872
}
6973
}
7074

7175
public class PauseState : BaseState
7276
{
73-
public override async UniTask OnEnter(CancellationToken ct = default)
77+
public override UniTask OnEnter(CancellationToken ct = default)
7478
{
7579
UnityEngine.Debug.Log("Pause");
80+
return UniTask.CompletedTask;
7681
}
7782

7883
public override async UniTask OnUpdate(CancellationToken ct = default)
@@ -81,18 +86,20 @@ public override async UniTask OnUpdate(CancellationToken ct = default)
8186
baseNode.StateMachine.TriggerNextTransition("Resume");
8287
}
8388

84-
public override async UniTask OnExit(CancellationToken ct = default)
89+
public override UniTask OnExit(CancellationToken ct = default)
8590
{
8691
UnityEngine.Debug.Log("Resume");
92+
return UniTask.CompletedTask;
8793
}
8894
}
8995

9096
public class EndState : BaseState
9197
{
92-
public override async UniTask OnEnter(CancellationToken ct = default)
98+
public override UniTask OnEnter(CancellationToken ct = default)
9399
{
94100
UnityEngine.Debug.Log("Game End");
95101
baseNode.StateMachine.Stop();
102+
return UniTask.CompletedTask;
96103
}
97104
}
98105

Assets/Bg/UniTaskStateMachineTest/Runtime/SceneTest/BasicSceneTest/EndState.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ namespace Bg.UniTaskStateMachine.Tests.BasicSceneTest
99
{
1010
public class EndState : BaseStateComponent
1111
{
12-
public override async UniTask OnEnter(CancellationToken ct = default)
12+
public override UniTask OnEnter(CancellationToken ct = default)
1313
{
1414
UnityEngine.Debug.Log("Game End");
15+
return UniTask.CompletedTask;
1516
}
1617

1718
public override UniTask OnUpdate(CancellationToken ct = default)

Assets/Bg/UniTaskStateMachineTest/Runtime/SceneTest/BasicSceneTest/PlayState.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ namespace Bg.UniTaskStateMachine.Tests.BasicSceneTest
1010
{
1111
public class PlayState : BaseStateComponent
1212
{
13-
public override async UniTask OnEnter(CancellationToken ct = default)
13+
public override UniTask OnEnter(CancellationToken ct = default)
1414
{
1515
UnityEngine.Debug.Log("Play Start");
1616
UnityEngine.Debug.Log($"Boss Hp = {GameManager.bossHp}");
17+
return UniTask.CompletedTask;
1718
}
1819

1920
public override async UniTask OnUpdate(CancellationToken ct = default)
@@ -28,9 +29,10 @@ public override async UniTask OnUpdate(CancellationToken ct = default)
2829
UnityEngine.Debug.Log($"Boss Hp = {GameManager.bossHp}");
2930
}
3031

31-
public override async UniTask OnExit(CancellationToken ct = default)
32+
public override UniTask OnExit(CancellationToken ct = default)
3233
{
3334
UnityEngine.Debug.Log("Play End");
35+
return UniTask.CompletedTask;
3436
}
3537
}
3638
}

0 commit comments

Comments
 (0)