From c218ccaa5cf5c23ff8254aab6ea2d9a400cf22de Mon Sep 17 00:00:00 2001 From: eseiker <esrseiker@gmail.com> Date: Fri, 25 Aug 2017 04:39:52 +0900 Subject: [PATCH] Short Motion Judge just WORKS --- .../Plugins/Metro/KinectUnityAddin.dll.meta | 33 ++++++ Assets/Plugins/x86/KinectUnityAddin.dll.meta | 97 ++++++++++++++++++ .../Plugins/x86_64/KinectUnityAddin.dll.meta | 97 ++++++++++++++++++ Assets/Resources/Motion Sample Display.prefab | 4 +- Assets/Resources/MotionNotes.meta | 9 ++ Assets/Resources/MotionNotes/HOS.png | Bin 0 -> 20726 bytes Assets/Resources/MotionNotes/HOS.png.meta | 74 +++++++++++++ Assets/Script/JudgeManager.cs | 15 ++- Assets/Script/MotionSampleDisplay.cs | 33 +++--- 9 files changed, 343 insertions(+), 19 deletions(-) create mode 100644 Assets/Plugins/Metro/KinectUnityAddin.dll.meta create mode 100644 Assets/Plugins/x86/KinectUnityAddin.dll.meta create mode 100644 Assets/Plugins/x86_64/KinectUnityAddin.dll.meta create mode 100644 Assets/Resources/MotionNotes.meta create mode 100644 Assets/Resources/MotionNotes/HOS.png create mode 100644 Assets/Resources/MotionNotes/HOS.png.meta diff --git a/Assets/Plugins/Metro/KinectUnityAddin.dll.meta b/Assets/Plugins/Metro/KinectUnityAddin.dll.meta new file mode 100644 index 0000000..07b7a9d --- /dev/null +++ b/Assets/Plugins/Metro/KinectUnityAddin.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 85bafbe9b14b18b45b445b304b1f3efc +timeCreated: 18446744011573954816 +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 1 + settings: + CPU: x86 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/x86/KinectUnityAddin.dll.meta b/Assets/Plugins/x86/KinectUnityAddin.dll.meta new file mode 100644 index 0000000..5d27710 --- /dev/null +++ b/Assets/Plugins/x86/KinectUnityAddin.dll.meta @@ -0,0 +1,97 @@ +fileFormatVersion: 2 +guid: b65facb0c9c68b647b8ca7435b5f35c4 +timeCreated: 18446744011573954816 +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 1 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: x86 + DefaultValueInitialized: true + data: + first: + Facebook: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: x86 + data: + first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: x86 + data: + first: + Standalone: OSXIntel + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXIntel64 + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: x86 + data: + first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/x86_64/KinectUnityAddin.dll.meta b/Assets/Plugins/x86_64/KinectUnityAddin.dll.meta new file mode 100644 index 0000000..309cf06 --- /dev/null +++ b/Assets/Plugins/x86_64/KinectUnityAddin.dll.meta @@ -0,0 +1,97 @@ +fileFormatVersion: 2 +guid: 82e143d16729051459ae6a54b37e9eab +timeCreated: 18446744011573954816 +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 1 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: x86_64 + DefaultValueInitialized: true + data: + first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: None + data: + first: + Facebook: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: Linux + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + data: + first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: x86_64 + data: + first: + Standalone: OSXIntel + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: OSXIntel64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: x86_64 + data: + first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Motion Sample Display.prefab b/Assets/Resources/Motion Sample Display.prefab index 2014616..f3d15d9 100644 --- a/Assets/Resources/Motion Sample Display.prefab +++ b/Assets/Resources/Motion Sample Display.prefab @@ -81,7 +81,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1892747765238962} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4171896903265876} @@ -94,7 +94,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1531738911155356} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4171896903265876} diff --git a/Assets/Resources/MotionNotes.meta b/Assets/Resources/MotionNotes.meta new file mode 100644 index 0000000..c2f4d59 --- /dev/null +++ b/Assets/Resources/MotionNotes.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 5fa6fbae1b887c741847a319ae0ae7b5 +folderAsset: yes +timeCreated: 1503591523 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/MotionNotes/HOS.png b/Assets/Resources/MotionNotes/HOS.png new file mode 100644 index 0000000000000000000000000000000000000000..30e7e0cf04e57135f8854d7a06e01d279616d02c GIT binary patch literal 20726 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/MotionNotes/HOS.png.meta b/Assets/Resources/MotionNotes/HOS.png.meta new file mode 100644 index 0000000..32152ef --- /dev/null +++ b/Assets/Resources/MotionNotes/HOS.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: eaf650b1e6fa62148bca440563b186a6 +timeCreated: 1503591523 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/JudgeManager.cs b/Assets/Script/JudgeManager.cs index 3e7e80f..b2908f2 100644 --- a/Assets/Script/JudgeManager.cs +++ b/Assets/Script/JudgeManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.UI; @@ -152,13 +153,14 @@ public class JudgeManager : MonoBehaviour smnote.MotionSampleDisplay = msd; activatedNotes.Add(smnote); } - - foreach (MotionNote note in activatedNotes) + + for(int i=activatedNotes.Count-1;i>=0;i--) { - if(note.MotionSampleDisplay == null) + MotionNote note = activatedNotes[i]; + if (note.FinalJudgeAction() || elapsedTime > note.EndTiming + Judge.MISS.MotionTimingRange) { - SetJudge(Judge.TestJudge(note, timing)); - activatedNotes.Remove(note); + SetJudge(Judge.TestJudge(note, timing, true)); + activatedNotes.RemoveAt(i); DeactivateNote(note); } } @@ -195,10 +197,13 @@ public class JudgeManager : MonoBehaviour { if (!judge.IsBreak) GameManager.Instance.Combo++; + else + GameManager.Instance.Combo = 0; GameManager.Instance.Score += judge.Score; GameManager.Instance.JudgeCount[judge]++; Debug.Log(judge.Name + (isMotion ? " Motion" : " Note")); + Debug.Log(GameManager.Instance.Combo); judgeText.SetActive(true); judgeText.GetComponent<Text>().text = judge.Name; diff --git a/Assets/Script/MotionSampleDisplay.cs b/Assets/Script/MotionSampleDisplay.cs index 6f096ba..fad535b 100644 --- a/Assets/Script/MotionSampleDisplay.cs +++ b/Assets/Script/MotionSampleDisplay.cs @@ -2,39 +2,48 @@ using System.Collections.Generic; using UnityEngine; -public class MotionSampleDisplay : MonoBehaviour { +public class MotionSampleDisplay : MonoBehaviour +{ [SerializeField] GameObject left, right; - + public Sprite sprite; public float timeout; public MotionNote caller; private float elapsedTime; - private float parameter; + private float velocity; + private float acceleration; + + private float distance = 2f; // Use this for initialization void Start() { elapsedTime = 0f; - parameter = 0f; + velocity = 0f; + acceleration = 2 * distance / Mathf.Pow(timeout, 2); left.GetComponent<SpriteRenderer>().sprite = sprite; right.GetComponent<SpriteRenderer>().sprite = sprite; + + left.transform.Translate(-distance, 0, 0); + right.transform.Translate(distance, 0, 0); } - + // Update is called once per frame - void Update() + void Update() { - elapsedTime += Time.deltaTime * 1000; - if (elapsedTime > timeout / 2f) - parameter = (elapsedTime - timeout / 2f) / timeout; + float delta = Time.deltaTime * 1000f; + elapsedTime += delta; + velocity = acceleration * elapsedTime; + if (elapsedTime > timeout) { Destroy(gameObject); } - left.transform.Translate(new Vector3(parameter, 0)); - right.transform.Translate(new Vector3(-parameter, 0)); + left.transform.Translate(new Vector3(velocity * delta, 0)); + right.transform.Translate(new Vector3(-velocity * delta, 0)); } -} +} \ No newline at end of file -- 2.22.0