diff --git a/Unity_2018_Frozen/Assets/Frozen/DayCosineGradient.asset b/Unity_2018_Frozen/Assets/Frozen/DayCosineGradient.asset
index 5496dce..f6f394d 100644
--- a/Unity_2018_Frozen/Assets/Frozen/DayCosineGradient.asset
+++ b/Unity_2018_Frozen/Assets/Frozen/DayCosineGradient.asset
@@ -11,6 +11,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 54276434dda9c694e85abaf98cdd981d, type: 3}
m_Name: DayCosineGradient
m_EditorClassIdentifier:
- _redCoeffs: {x: 0.081, y: 0.054, z: 1.56, w: 0.453}
- _greenCoeffs: {x: 0.318, y: 0.237, z: 1.35, w: 0.825}
- _blueCoeffs: {x: 0.836, y: 0.131, z: 1.96, w: 0}
+ _redCoeffs: {x: 0, y: 0, z: 0, w: 0}
+ _greenCoeffs: {x: 0.318, y: 0.244, z: 0.51, w: 0.825}
+ _blueCoeffs: {x: 0.743, y: 0.217, z: 0.36, w: 0}
diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity
index 675c147..f27c073 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.053037528, b: 0.08577964, a: 1}
+ m_IndirectSpecularColor: {r: 0.021216419, g: 0.053037524, b: 0.08577964, a: 1}
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
@@ -200,7 +200,7 @@ Transform:
m_LocalScale: {x: 1.084297, y: 1.0842984, z: 1.0842984}
m_Children: []
m_Father: {fileID: 199010598}
- m_RootOrder: 8
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &147055506
Rigidbody:
@@ -234,13 +234,14 @@ MonoBehaviour:
area: 0
AppearArea: 0000000001000000
wallRoi: {x: 0, y: 0}
- heightRange: {x: 0, y: 0.1}
fakeButton: {fileID: 0}
standbyClip: {fileID: 11400000, guid: 52eefee2f9118e04bbb195c0e27b0fc5, type: 2}
triggerClip: {fileID: 11400000, guid: 727d0f386e383414ca58642076340e45, type: 2}
players: []
color: {r: 1, g: 1, b: 1, a: 1}
videoStopTime: 1.5
+ specificPositions: []
+ roaming: 0
isTriggerCollider: 0
--- !u!23 &147055508
MeshRenderer:
@@ -573,17 +574,18 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 1.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 448655417}
- - {fileID: 411383573}
- {fileID: 1906326617}
+ - {fileID: 147055505}
+ - {fileID: 411383573}
- {fileID: 1933714481}
- {fileID: 1690794385}
- {fileID: 461690049}
- {fileID: 459917735}
- {fileID: 1878556046}
- - {fileID: 147055505}
- {fileID: 1973785472}
- {fileID: 1216863872}
+ - {fileID: 701848340}
+ - {fileID: 1956154491}
m_Father: {fileID: 338663765}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -709,7 +711,7 @@ MonoBehaviour:
kinectOpticalFlow: {fileID: 1848145251}
smokeFluidSim: {fileID: 774429923}
particleViewerMesh: {fileID: 776169031}
- rate: 0.001
+ rate: 0.0002
debug:
--- !u!1 &368474576
GameObject:
@@ -812,8 +814,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
kinect: {fileID: 712882417}
- triggerRadius: 1
- cooldown: 5
+ triggerRadius: 1.5
+ cooldown: 10
breakProgress: 0.1
--- !u!114 &368474582
MonoBehaviour:
@@ -971,7 +973,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 199010598}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &432509337
GameObject:
@@ -1142,49 +1144,6 @@ MonoBehaviour:
uniform: {fileID: 11400000, guid: 43473f0506b1ba64c86ae17dd11d902a, type: 2}
subUniform: {fileID: 11400000, guid: 54b82be1afe58664c8daeb575db89094, type: 2}
rate: 0
---- !u!1 &448655416
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 448655417}
- - component: {fileID: 448655418}
- m_Layer: 8
- m_Name: Ruler
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &448655417
-Transform:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 448655416}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -0.25, y: 1.171, z: 2.49}
- m_LocalScale: {x: 8.11, y: 1.29, z: 1}
- m_Children: []
- m_Father: {fileID: 199010598}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!64 &448655418
-MeshCollider:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 448655416}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 0
- serializedVersion: 3
- m_Convex: 1
- m_CookingOptions: 14
- m_SkinWidth: 0.01
- m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &459917734
GameObject:
m_ObjectHideFlags: 0
@@ -1250,13 +1209,14 @@ MonoBehaviour:
area: 0
AppearArea: 0000000001000000
wallRoi: {x: 0, y: 0}
- heightRange: {x: 0, y: 0.1}
fakeButton: {fileID: 0}
standbyClip: {fileID: 11400000, guid: 5b3dac91b0ced2a46b0785831655c98a, type: 2}
triggerClip: {fileID: 11400000, guid: 708f87d2cbae42445846a25f0ca06829, type: 2}
players: []
color: {r: 1, g: 1, b: 1, a: 1}
videoStopTime: 1.5
+ specificPositions: []
+ roaming: 0
isTriggerCollider: 0
--- !u!23 &459917738
MeshRenderer:
@@ -1378,13 +1338,14 @@ MonoBehaviour:
area: 0
AppearArea: 02000000
wallRoi: {x: 0, y: 0}
- heightRange: {x: 0, y: 0.1}
fakeButton: {fileID: 0}
standbyClip: {fileID: 11400000, guid: 0dfbbcfb9e891fe49874e63122982159, type: 2}
triggerClip: {fileID: 11400000, guid: 0aa239f497b53734eb6adca529ab6225, type: 2}
players: []
color: {r: 1, g: 1, b: 1, a: 1}
videoStopTime: 1.5
+ specificPositions: []
+ roaming: 0
isTriggerCollider: 0
--- !u!23 &461690052
MeshRenderer:
@@ -1711,6 +1672,136 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &701848339
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 701848340}
+ - component: {fileID: 701848345}
+ - component: {fileID: 701848343}
+ - component: {fileID: 701848342}
+ - component: {fileID: 701848341}
+ - component: {fileID: 701848346}
+ m_Layer: 8
+ m_Name: Marshmallow (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &701848340
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 701848339}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -0, y: 2.06, z: 2.49}
+ m_LocalScale: {x: 4.5145497, y: 4.5145497, z: 4.5145497}
+ m_Children: []
+ m_Father: {fileID: 199010598}
+ m_RootOrder: 10
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!54 &701848341
+Rigidbody:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 701848339}
+ serializedVersion: 2
+ m_Mass: 1
+ m_Drag: 0
+ m_AngularDrag: 0.05
+ m_UseGravity: 0
+ m_IsKinematic: 0
+ m_Interpolate: 0
+ m_Constraints: 0
+ m_CollisionDetection: 0
+--- !u!114 &701848342
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 701848339}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ standby: 1
+ disappearTime: 5
+ mat: {fileID: 0}
+ area: 0
+ AppearArea: 01000000
+ wallRoi: {x: 0, y: 0}
+ fakeButton: {fileID: 0}
+ standbyClip: {fileID: 11400000, guid: 1691548c0a5a4494ba5e2c29ec477d7d, type: 2}
+ triggerClip: {fileID: 11400000, guid: 6ccf813116f07944faf4af6bc3b2c1f7, type: 2}
+ players: []
+ color: {r: 1, g: 1, b: 1, a: 1}
+ videoStopTime: 1.5
+ specificPositions:
+ - {fileID: 1673273259}
+ - {fileID: 1212561365}
+ - {fileID: 1256123372}
+ roaming: 5.11
+ isTriggerCollider: 0
+--- !u!23 &701848343
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 701848339}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 26431f824b7c8384bbc23c36bd054e2b, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 1
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!33 &701848345
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 701848339}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!65 &701848346
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 701848339}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 1
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 1, z: 0.1}
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &712882415
GameObject:
m_ObjectHideFlags: 0
@@ -2749,6 +2840,90 @@ MonoBehaviour:
fromGradient: {fileID: 11400000, guid: dc41f63c436894340a6736facd7dd4a9, type: 2}
toGradient: {fileID: 11400000, guid: 64901b7b2c93cde4fa631ba16f78157c, type: 2}
rate: 0
+--- !u!1 &1212561363
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 1212561364}
+ - component: {fileID: 1212561369}
+ - component: {fileID: 1212561367}
+ - component: {fileID: 1212561365}
+ m_Layer: 8
+ m_Name: Marshmallow (3)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &1212561364
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1212561363}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -1.58, y: 2.06, z: 2.49}
+ m_LocalScale: {x: 4.5145497, y: 4.5145497, z: 4.5145497}
+ m_Children: []
+ m_Father: {fileID: 1956154491}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1212561365
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1212561363}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ area: 2
+--- !u!23 &1212561367
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1212561363}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 26431f824b7c8384bbc23c36bd054e2b, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 1
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!33 &1212561369
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1212561363}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1216863871
GameObject:
m_ObjectHideFlags: 0
@@ -2780,7 +2955,7 @@ Transform:
m_LocalScale: {x: 4.514552, y: 4.514552, z: 4.514552}
m_Children: []
m_Father: {fileID: 199010598}
- m_RootOrder: 10
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &1216863873
Rigidbody:
@@ -2814,13 +2989,14 @@ MonoBehaviour:
area: 0
AppearArea: 02000000
wallRoi: {x: 0, y: 0}
- heightRange: {x: 0, y: 0.1}
fakeButton: {fileID: 0}
standbyClip: {fileID: 11400000, guid: 1691548c0a5a4494ba5e2c29ec477d7d, type: 2}
triggerClip: {fileID: 11400000, guid: 6ccf813116f07944faf4af6bc3b2c1f7, type: 2}
players: []
color: {r: 1, g: 1, b: 1, a: 1}
videoStopTime: 1.5
+ specificPositions: []
+ roaming: 0
isTriggerCollider: 0
--- !u!23 &1216863875
MeshRenderer:
@@ -2944,6 +3120,90 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1227078084}
+--- !u!1 &1256123370
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 1256123371}
+ - component: {fileID: 1256123376}
+ - component: {fileID: 1256123374}
+ - component: {fileID: 1256123372}
+ m_Layer: 8
+ m_Name: Marshmallow (4)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &1256123371
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1256123370}
+ m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068}
+ m_LocalPosition: {x: 4, y: 2.33, z: -0.52}
+ m_LocalScale: {x: 4.5145516, y: 4.5145497, z: 4.5145516}
+ m_Children: []
+ m_Father: {fileID: 1956154491}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+--- !u!114 &1256123372
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1256123370}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ area: 1
+--- !u!23 &1256123374
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1256123370}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 26431f824b7c8384bbc23c36bd054e2b, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 1
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!33 &1256123376
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1256123370}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1283180266
GameObject:
m_ObjectHideFlags: 0
@@ -3131,6 +3391,90 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!1 &1673273257
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 1673273258}
+ - component: {fileID: 1673273263}
+ - component: {fileID: 1673273261}
+ - component: {fileID: 1673273259}
+ m_Layer: 8
+ m_Name: Marshmallow (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &1673273258
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1673273257}
+ m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
+ m_LocalPosition: {x: -4, y: 2.06, z: -0.18000007}
+ m_LocalScale: {x: 4.5145516, y: 4.5145497, z: 4.5145516}
+ m_Children: []
+ m_Father: {fileID: 1956154491}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+--- !u!114 &1673273259
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1673273257}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ area: 0
+--- !u!23 &1673273261
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1673273257}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 26431f824b7c8384bbc23c36bd054e2b, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 1
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!33 &1673273263
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1673273257}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1690794384
GameObject:
m_ObjectHideFlags: 0
@@ -3196,13 +3540,14 @@ MonoBehaviour:
area: 0
AppearArea: 02000000
wallRoi: {x: 0, y: 0}
- heightRange: {x: 0, y: 0.1}
fakeButton: {fileID: 0}
standbyClip: {fileID: 11400000, guid: dfdc3af2e37491840b05776ce71e1ca8, type: 2}
triggerClip: {fileID: 11400000, guid: a6af2089baf7ed8489a4e941dae4e928, type: 2}
players: []
color: {r: 1, g: 1, b: 1, a: 1}
videoStopTime: 1.5
+ specificPositions: []
+ roaming: 0
isTriggerCollider: 0
--- !u!23 &1690794388
MeshRenderer:
@@ -3709,7 +4054,7 @@ Transform:
m_GameObject: {fileID: 1848145249}
m_LocalRotation: {x: 0, y: -1, z: 0, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 810572922}
- {fileID: 563719737}
@@ -3736,6 +4081,7 @@ MonoBehaviour:
flipX: 0
clipMin: {x: -0.85, y: 0.3, z: 0}
clipMax: {x: 0.71, y: 0.45, z: 1.63}
+ kinectAmount: 1
fluidSimulation: {fileID: 774429923}
debug: 0
colorize: 1
@@ -3799,7 +4145,7 @@ Transform:
m_LocalScale: {x: 1.0161152, y: 1.0161152, z: 1.0161152}
m_Children: []
m_Father: {fileID: 199010598}
- m_RootOrder: 2
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &1906326618
Rigidbody:
@@ -3833,13 +4179,14 @@ MonoBehaviour:
area: 0
AppearArea: 000000000100000002000000
wallRoi: {x: 0, y: 0}
- heightRange: {x: 0, y: 0.1}
fakeButton: {fileID: 0}
standbyClip: {fileID: 11400000, guid: fb02941bf56531748886776e54c8f2d0, type: 2}
triggerClip: {fileID: 11400000, guid: 86cfefcea0dbaf349b192625aa06ef6a, type: 2}
players: []
color: {r: 1, g: 1, b: 1, a: 1}
videoStopTime: 1.5
+ specificPositions: []
+ roaming: 0
isTriggerCollider: 0
--- !u!23 &1906326620
MeshRenderer:
@@ -4027,13 +4374,14 @@ MonoBehaviour:
area: 0
AppearArea: 02000000
wallRoi: {x: 0, y: 0}
- heightRange: {x: 0, y: 0.1}
fakeButton: {fileID: 0}
standbyClip: {fileID: 11400000, guid: 6d7b66e288bf3924fbd7a716ae3ac255, type: 2}
triggerClip: {fileID: 11400000, guid: 2845fcd21d061464f8f97219a167ba7a, type: 2}
players: []
color: {r: 1, g: 1, b: 1, a: 1}
videoStopTime: 1.5
+ specificPositions: []
+ roaming: 0
isTriggerCollider: 0
--- !u!23 &1933714484
MeshRenderer:
@@ -4090,6 +4438,37 @@ MeshFilter:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1933714480}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &1956154490
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 1956154491}
+ m_Layer: 8
+ m_Name: dummy
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1956154491
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1956154490}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1673273258}
+ - {fileID: 1212561364}
+ - {fileID: 1256123371}
+ m_Father: {fileID: 199010598}
+ m_RootOrder: 11
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1973785471
GameObject:
m_ObjectHideFlags: 0
@@ -4121,7 +4500,7 @@ Transform:
m_LocalScale: {x: 2.0862558, y: 2.0862563, z: 2.0862563}
m_Children: []
m_Father: {fileID: 199010598}
- m_RootOrder: 9
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &1973785473
Rigidbody:
@@ -4155,13 +4534,14 @@ MonoBehaviour:
area: 0
AppearArea: 02000000
wallRoi: {x: 0, y: 0}
- heightRange: {x: 0, y: 0.1}
fakeButton: {fileID: 0}
standbyClip: {fileID: 11400000, guid: aa1bbb3d5a802fb47880c1cf0237dc60, type: 2}
triggerClip: {fileID: 11400000, guid: 2ea2925de6b8a934fa0ea7a7020103b1, type: 2}
players: []
color: {r: 1, g: 1, b: 1, a: 1}
videoStopTime: 1.5
+ specificPositions: []
+ roaming: 0
isTriggerCollider: 0
--- !u!23 &1973785475
MeshRenderer:
@@ -4355,6 +4735,7 @@ MonoBehaviour:
snowSize: 0.0164
snowMaterial: {fileID: 2100000, guid: 56457e5f2df74a44c933b2791da81324, type: 2}
cosineGradient: {fileID: 1167120024}
+ kinect: {fileID: 1848145251}
dayCharacters:
- {fileID: 1906326619}
- {fileID: 1933714483}
diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat
index e734e1a..993d281 100644
--- a/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat
+++ b/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat
@@ -8,13 +8,13 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: Snowflake
m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0}
- m_ShaderKeywords: _ALPHATEST_ON
+ m_ShaderKeywords: _ALPHABLEND_ON _COLORADDSUBDIFF_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: 2450
+ m_CustomRenderQueue: 3000
stringTagMap:
- RenderType: TransparentCutout
+ RenderType: Transparent
disabledShaderPasses:
- ALWAYS
m_SavedProperties:
@@ -41,7 +41,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 6dc1e348a9a1d8340b408bdddc7a63f8, type: 3}
+ m_Texture: {fileID: 2800000, guid: 6625cf995276ee242843bd71eaa6aa38, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -62,23 +62,24 @@ Material:
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- - _ColorMode: 0
- - _Cull: 0
- - _Cutoff: 0.78
+ - _ColorMode: 1
+ - _Cull: 2
+ - _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- - _DstBlend: 0
+ - _DstBlend: 1
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.501
- _GlossyReflections: 1
+ - _InvFade: 1
- _LightingEnabled: 1
- _Metallic: 0
- - _Mode: 1
+ - _Mode: 4
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
@@ -86,12 +87,13 @@ Material:
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- - _SrcBlend: 1
+ - _SrcBlend: 5
- _UVSec: 0
- - _ZWrite: 1
+ - _ZWrite: 0
m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- - _Color: {r: 7, g: 7, b: 7, a: 1}
- - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
+ - _Color: {r: 3.713, g: 3.713, b: 3.713, a: 1}
+ - _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0.787, g: 0.787, b: 0.787, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
+ - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs
index c785164..7f4cfec 100644
--- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs
+++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs
@@ -20,7 +20,6 @@ public class CharacterBehaviour : MonoBehaviour
public List AppearArea = new List();
public Vector2 wallRoi;
- public Vector2 heightRange = new Vector2(0.0f, 0.5f);
float origin_height = 0.0f;
[SerializeField]
private RectTransform fakeButton;
@@ -37,6 +36,13 @@ public class CharacterBehaviour : MonoBehaviour
private const float checktriggerColliderTime = 0.5f;
private float triggerColliderTimer;
+
+ [SerializeField]
+ List specificPositions = new List();
+
+ [SerializeField, Range(0, 1)]
+ float roaming = 0.0f;
+ float roaming_seed = 0.0f;
private void Awake()
{
@@ -148,14 +154,23 @@ public class CharacterBehaviour : MonoBehaviour
{
if (!isTriggerCollider)
StartCoroutine(RandomPosNoTriggerOther());
- }
+ }
UpdateMaterial();
- if (!isSleep)
+ if (isSleep == false)
{
- if (!standby)
+ if (standby == false)
+ {
CheckPlayFinished();
+ }
+ else if (standby && roaming > 0.0f)
+ {
+ UpdateRoamingPosition();
+ UpdateWallRoiFromPosition();
+ UpdateButtonPos();
+ }
+
}
if (isTriggerCollider)
@@ -169,6 +184,31 @@ public class CharacterBehaviour : MonoBehaviour
isTriggerCollider = false;
}
+ void UpdateRoamingPosition()
+ {
+ float noise = Mathf.PerlinNoise(Time.time * 0.4f, roaming_seed) > 0.5f ? 1.0f : -1.0f;
+ noise *= roaming * Time.deltaTime;
+ float padding = transform.localScale.x * 0.5f;
+ Vector3 pos = transform.localPosition;
+ switch (area)
+ {
+ case Area.TopWall:
+ {
+ float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.length * 0.5f);
+ float x = Mathf.Clamp(pos.x + noise, -minmax, minmax);
+ transform.localPosition = new Vector3(x, pos.y, pos.z);
+ }
+ break;
+ case Area.LeftWall:
+ case Area.RightWall:
+ {
+ float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.width * 0.5f);
+ float z = Mathf.Clamp(pos.z + noise, -minmax, minmax);
+ transform.localPosition = new Vector3(pos.x, pos.y, z);
+ }
+ break;
+ }
+ }
void UpdateMaterial()
{
@@ -209,19 +249,6 @@ public class CharacterBehaviour : MonoBehaviour
RandomPos();
}
- void UpdatePos()
- {
- Vector3 n_pos = transform.localPosition;
- if (area == Area.TopWall)
- n_pos.x = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.length / 2, FrozenScreenToWorldSpace.Instance.length / 2, wallRoi.x);
- else
- n_pos.z = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.width / 2, FrozenScreenToWorldSpace.Instance.width / 2, wallRoi.x);
- n_pos.y = Mathf.Lerp(0, (float)FrozenScreenToWorldSpace.Instance.height, wallRoi.y);
- transform.localPosition = n_pos;
- SetButtonPos();
- }
-
-
void RandomPos()
{
Vector3 randomPos = transform.localPosition;
@@ -232,17 +259,44 @@ public class CharacterBehaviour : MonoBehaviour
else
wallRoi.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.width - minX) / FrozenScreenToWorldSpace.Instance.width;
- wallRoi.y = (origin_height + Random.Range(heightRange.x, heightRange.y)) / FrozenScreenToWorldSpace.Instance.height;
+ wallRoi.y = origin_height / FrozenScreenToWorldSpace.Instance.height;
UpdatePos();
- SetButtonPos();
+ UpdateButtonPos();
}
- void SetButtonPos()
+ void UpdatePos()
+ {
+ Vector3 n_pos = transform.localPosition;
+ if (area == Area.TopWall)
+ n_pos.x = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.length / 2, FrozenScreenToWorldSpace.Instance.length / 2, wallRoi.x);
+ else
+ n_pos.z = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.width / 2, FrozenScreenToWorldSpace.Instance.width / 2, wallRoi.x);
+ n_pos.y = Mathf.Lerp(0, (float)FrozenScreenToWorldSpace.Instance.height, wallRoi.y);
+ transform.localPosition = n_pos;
+ //SetButtonPos();
+ }
+
+ void UpdateButtonPos()
{
Vector2 newScreenPos = FrozenScreenToWorldSpace.Instance.GetFinalScreenPos(area, wallRoi);
fakeButton.anchoredPosition = newScreenPos;
}
+ void SetSpecificPos()
+ {
+ int pos_index = Random.Range(0, specificPositions.Count);
+ var dummy = specificPositions[pos_index];
+ area = dummy.area;
+ transform.position = dummy.transform.position;
+ transform.rotation = dummy.transform.rotation;
+ UpdateWallRoiFromPosition();
+ }
+
+ void UpdateWallRoiFromPosition()
+ {
+ wallRoi = FrozenScreenToWorldSpace.Instance.GetWallRoiFromPosition(area, transform.localPosition);
+ }
+
private void Trigger(PointerEventData data)
{
if (!standby || isSleep)
@@ -265,7 +319,7 @@ public class CharacterBehaviour : MonoBehaviour
standby = false;
isSleep = true;
yield return StartCoroutine(WaitVideoStopTimeFadeOut());
- yield return new WaitForSeconds(GetDisAppear());
+ yield return new WaitForSeconds(GetDisappear());
yield return StartCoroutine(RandomPosNoTriggerOther());
yield return StartCoroutine(WaitVideoStandbyFadeIn());
isSleep = false;
@@ -322,7 +376,7 @@ public class CharacterBehaviour : MonoBehaviour
}
- public float GetDisAppear()
+ public float GetDisappear()
{
float distime = disappearTime - Random.Range(0, disappearTime / 2);
distime = disappearTime * distime - distime * distime + 0.5f * distime;
@@ -331,13 +385,23 @@ public class CharacterBehaviour : MonoBehaviour
IEnumerator RandomPosNoTriggerOther()
{
- RandomAppearWall();
- yield return null;
- yield return new WaitForSeconds(0.1f);
- while (isTriggerCollider)
+ if (specificPositions.Count > 0)
{
- RandomAppearWall();
+ SetSpecificPos();
yield return null;
}
+ else
+ {
+ RandomAppearWall();
+ yield return new WaitForSeconds(0.1f);
+ while (isTriggerCollider)
+ {
+ RandomAppearWall();
+ yield return null;
+ }
+ }
+
+ roaming_seed = Random.Range(0.0f, 1.0f);
+ yield return null;
}
}
diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterDummy.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterDummy.cs
new file mode 100644
index 0000000..165042b
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterDummy.cs
@@ -0,0 +1,9 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CharacterDummy : MonoBehaviour
+{
+ public Area area;
+
+}
diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterDummy.cs.meta b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterDummy.cs.meta
new file mode 100644
index 0000000..a74f23e
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterDummy.cs.meta
@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: 86694b20cef756146b118abf35314f9b
+timeCreated: 1525876171
+licenseType: Free
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs b/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs
index 0f64d4e..8fe5d38 100644
--- a/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs
+++ b/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs
@@ -89,7 +89,7 @@ public class FrozenScreenToWorldSpace : MonoBehaviour {
return null;
}
- public Vector2 GetFinalScreenPos(Area area,Vector2 wallROI)
+ public Vector2 GetFinalScreenPos(Area area, Vector2 wallROI)
{
if(!RenderTextureROIList.ContainsKey(area))
return Vector2.zero;
@@ -99,7 +99,7 @@ public class FrozenScreenToWorldSpace : MonoBehaviour {
{
float x = textureROI.X + (1 - wallROI.y) * textureROI.ROI_X;
float y = textureROI.Y + (1 - wallROI.x) * textureROI.ROI_Y;
- currenPos = new Vector2(x,y);
+ currenPos = new Vector2(x, y);
}
if (area == Area.RightWall)
{
@@ -113,8 +113,34 @@ public class FrozenScreenToWorldSpace : MonoBehaviour {
float y = textureROI.Y + (1 - wallROI.y) * textureROI.ROI_Y;
currenPos = new Vector2(x, y);
}
- currenPos = new Vector2(currenPos.x * Screen.width,( 1 - currenPos.y) * Screen.height);
+ currenPos = new Vector2(currenPos.x * Screen.width, ( 1 - currenPos.y) * Screen.height);
return currenPos;
}
+ public Vector2 GetWallRoiFromPosition(Area area, Vector3 position)
+ {
+ Vector2 roi = Vector2.zero;
+ switch (area)
+ {
+ case Area.TopWall:
+ {
+ roi.x = (position.x + length * 0.5f) / length;
+ roi.y = position.y / height;
+ }
+ break;
+ case Area.LeftWall:
+ {
+ roi.x = (position.z + width * 0.5f) / width;
+ roi.y = position.y / height;
+ }
+ break;
+ case Area.RightWall:
+ {
+ roi.x = (-position.z + width * 0.5f) / width;
+ roi.y = position.y / height;
+ }
+ break;
+ }
+ return roi;
+ }
}
diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs
index 00e098c..aac7b5b 100644
--- a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs
+++ b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs
@@ -31,7 +31,7 @@ namespace UltraCombos.Frozen
private void FixedUpdate()
{
- if (SceneController.Instance.rate < 0.5f)
+ if (SceneController.Instance.rate > 0.5f)
{
alpha = Mathf.Lerp(alpha, 1.0f, smooth);
}
@@ -71,7 +71,7 @@ namespace UltraCombos.Frozen
progress = 0.0f;
player.Pause();
player.Frame = 0;
- Debug.Log("Begin");
+ //Debug.Log("Begin");
while (progress < breakProgress)
{
var pos = kinect.averagePositinon;
@@ -90,7 +90,7 @@ namespace UltraCombos.Frozen
player.Frame = (uint)(player.TotalNumFrames * progress);
yield return null;
}
- Debug.Log("Play the rest");
+ //Debug.Log("Play the rest");
player.Play();
while (player.IsFinished == false)
{
@@ -98,7 +98,7 @@ namespace UltraCombos.Frozen
}
yield return new WaitForSeconds(cooldown);
- Debug.Log("Flow done");
+ //Debug.Log("Flow done");
}
}
}
diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs
index 1b08c3f..6c7212e 100644
--- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs
+++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs
@@ -23,6 +23,9 @@ namespace UltraCombos.Frozen
[SerializeField]
BlendedCosineGradient cosineGradient;
+ [SerializeField]
+ KinectOpticalFlow kinect;
+
[SerializeField]
List dayCharacters = new List();
@@ -48,6 +51,7 @@ namespace UltraCombos.Frozen
spaceMaterial.SetFloat("_Rate", rate);
snowMaterial.SetFloat("_Size", Mathf.Lerp(0.0f, snowSize, rate));
cosineGradient.rate = rate;
+ kinect.kinectAmount = rate < 0.5 ? 1.0f : 30.0f;
foreach (var chr in dayCharacters)
{
diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065211.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065211.png
new file mode 100644
index 0000000..12451ff
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065211.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:606e3054672d2b9afbb2243f4d6ca40965660823b8d8322edf7f87f9a212c23e
+size 3011
diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065211.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065211.png.meta
new file mode 100644
index 0000000..7bdb665
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065211.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 8ad36dc2c7f5f3a418fbf9eac7a9da62
+timeCreated: 1525841167
+licenseType: Free
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ 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}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065215.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065215.png
new file mode 100644
index 0000000..7907ffd
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065215.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5efa4f559c135eaf0f1087e41d16c2839bbc9823d7201d2691b1ff1140a6b90c
+size 3403
diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065215.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065215.png.meta
new file mode 100644
index 0000000..5465e39
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Froze_Snowflake_CC065215.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 6625cf995276ee242843bd71eaa6aa38
+timeCreated: 1525841167
+licenseType: Free
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ 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}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute b/Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute
index 933dad1..26744b1 100644
--- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute
+++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute
@@ -25,7 +25,7 @@ void CSMain(uint3 id : SV_DispatchThreadID)
KinectGridBuffer[idx] = float4(vel, obs);
//KinectGridBuffer[idx] = float4(1, 0, 0, 1);
- float kinectAmount = 30.0;
+ float kinectAmount = 1.0;
float obstacle = 0;
diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlow.cs b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlow.cs
index 9a3dc3e..064c1b3 100644
--- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlow.cs
+++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlow.cs
@@ -28,6 +28,7 @@ namespace UltraCombos
public bool flipX = true;
public Vector3 clipMin = Vector3.one * -10;
public Vector3 clipMax = Vector3.one * 10;
+ public float kinectAmount = 1.0f;
[SerializeField]
@@ -177,6 +178,7 @@ namespace UltraCombos
applyShader.SetBuffer(0, "ObstacleBuffer", fluidSimulation.ObstacleBuffer);
applyShader.SetBuffer(0, "DensityBuffer", fluidSimulation.DensityBuffer);
applyShader.SetFloat("timeStep", Time.fixedDeltaTime);
+ applyShader.SetFloat("kinect_amount", kinectAmount);
applyShader.SetFloat("temperatureAmount", fluidSimulation.m_temperatureAmount);
applyShader.SetFloat("densityAmount", fluidSimulation.m_densityAmount);
applyShader.SetBuffer(0, "KinectGridBuffer", kinect_grid_buffer);
diff --git a/Unity_2018_Frozen/Assets/ParticleWorks/Script/ParticleViewerMesh.cs b/Unity_2018_Frozen/Assets/ParticleWorks/Script/ParticleViewerMesh.cs
index ed0fbdb..054576c 100644
--- a/Unity_2018_Frozen/Assets/ParticleWorks/Script/ParticleViewerMesh.cs
+++ b/Unity_2018_Frozen/Assets/ParticleWorks/Script/ParticleViewerMesh.cs
@@ -71,7 +71,7 @@ namespace UltraCombos
float delta = Mathf.PI * 2.0f / side;
for (int i = 0; i < side; i++)
{
- float a = delta * i;
+ float a = -delta * i;
float x = Mathf.Cos(a);
float y = Mathf.Sin(a);
vertices.Add(new Vector3(x, 0, y));