19050-Frozen2
/
Project_2018_Frozen
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update color and snowflake behavior

Browse Source 
update UnityUtils version
master
uc deploy 8 years ago
parent c7191127a2
commit ce111fbefd
4 changed files with 178 additions and 144 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Unity_2018_Frozen/Assets/Frozen/DayCosineGradient.asset
  2. 274
      Unity_2018_Frozen/Assets/Frozen/Frozen.unity
  3. 40
      Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs
  4. 2
      Unity_2018_Frozen/Assets/UnityUtils

6
Unity_2018_Frozen/Assets/Frozen/DayCosineGradient.asset
Unescape View File

@ -11,6 +11,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 54276434dda9c694e85abaf98cdd981d, type: 3}
m_Name: DayCosineGradient
m_EditorClassIdentifier:
_redCoeffs: {x: 0.06, y: 0.164, z: 0.37, w: 0}
_greenCoeffs: {x: 0.112, y: 0.493, z: 0.29, w: 1}
_blueCoeffs: {x: 0.467, y: 0.31, z: 0.36, w: 0}
_redCoeffs: {x: 0.19, y: 0.355, z: 0.37, w: 0}
_greenCoeffs: {x: 0.174, y: 0.654, z: 0.29, w: 1}
_blueCoeffs: {x: 0.467, y: 0.483, z: 0.36, w: 0}

274
Unity_2018_Frozen/Assets/Frozen/Frozen.unity
Unescape View File

@ -1231,6 +1231,136 @@ MonoBehaviour:
PlayOnStart: 1
Looping: 1
AudioVolume: 1
--- !u!43 &269047436
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 &276089015
GameObject:
m_ObjectHideFlags: 0
@ -1583,11 +1713,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
clip: {fileID: 11400000, guid: ff53ec8ce37139a4eb553b1d7fcd2837, type: 2}
kinect: {fileID: 712882417}
triggerRadius: 1.6
triggerRadius: 0.8
stopTime: 10
cooldown: 30
offset: 1.5
breakProgress: 0.1
breakProgress: 0.2
onPlay:
m_PersistentCalls:
m_Calls:
@ -1604,6 +1734,8 @@ MonoBehaviour:
m_CallState: 2
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
mode: 0
info:
--- !u!1 &368967883
GameObject:
m_ObjectHideFlags: 0
@ -2256,7 +2388,7 @@ MonoBehaviour:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 520040865}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 542c4b2aee71a0142928f8b82f70141f, type: 3}
m_Name:
@ -5228,7 +5360,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
folder: FrozenMaterial\sound\sfx
filenames: []
volumeScale: 0.5
volumeScale: 0.8
onPlayFinished:
m_PersistentCalls:
m_Calls: []
@ -5425,7 +5557,7 @@ MeshFilter:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1379541361}
m_Mesh: {fileID: 1441874011}
m_Mesh: {fileID: 269047436}
--- !u!1 &1390635887
GameObject:
m_ObjectHideFlags: 0
@ -5580,136 +5712,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1395728836}
--- !u!43 &1441874011
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 &1443956512
GameObject:
m_ObjectHideFlags: 0
@ -6985,7 +6987,7 @@ MonoBehaviour:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1817143146}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 542c4b2aee71a0142928f8b82f70141f, type: 3}
m_Name:

40
Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs
Unescape View File

@ -39,6 +39,10 @@ namespace UltraCombos.Frozen
public UnityEvent onPlay = new UnityEvent();
[SerializeField, Header("Debug")]
bool mode = false;
public string info;
private void Start()
{
root = transform.position;
@ -58,12 +62,22 @@ namespace UltraCombos.Frozen
player.Load();
}
player.Pause();
player.Frame = 0;
if (flow != null)
StopCoroutine(flow);
//flow = StartCoroutine(Flow());
}
private void Update()
{
if (mode == false)
return;
}
private void FixedUpdate()
{
if (SceneController.Instance.rate > 0.5f)
@ -100,15 +114,31 @@ namespace UltraCombos.Frozen
{
float video_stamp = 0.0f;
float progress = 0.0f;
uint pause_frame = 20;
float pause_progress = (float)pause_frame / player.TotalNumFrames;
is_cooling = false;
video_stamp = Time.time;
progress = 0.0f;
player.Pause();
player.Frame = 0;
//Debug.Log("Begin");
player.Play();
yield return null;
Debug.Log("Begin");
while (player.Frame < pause_frame)
{
Debug.Log("Loop");
yield return null;
}
player.Pause();
Debug.Log("Pause");
progress = (float)player.Frame / player.TotalNumFrames;
yield return null;
Debug.Log("Wait");
while (progress < breakProgress)
{
if (mode) info = $"{progress}";
var pos = kinect.averagePositinon;
float dist = new Vector2(pos.x - transform.position.x, pos.z - transform.position.z).magnitude;
@ -119,12 +149,14 @@ namespace UltraCombos.Frozen
}
else
{
progress = Mathf.Max(progress - 0.001f, 0.0f);
progress = Mathf.Max(progress - 0.001f, pause_progress);
}
player.Frame = (uint)(player.TotalNumFrames * progress);
yield return null;
}
if (mode) info = $"{progress}";
//Debug.Log("Play the rest");
player.Play();
onPlay.Invoke();

2
Unity_2018_Frozen/Assets/UnityUtils

@ -1 +1 @@
Subproject commit 21f528b6c6e9746ba82259065ea299672602a1de
Subproject commit 399e54f2e5cdc9c908eacaeaf2f893cf86531039
Write Preview
Loading…
Cancel
Save