update on stage for more fun

Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 3.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Cloud-Standby 3
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/icon/icon_cloud.avi

Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 3.asset.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: bddde81afd2a6774fb8fa0cb3e4751c1
+timeCreated: 1524210684
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 3.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Cloud-Trigger 3
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/effect/Cloud_Snow_hap.avi

Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 3.asset.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 449886f54dd9e4446ad39d4fb290d4c0
+timeCreated: 1524453128
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 2.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Elsa_Effect_A-Standby 2
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 2.asset.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: e83615d38d3560c488a57ce710881f59
+timeCreated: 1524453128
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 2.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Elsa_Effect_A-Trigger 2
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/effect/Elsa_Effect_A_hap.avi

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 2.asset.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 020766b7ed4acb2419cd8578013b4959
+timeCreated: 1524453128
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 2.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Elsa_Effect_B-Standby 2
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 2.asset.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: b2664ad4b776f9f42a9b467e62fcf93b
+timeCreated: 1524453128
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 2.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Elsa_Effect_B-Trigger 2
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/effect/Elsa_Effect_B_hap.avi

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 2.asset.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: aa72046cb573df245a7e4dbd51bbd333
+timeCreated: 1524453128
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Name: Olaf_CC065053-Trigger
   m_EditorClassIdentifier: 
   m_VideoLocation: 1
-  m_VideoPath: ../FrozenMaterial/day/Olaf_CC065053_Hap.avi
+  m_VideoPath: ../FrozenMaterial/day/Olaf_CC065057_fast.avi

Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Name: Olaf_CC065056-Trigger
   m_EditorClassIdentifier: 
   m_VideoLocation: 1
-  m_VideoPath: ../FrozenMaterial/night/Olaf_CC065056_Hap.avi
+  m_VideoPath: ../FrozenMaterial/day/Olaf_CC065056_fast.avi

Unity_2018_Frozen/Assets/Frozen/FrozenNightParticleUniforms.asset

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

Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs

@@ -29,6 +29,7 @@ namespace UltraCombos.Frozen
 
         [SerializeField]
         private RectTransform fakeButton;
+        private CanvasGroup canvas_group;
 
         [Header("DShow Player")]
         [SerializeField]
@@ -121,6 +122,9 @@ namespace UltraCombos.Frozen
             TouchArea touch_area = fakeButton.gameObject.AddComponent<TouchArea>();
             touch_area.PointerDown.AddListener((data) => { Trigger(data); });
             touch_area.PointerDrag.AddListener((data) => { Trigger(data); });
+            canvas_group = fakeButton.gameObject.AddComponent<CanvasGroup>();
+            canvas_group.blocksRaycasts = true;
+            canvas_group.interactable = true;
         }
 
         private void Start()
@@ -144,13 +148,22 @@ namespace UltraCombos.Frozen
             //color = new Color(1, 1, 1, 0);
             //StartCoroutine(Sleep());
             if (fakeButton != null)
+            {
                 fakeButton.gameObject.SetActive(true);
+                canvas_group.interactable = true;
+                canvas_group.blocksRaycasts = true;
+            }
+                
         }
 
         private void OnDisable()
         {
             if (fakeButton != null)
+            {
                 fakeButton.gameObject.SetActive(false);
+                canvas_group.interactable = false;
+                canvas_group.blocksRaycasts = false;
+            }   
         }
         
         public bool Active
