commit 90d161d97598a0e2cd8b082c4d30c9d6bea3714e
parent cdd71543e0c8a0c1d6d7a7f5ce008e74f6611a56
Author: PlutoTank <qwolkensperg@gmail.com>
Date: Thu, 6 Feb 2020 17:58:32 -0500
Making current
Diffstat:
10 files changed, 0 insertions(+), 134 deletions(-)
diff --git a/Assets/Samples/Input System/1.0.0-preview.3/InputDeviceTester.meta b/Assets/Samples/Input System/1.0.0-preview.3/InputDeviceTester.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 12be37a8de9cb2841b9e730256fe4969
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Samples/Input System/1.0.0-preview.3/InputDeviceTester/InputDeviceTester.asset b/Assets/Samples/Input System/1.0.0-preview.3/InputDeviceTester/InputDeviceTester.asset
@@ -1,17 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 9858d4c8055fd45539a2e86388f7c5ba, type: 3}
- m_Name: InputDeviceTester
- m_EditorClassIdentifier:
- url: https://github.com/Unity-Technologies/InputSystem/releases/download/%VERSION%/InputDeviceTester-%VERSION%.unitypackage
- packageDeps:
- - com.unity.inputsystem
diff --git a/Assets/Samples/Input System/1.0.0-preview.3/InputDeviceTester/InputDeviceTester.asset.meta b/Assets/Samples/Input System/1.0.0-preview.3/InputDeviceTester/InputDeviceTester.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5c4222eac5d064f888b070a9269a9150
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/.sample.json b/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/.sample.json
@@ -1,4 +0,0 @@
-{
- "displayName": "InputDeviceTester",
- "description": "A scene containing UI to visualize the controls on various supported input devices."
-}
diff --git a/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/.sample.json.meta b/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/.sample.json.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 3d9c0d91f50349d29637153ddec7f1d9
-timeCreated: 1565354374-
\ No newline at end of file
diff --git a/Assets/Scripts/Slimecing/InputManager.meta b/Assets/Scripts/Slimecing/InputManager.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f1887224e88ca054e8e431db506b0385
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnPlayerJoin.asset b/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnPlayerJoin.asset
@@ -1,14 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 00209251ddb44e60b1e5818f1a1681f2, type: 3}
- m_Name: GameEvent_OnPlayerJoin
- m_EditorClassIdentifier:
diff --git a/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnPlayerJoin.asset.meta b/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnPlayerJoin.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 08cea5bd86af3294baed5c8f7308ae0f
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Timer.cs b/Assets/Scripts/Slimecing/SimpleComponents/Timer.cs
@@ -1,52 +0,0 @@
-using System.Collections;
-using UnityEngine;
-using UnityEngine.Events;
-
-public class Timer : MonoBehaviour
-{
- [SerializeField] private float durationOfTick = 1f;
- [SerializeField] private float loopFor = 0f;
- [SerializeField] private bool loopInfinite = false;
- [SerializeField] private UnityEvent onTimerEnd = new UnityEvent();
-
- private bool looping = false;
- private void Start()
- {
- InitializeTimer();
- }
-
- public void InitializeTimer()
- {
- if (loopFor > 0f)
- {
- looping = true;
- StartCoroutine(LoopTimeSubtractor());
- }
- StartCoroutine(StartTimer());
- }
-
- public void FinishTimerEarly()
- {
- onTimerEnd?.Invoke();
- StopAllCoroutines();
- }
-
- private IEnumerator LoopTimeSubtractor()
- {
- while(loopFor > 0)
- {
- yield return new WaitForSeconds(0.1f);
- loopFor -= 0.1f;
- }
- looping = false;
- }
-
- private IEnumerator StartTimer()
- {
- while (loopInfinite || looping)
- {
- yield return new WaitForSeconds(durationOfTick);
- onTimerEnd?.Invoke();
- }
- }
-}
diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Timer.cs.meta b/Assets/Scripts/Slimecing/SimpleComponents/Timer.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: b311a64b2a5334e44a3c37626adeb013
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
