From 459a835016379abd23458b5ac097a5fc0de8b505 Mon Sep 17 00:00:00 2001 From: uc deploy Date: Sat, 23 Jun 2018 14:40:25 +0800 Subject: [PATCH] add MKInputModule for unfocused key event (Up/Down) --- Unity_2018_Frozen/Assets/Frozen/Frozen.unity | 277 +++++++++--------- .../Assets/Frozen/Script/SceneController.cs | 26 +- 2 files changed, 162 insertions(+), 141 deletions(-) diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index 02d9c28..5fbce9c 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1071731254} - m_IndirectSpecularColor: {r: 0.021216419, g: 0.053037524, b: 0.08577964, a: 1} + m_IndirectSpecularColor: {r: 0.021216419, g: 0.053037528, b: 0.08577964, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -525,136 +525,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 66098174} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!43 &82258960 -Mesh: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: 'Space Ground Mesh: (8x5x3)' - serializedVersion: 8 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 24 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_MeshCompression: 0 - m_IsReadable: 0 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 - m_Skin: [] - m_VertexData: - m_CurrentChannels: 11 - m_VertexCount: 16 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 512 - _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshOptimized: 0 --- !u!1 &96822205 GameObject: m_ObjectHideFlags: 0 @@ -1066,6 +936,12 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 182553293} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &197334246 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114569137293014918, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 2} + m_PrefabInternal: {fileID: 617692218} + m_Script: {fileID: 11500000, guid: fe29c1405d598044db227a4b345e815d, type: 3} --- !u!1 &199010597 GameObject: m_ObjectHideFlags: 0 @@ -1439,7 +1315,7 @@ MonoBehaviour: kinectOpticalFlow: {fileID: 1848145251} smokeFluidSim: {fileID: 774429923} particleViewerMesh: {fileID: 776169031} - rate: 0.0002 + rate: 0.0005 debug: --- !u!1 &351311318 GameObject: @@ -2175,6 +2051,136 @@ MonoBehaviour: uniform: {fileID: 11400000, guid: 43473f0506b1ba64c86ae17dd11d902a, type: 2} subUniform: {fileID: 11400000, guid: 54b82be1afe58664c8daeb575db89094, type: 2} rate: 0 +--- !u!43 &449788967 +Mesh: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: 'Space Ground Mesh: (8x5x3)' + serializedVersion: 8 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 24 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 16 + localAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_MeshCompression: 0 + m_IsReadable: 0 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 + m_Skin: [] + m_VertexData: + m_CurrentChannels: 11 + m_VertexCount: 16 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 512 + _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshOptimized: 0 --- !u!1 &459917734 GameObject: m_ObjectHideFlags: 0 @@ -2643,7 +2649,7 @@ Prefab: - target: {fileID: 114569137293014918, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} @@ -4585,7 +4591,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1216863871} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.03, y: 0, z: 2.49} + m_LocalPosition: {x: 1.38, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1329758487} @@ -5278,7 +5284,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 82258960} + m_Mesh: {fileID: 449788967} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -7636,6 +7642,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d657b4acfe92b2949ba98770de6f12ad, type: 3} m_Name: m_EditorClassIdentifier: + inputModule: {fileID: 197334246} state: 0 rate: 0 uniform: {fileID: 441718965} diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs index f15db9e..e69803a 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs @@ -14,6 +14,8 @@ namespace UltraCombos.Frozen public class SceneController : Singleton { + [SerializeField] + GlobalMKHookInput inputModule; public State state = State.Standby; [Range(0, 1)] @@ -82,7 +84,7 @@ namespace UltraCombos.Frozen if (state == State.Standby) { target_rate = 0.0f; - if (Input.GetKeyDown(KeyCode.PageDown)) + if (GetKeyDown(KeyCode.DownArrow)) { GoDay(); } @@ -90,11 +92,11 @@ namespace UltraCombos.Frozen else if (state == State.Day) { target_rate = 0.0f; - if (Input.GetKeyDown(KeyCode.PageUp)) + if (GetKeyDown(KeyCode.UpArrow)) { GoStandby(); } - else if (Input.GetKeyDown(KeyCode.PageDown)) + else if (GetKeyDown(KeyCode.DownArrow)) { GoNight(); } @@ -102,11 +104,11 @@ namespace UltraCombos.Frozen else if (state == State.Night) { target_rate = 1.0f; - if (Input.GetKeyDown(KeyCode.PageUp)) + if (GetKeyDown(KeyCode.UpArrow)) { GoStandby(); } - else if (Input.GetKeyDown(KeyCode.PageDown)) + else if (GetKeyDown(KeyCode.DownArrow)) { GoStandby(); } @@ -130,6 +132,19 @@ namespace UltraCombos.Frozen } } + + private bool GetKeyDown(KeyCode key) + { + if (Application.isFocused) + { + return Input.GetKeyDown(key); + } + else + { + return inputModule.GetButtonDown(key.ToString()); + } + } + public void GoStandby() { state = State.Standby; @@ -149,7 +164,6 @@ namespace UltraCombos.Frozen onSceneNight.Invoke(); } - } }