@@ -229,6 +242,8 @@ namespace UltraCombos.Frozen
             if (mode) info = "STANDBY";
             // standby
             {
+                canvas_group.interactable = true;
+                canvas_group.blocksRaycasts = true;
                 status = Status.STANDBY;
                 var player = StatePlayer;
                 player.Loop = isStandbyLoop;
@@ -257,6 +272,8 @@ namespace UltraCombos.Frozen
             if (mode) info = "TRIGGER";
             // trigger
             {
+                canvas_group.interactable = false;
+                canvas_group.blocksRaycasts = false;
                 onTrigger.Invoke();
                 status = Status.TRIGGER;
                 var player = StatePlayer;

Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs

@@ -93,18 +93,28 @@ namespace UltraCombos.Frozen
 
             material.mainTexture = player.Texture;
 
+            if (flow != null && SceneController.Instance.state != State.Night)
+            {
+                StopCoroutine(flow);
+                flow = null;
+            }
+
             if (flow == null && SceneController.Instance.state == State.Night)
+            {
                 flow = StartCoroutine(Flow());
             }  
+        }
 
         private void OnDrawGizmosSelected()
         {
+            /*
             var pos = kinect.averagePositinon;
             Gizmos.DrawWireSphere(pos, 0.5f);
             if (new Vector2(pos.x - transform.position.x, pos.z - transform.position.z).magnitude < triggerRadius)
             {
                 Gizmos.color = Color.red;
             }
+            */
             Gizmos.DrawWireSphere(transform.position, triggerRadius);
 
             Gizmos.color = Color.white;
@@ -138,7 +148,7 @@ namespace UltraCombos.Frozen
             while (progress < breakProgress)
             {
                 if (mode) info = $"{progress}";
-
+#if false
                 var pos = kinect.averagePositinon;
                 float dist = new Vector2(pos.x - transform.position.x, pos.z - transform.position.z).magnitude;
 
@@ -151,7 +161,33 @@ namespace UltraCombos.Frozen
                 {
                     progress = Mathf.Max(progress - 0.001f, pause_progress);
                 }
+#else
+                bool is_hit = false;
+                if (kinect.Valid)
+                {
+                    var samples = kinect.Samples;
+                    int max_sample = 500;
+                    int inc = Mathf.Max(kinect.HomeCount / max_sample, 1);
                     
+                    for (int i = 0; i < kinect.HomeCount; i += inc)
+                    {
+                        float dist = new Vector2(samples[i].x - transform.position.x, samples[i].z - transform.position.z).magnitude;
+                        if (dist < triggerRadius)
+                        {
+                            Debug.Log("is_hit");
+                            progress += 0.001f;
+                            is_hit = true;
+                            break;
+                        }
+                    }
+
+                }
+
+                if (is_hit == false)
+                {
+                    progress = Mathf.Max(progress - 0.001f, pause_progress);
+                }
+#endif
                 player.Frame = (uint)(player.TotalNumFrames * progress);
                 yield return null;
             }

Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute

@@ -57,6 +57,6 @@ void CSMain(uint3 id : SV_DispatchThreadID)
 	temperature = max(temperature, 0);
 	TemperatureBuffer[idx] = temperature;
 
-	velocity += KinectGridBuffer[idx].xyz * kinectAmount;
+	velocity += KinectGridBuffer[idx].xyz * kinectAmount * 10.0;
 	VelocityBuffer[idx] = velocity;
 }

Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs

@@ -22,8 +22,13 @@ namespace UltraCombos
 
         int home_count;
         Vector4[] position_samples = new Vector4[512 * 424 * 2];
-        //Vector4[] velocity_samples = new Vector4[512 * 424 * 2];
+        //Vector4[] velocity_samples = new Vector4[512 * 424 * 2
 
+        public bool Valid { get { return home_count > countThreshold; } }
+        public int HomeCount { get { return home_count; } }
+        public Vector4[] Samples { get { return position_samples; } }
+
+        public bool doCalculate = false;
         public Vector3 averagePositinon = Vector3.zero;
         public float standardDeviation = -1.0f;
 
@@ -50,6 +55,9 @@ namespace UltraCombos
             kinect.HomePositionBuffer.GetData(position_samples, 0, 0, home_count);
             //kinect.HomeVelocityBuffer.GetData(velocity_samples, 0, 0, home_count);
 
+            if (doCalculate == false)
+                return;
+
             averagePositinon = Vector3.zero;
             //averageVelocity = Vector3.zero;
             if (home_count > countThreshold)