master
uc deploy 8 years ago
parent b413ae528a
commit 988eabbda6
  1. 262
      Unity_2018_Frozen/Assets/Frozen/Frozen.unity
  2. 2
      Unity_2018_Frozen/Assets/Frozen/FrozenNightParticleUniforms.asset
  3. 2
      Unity_2018_Frozen/Assets/Frozen/Material/Point.mat
  4. 2
      Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs
  5. 4
      Unity_2018_Frozen/Assets/Frozen/Script/TouchArea.cs
  6. 2
      Unity_2018_Frozen/Assets/Frozen/Shader/SnowflakeParticleUpdate.compute

@ -6015,7 +6015,7 @@ MeshFilter:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1379541361} m_GameObject: {fileID: 1379541361}
m_Mesh: {fileID: 1779781707} m_Mesh: {fileID: 1642894614}
--- !u!114 &1379541365 --- !u!114 &1379541365
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6757,6 +6757,136 @@ MeshFilter:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1561705233} m_GameObject: {fileID: 1561705233}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!43 &1642894614
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 &1674052466 --- !u!1 &1674052466
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -7448,136 +7578,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1774693141} m_GameObject: {fileID: 1774693141}
--- !u!43 &1779781707
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 &1783570512 --- !u!1 &1783570512
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

@ -18,7 +18,7 @@ MonoBehaviour:
lifeDuration: 5 lifeDuration: 5
lifeVariation: 0 lifeVariation: 0
convergence: 0 convergence: 0
homeStrength: 0.586 homeStrength: 0.63
noiseStrength: 0.055 noiseStrength: 0.055
noiseSeed: 0.5 noiseSeed: 0.5
noiseTimeScale: 1 noiseTimeScale: 1

@ -69,7 +69,7 @@ Material:
- _DistortionStrength: 1 - _DistortionStrength: 1
- _DistortionStrengthScaled: 0 - _DistortionStrengthScaled: 0
- _DstBlend: 0 - _DstBlend: 0
- _Emission: 0 - _Emission: 1.01
- _EmissionEnabled: 0 - _EmissionEnabled: 0
- _FlipbookMode: 0 - _FlipbookMode: 0
- _GlossMapScale: 1 - _GlossMapScale: 1

@ -174,7 +174,7 @@ namespace UltraCombos.Frozen
float dist = new Vector2(samples[i].x - transform.position.x, samples[i].z - transform.position.z).magnitude; float dist = new Vector2(samples[i].x - transform.position.x, samples[i].z - transform.position.z).magnitude;
if (dist < triggerRadius) if (dist < triggerRadius)
{ {
Debug.Log("is_hit"); //Debug.Log("is_hit");
progress += 0.001f; progress += 0.001f;
is_hit = true; is_hit = true;
break; break;

@ -40,6 +40,7 @@ public class TouchArea : MonoBehaviour ,IPointerDownHandler,IDragHandler,IPointe
if (skip_on_mouse_only(eventData)) if (skip_on_mouse_only(eventData))
return; return;
PointerDown.Invoke(eventData); PointerDown.Invoke(eventData);
//Debug.Log("OnPointerDown");
} }
public void OnDrag(PointerEventData eventData) public void OnDrag(PointerEventData eventData)
@ -49,6 +50,7 @@ public class TouchArea : MonoBehaviour ,IPointerDownHandler,IDragHandler,IPointe
if (skip_on_mouse_only(eventData)) if (skip_on_mouse_only(eventData))
return; return;
PointerDrag.Invoke(eventData); PointerDrag.Invoke(eventData);
//Debug.Log("OnDrag");
} }
public void OnPointerUp(PointerEventData eventData) public void OnPointerUp(PointerEventData eventData)
{ {
@ -57,6 +59,7 @@ public class TouchArea : MonoBehaviour ,IPointerDownHandler,IDragHandler,IPointe
if (skip_on_mouse_only(eventData)) if (skip_on_mouse_only(eventData))
return; return;
PointerUp.Invoke(eventData); PointerUp.Invoke(eventData);
//Debug.Log("OnPointerUp");
} }
public void OnPointerExit(PointerEventData eventData) public void OnPointerExit(PointerEventData eventData)
@ -67,6 +70,7 @@ public class TouchArea : MonoBehaviour ,IPointerDownHandler,IDragHandler,IPointe
return; return;
PointerExit.Invoke(eventData); PointerExit.Invoke(eventData);
//Debug.Log("OnPointerExit");
} }
private bool skip_on_mouse_only(PointerEventData eventData) private bool skip_on_mouse_only(PointerEventData eventData)
{ {

@ -67,7 +67,7 @@ void CSMain(uint3 id : SV_DispatchThreadID)
p.position = home_position.xyz; p.position = home_position.xyz;
p.color.rgb = float3(1, 1, 1); p.color.rgb = float3(1, 1, 1);
//p.velocity = home_velocity.xyz * 20.0f * pow(length(home_velocity.xyz), 2.0f); //p.velocity = home_velocity.xyz * 20.0f * pow(length(home_velocity.xyz), 2.0f);
p.velocity = home_velocity.xyz * 100.0f * uni.homeStrength; p.velocity = home_velocity.xyz * 100.0f;// * uni.homeStrength;
//p.velocity = forceDirection * 3.0f; //p.velocity = forceDirection * 3.0f;
} }
p.life = current_life / duration; p.life = current_life / duration;

Loading…
Cancel
Save