From 89f7009ccff6b6900d04bc758c7e9ddf03121f08 Mon Sep 17 00:00:00 2001 From: uc-hoba Date: Tue, 22 May 2018 17:06:21 +0800 Subject: [PATCH] refine GiantSnowflake --- Unity_2018_Frozen/Assets/Frozen/Frozen.unity | 273 +++++++++--------- .../Assets/Frozen/Script/GiantSnowflake.cs | 15 +- .../Frozen/Texture/Effect/Floor_Effect.png | 4 +- 3 files changed, 150 insertions(+), 142 deletions(-) diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index e125515..347b407 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -1091,6 +1091,7 @@ MonoBehaviour: clip: {fileID: 11400000, guid: ff53ec8ce37139a4eb553b1d7fcd2837, type: 2} kinect: {fileID: 712882417} triggerRadius: 1.6 + stopTime: 10 cooldown: 30 offset: 1.5 breakProgress: 0.1 @@ -2903,136 +2904,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1000268178} ---- !u!43 &1034956403 -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 &1035960133 GameObject: m_ObjectHideFlags: 0 @@ -3455,7 +3326,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1216863871} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.741, y: 0, z: 2.49} + m_LocalPosition: {x: 1.32, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1329758487} @@ -4121,7 +3992,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 1034956403} + m_Mesh: {fileID: 2128676547} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -4557,7 +4428,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1690794384} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.92, y: 0, z: 2.49} + m_LocalPosition: {x: 2.955, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1061158672} @@ -5968,15 +5839,11 @@ MonoBehaviour: particleViewer: {fileID: 1035960135} dayParticleRate: 0.1 dayCharacters: - - {fileID: 1906326619} - - {fileID: 1933714483} - - {fileID: 1690794387} - {fileID: 459917737} nightCharacters: - {fileID: 1216863874} - - {fileID: 1973785474} - - {fileID: 1984882819} - {fileID: 1225287935} + - {fileID: 1984882819} onSceneStandby: m_PersistentCalls: m_Calls: @@ -6143,3 +6010,133 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2086317000} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!43 &2128676547 +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 diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs index 9b65588..c7266af 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs @@ -21,8 +21,12 @@ namespace UltraCombos.Frozen [SerializeField] float triggerRadius = 1.5f; + [SerializeField] + float stopTime = 2.0f; + [SerializeField] float cooldown = 2.0f; + bool is_cooling = false; [SerializeField] float offset = 1.5f; @@ -64,7 +68,7 @@ namespace UltraCombos.Frozen { if (SceneController.Instance.rate > 0.5f) { - alpha = Mathf.Lerp(alpha, 1.0f, smooth); + alpha = Mathf.Lerp(alpha, is_cooling ? 0.0f : 1.0f, smooth); } else { @@ -96,7 +100,8 @@ namespace UltraCombos.Frozen { float video_stamp = 0.0f; float progress = 0.0f; - + + is_cooling = false; video_stamp = Time.time; progress = 0.0f; player.Pause(); @@ -128,6 +133,12 @@ namespace UltraCombos.Frozen yield return null; } + + player.Pause(); + player.Frame = player.TotalNumFrames; + yield return new WaitForSeconds(stopTime); + + is_cooling = true; yield return new WaitForSeconds(cooldown); transform.position = root + new Vector3(Random.Range(-offset, offset), 0, 0); diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Floor_Effect.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Floor_Effect.png index 2d00b93..70d5928 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Floor_Effect.png +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Floor_Effect.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e55c3ab32701d92874d2680067a31ccf8ad57727a3ee968235c0c3d5fb738673 -size 1128553 +oid sha256:329259f82f4a49e98d7182e8a38daaee4a2285f43f8543028b6cacd1ad43aa39 +size 1184513