Skip to content

Commit ffa1a76

Browse files
authored
Merge pull request Haruma-K#22 from Haruma-K/feature/unscaled_time
Feature/unscaled time
2 parents 48e8738 + 28a0d41 commit ffa1a76

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

Assets/UnityDebugSheet/Runtime/Foundation/Drawer/StatefulDrawerController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void IDragHandler.OnDrag(PointerEventData eventData)
9292
var delta = isHorizontal ? deltaPos.x : deltaPos.y;
9393
_drawer.Progress += _drawer.GetProgressFromDistance(delta) * (isInverse ? -1.0f : 1.0f);
9494

95-
_dragPositions.Add((eventData.position, Time.deltaTime));
95+
_dragPositions.Add((eventData.position, Time.unscaledDeltaTime));
9696
if (_dragPositions.Count > MaxPositionListSize)
9797
_dragPositions.RemoveAt(0);
9898

Assets/UnityDebugSheet/Runtime/Foundation/Drawer/TinyTween/TweenRoutineFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static IEnumerator Create<T>(T from, T to, float duration, ValueChangedDe
1919
yield return null;
2020

2121
if (getDeltaTime == null)
22-
timeSec += Time.deltaTime;
22+
timeSec += Time.unscaledDeltaTime;
2323
else
2424
timeSec += getDeltaTime.Invoke();
2525

Assets/UnityDebugSheet/Runtime/Foundation/Gestures/Flicks/FlickListenerBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private void Move(Vector2 screenPosition)
6060
{
6161
_touchStartScreenPosition = screenPosition;
6262
}
63-
_positions.Add((screenPosition, Time.deltaTime));
63+
_positions.Add((screenPosition, Time.unscaledDeltaTime));
6464
if (_positions.Count > MaxListSize)
6565
_positions.RemoveAt(0);
6666

Assets/UnityDebugSheet/Runtime/Foundation/MultiClickDispatcher/MultiClickEventDispatcher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private void Reset()
2020

2121
private void Update()
2222
{
23-
_timeFromLastClickSec += Time.deltaTime;
23+
_timeFromLastClickSec += Time.unscaledDeltaTime;
2424
if (_currentClickCount >= 1 && _timeFromLastClickSec >= resetTimeThresholdSec)
2525
_currentClickCount = 0;
2626
}

Assets/UnityDebugSheet/Runtime/Foundation/PageNavigator/Modules/Animation/UpdateDispatcher.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private void Update()
3030
{
3131
foreach (var target in _targets)
3232
{
33-
var deltaTime = target.Value?.Invoke(Time.deltaTime) ?? Time.deltaTime;
33+
var deltaTime = target.Value?.Invoke(Time.unscaledDeltaTime) ?? Time.unscaledDeltaTime;
3434
target.Key.Update(deltaTime);
3535
}
3636
}
@@ -45,4 +45,4 @@ public void Unregister(IUpdatable target)
4545
_targets.Remove(target);
4646
}
4747
}
48-
}
48+
}

Packages/manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"dependencies": {
3-
"com.yasirkula.ingamedebugconsole": "https://github.com/yasirkula/UnityIngameDebugConsole.git#v1.5.8",
43
"com.tayx.graphy": "https://github.com/Tayx94/graphy.git",
54
"com.unity.2d.sprite": "1.0.0",
6-
"com.unity.collab-proxy": "1.15.17",
5+
"com.unity.collab-proxy": "1.17.2",
76
"com.unity.device-simulator": "3.0.3-preview",
8-
"com.unity.ide.rider": "2.0.7",
9-
"com.unity.ide.visualstudio": "2.0.15",
7+
"com.unity.ide.rider": "3.0.15",
8+
"com.unity.ide.visualstudio": "2.0.16",
109
"com.unity.ide.vscode": "1.2.5",
1110
"com.unity.mobile.android-logcat": "1.3.2",
1211
"com.unity.postprocessing": "3.2.2",
1312
"com.unity.test-framework": "1.1.31",
1413
"com.unity.textmeshpro": "3.0.6",
1514
"com.unity.timeline": "1.4.8",
1615
"com.unity.ugui": "1.0.0",
16+
"com.yasirkula.ingamedebugconsole": "https://github.com/yasirkula/UnityIngameDebugConsole.git#v1.5.8",
1717
"com.unity.modules.ai": "1.0.0",
1818
"com.unity.modules.androidjni": "1.0.0",
1919
"com.unity.modules.animation": "1.0.0",

Packages/packages-lock.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"dependencies": {}
1515
},
1616
"com.unity.collab-proxy": {
17-
"version": "1.15.17",
17+
"version": "1.17.2",
1818
"depth": 0,
1919
"source": "registry",
2020
"dependencies": {
@@ -37,16 +37,16 @@
3737
"url": "https://packages.unity.com"
3838
},
3939
"com.unity.ide.rider": {
40-
"version": "2.0.7",
40+
"version": "3.0.15",
4141
"depth": 0,
4242
"source": "registry",
4343
"dependencies": {
44-
"com.unity.test-framework": "1.1.1"
44+
"com.unity.ext.nunit": "1.0.6"
4545
},
4646
"url": "https://packages.unity.com"
4747
},
4848
"com.unity.ide.visualstudio": {
49-
"version": "2.0.15",
49+
"version": "2.0.16",
5050
"depth": 0,
5151
"source": "registry",
5252
"dependencies": {

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.35f1
2-
m_EditorVersionWithRevision: 2020.3.35f1 (18e4db7a9996)
1+
m_EditorVersion: 2020.3.40f1
2+
m_EditorVersionWithRevision: 2020.3.40f1 (ba48d4efcef1)

0 commit comments

Comments
 (0)