update scene and music

Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 1.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 1
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/icon/icon_cloud.avi

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

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

Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-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: Cloud-Standby 2
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/icon/icon_cloud.avi

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

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

Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 1.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 1
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/effect/Cloud_Snow_hap.avi

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

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

Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-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: Cloud-Trigger 2
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/effect/Cloud_Snow_hap.avi

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

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

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 1.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 1
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi

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

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

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 1.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 1
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/effect/Elsa_Effect_A_hap.avi

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

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

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 1.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 1
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi

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

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

Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 1.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 1
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/effect/Elsa_Effect_B_hap.avi

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

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

Unity_2018_Frozen/Assets/Frozen/Material/Point.mat

@@ -81,7 +81,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Size: 0.019999985
+    - _Size: 0.010056514
     - _SmoothnessTextureChannel: 0
     - _SoftParticlesEnabled: 0
     - _SoftParticlesFarFadeDistance: 1

Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat

@@ -70,7 +70,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Rate: 0
+    - _Rate: 1
     - _SmoothnessTextureChannel: 0
     - _SpaceRate: 0
     - _SpecularHighlights: 1

Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs

@@ -61,7 +61,7 @@ namespace UltraCombos.Frozen
         Coroutine flow = null;
 
         bool is_alive = false;
-        const float alive_threshold = 1.0f / 255.0f;
+        const float alive_threshold = 0.5f / 255.0f;
         float alive_value = 0.0f;
 
         [SerializeField, Header("Debug")]
@@ -277,6 +277,11 @@ namespace UltraCombos.Frozen
                 yield return new WaitForSeconds(disappearTime);
             }
 
+            while (renderers[(int)Status.TRIGGER].material.color.a > 0.5f / 255.0f)
+            {
+                yield return null;
+            }
+
             flow = null;
             yield return null;
         }

Unity_2018_Frozen/Assets/Frozen/Script/Ruler.cs

@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace UltraCombos.Frozen
+{
+    public class Ruler : MonoBehaviour
+    {
+        public float width = 8.0f;
+        public float length = 5.0f;
+        public float height = 1.5f;
+        
+        private void OnDrawGizmos()
+        {
+            var mat = Gizmos.matrix;
+
+            Gizmos.matrix = transform.localToWorldMatrix;
+            Vector3 size = new Vector3(width, height, length);
+            Vector3 center = new Vector3(0, height * 0.5f, 0);
+            Gizmos.DrawWireCube(center, size);
+
+            Gizmos.matrix = mat;
+        }
+    }
+}
+
+

Unity_2018_Frozen/Assets/Frozen/Script/Ruler.cs.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: 27e1128700aaadd4fae0b90f94e59b3f
+timeCreated: 1527144499
+licenseType: Free
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs

@@ -47,13 +47,6 @@ namespace UltraCombos.Frozen
         
         List<CharacterBehaviour> characters;
         
-        [SerializeField]
-        List<CharacterBehaviour> dayCharacters = new List<CharacterBehaviour>();
-
-        [SerializeField]
-        List<CharacterBehaviour> nightCharacters = new List<CharacterBehaviour>();
-
-        
         float target_rate = 0.0f;
 
 
@@ -88,8 +81,7 @@ namespace UltraCombos.Frozen
                 target_rate = 0.0f;
                 if (Input.GetKeyDown(KeyCode.PageDown))
                 {
-                    state = State.Day;
-                    onSceneDay.Invoke();
+                    GoDay();
                 }
             }
             else if (state == State.Day)
@@ -97,13 +89,11 @@ namespace UltraCombos.Frozen
                 target_rate = 0.0f;
                 if (Input.GetKeyDown(KeyCode.PageUp))
                 {
-                    state = State.Standby;
-                    onSceneStandby.Invoke();
+                    GoStandby();
                 }
                 else if (Input.GetKeyDown(KeyCode.PageDown))
                 {
-                    state = State.Night;
-                    onSceneNight.Invoke();
+                    GoNight();
                 }
             }
             else if (state == State.Night)
@@ -111,13 +101,11 @@ namespace UltraCombos.Frozen
                 target_rate = 1.0f;
                 if (Input.GetKeyDown(KeyCode.PageUp))
                 {
-                    state = State.Standby;
-                    onSceneStandby.Invoke();
+                    GoStandby();
                 }
                 else if (Input.GetKeyDown(KeyCode.PageDown))
                 {
-                    state = State.Day;
-                    onSceneDay.Invoke();
+                    GoStandby();
                 }
             }
 
@@ -133,23 +121,31 @@ namespace UltraCombos.Frozen
             kinect.kinectAmount = Mathf.Lerp(1.0f, nightKinectAmount, rate);
             particleViewer.VertexCount = (int)(Mathf.Lerp(dayParticleRate, 1.0f, rate) * particleViewer.buffer.count);
 
-#if false
-            foreach (var chr in dayCharacters)
-            {
-                chr.gameObject.SetActive(rate < 0.5);
-            }
-
-            foreach (var chr in nightCharacters)
-            {
-                chr.gameObject.SetActive(rate > 0.5);
-            }
-#else
             foreach (var chr in characters)
             {
                 chr.Active = chr.appearSataes.Contains(state);
             }
-#endif
         }
+
+        public void GoStandby()
+        {
+            state = State.Standby;
+            onSceneStandby.Invoke();
+        }
+
+        public void GoDay()
+        {
+            state = State.Day;
+            onSceneDay.Invoke();
+        }
+
+        public void GoNight()
+        {
+            state = State.Night;
+            onSceneNight.Invoke();
+        }
+
+        
     }
 }
 

Unity_2018_Frozen/Assets/Frozen/Script/SoundLoader.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Events;
 using UnityEngine.Networking;
 
 namespace UltraCombos
@@ -22,6 +23,11 @@ namespace UltraCombos
 
         float target_volume = 1.0f;
 
+        public UnityEvent onPlayFinished = new UnityEvent();
+
+        [Header("Debug")]
+        public string info;
+
         private void Start()
         {
             if (filenames.Count == 0)
@@ -71,6 +77,16 @@ namespace UltraCombos
         private void Update()
         {
             source.volume = Mathf.Lerp(source.volume, target_volume * volumeScale, Time.deltaTime);
+
+            if (source.isPlaying && target_volume > 0.5f && source.clip != null)
+            {
+                info = $"{source.time:F1}/{source.clip.length:F1}";
+                if (source.clip.length - source.time < 1.0f)
+                {
+                    onPlayFinished.Invoke();
+                    info = "play finished";
+                }
+            }
         }
 
         public void PlayOneShot()

Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitTexture.shader

@@ -0,0 +1,62 @@
+Shader "UltraCombos/Frozen/Unlit/Texture"
+{
+	Properties
+	{
+		_MainTex ("Base (RGB) Trans (A)", 2D) = "white" {}
+		_Color("Color",Color) = (1,1,1,1)
+		[Toggle] _isGamma("is Gamma", Float) = 0
+	}
+	SubShader
+	{
+		//Tags { "RenderType"="Opaque" }
+		Tags{ "Queue" = "Transparent" "RenderType" = "Transparent" "IgnoreProjector" = "True" }
+		LOD 100
+		ZWrite Off
+		Cull off
+		Blend SrcAlpha OneMinusSrcAlpha
+		//Blend One OneMinusSrcAlpha
+
+		Pass
+		{
+			CGPROGRAM
+			#pragma vertex vert
+			#pragma fragment frag
+			
+			#include "UnityCG.cginc"
+
+			struct appdata
+			{
+				float4 vertex : POSITION;
+				float2 uv : TEXCOORD0;
+			};
+
+			struct v2f
+			{
+				float2 uv : TEXCOORD0;
+				float4 vertex : SV_POSITION;
+			};
+
+			sampler2D _MainTex;
+			float4 _MainTex_ST;
+			float4 _Color;
+			float _Rate;
+			float _isGamma;
+			
+			v2f vert (appdata v)
+			{
+				v2f o;
+				o.vertex = UnityObjectToClipPos(v.vertex);
+				o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+				return o;
+			}
+			
+			fixed4 frag (v2f i) : SV_Target
+			{
+				fixed4 frag_color = tex2D(_MainTex, i.uv);
+				frag_color.rgb = lerp(frag_color.rgb, GammaToLinearSpace(frag_color.rgb), _isGamma);
+				return frag_color * _Color;
+			}
+			ENDCG
+		}
+	}
+}

Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitTexture.shader.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 317e6889645762b4da7eb5dad5c3b8c4
+timeCreated: 1525078203
+licenseType: Free
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f0666c1c66f75d978e56b7eadaddde39f1bc3a5a7f08e307539296e55547324
-size 1037417
+oid sha256:53d64c7c8fe811e083c40cec9ac84dded8460151df583b86a0127ab9ac2eddcd
+size 321987

Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef44675520992d7f79105d3abad601a9807205bb9a07337c9ef4c5299e72fe7f
-size 817464
+oid sha256:e90ddd6acf38a4835fbb853c37f89bb030c43a1e8e05498f6fc6da73cda03b13
+size 285060

Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.mat

@@ -7,7 +7,7 @@ Material:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Cloud_Snow
-  m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3}
+  m_Shader: {fileID: 4800000, guid: 317e6889645762b4da7eb5dad5c3b8c4, type: 3}
   m_ShaderKeywords: _ALPHATEST_ON
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
@@ -88,6 +88,7 @@ Material:
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1
+    - _isGamma: 0
     m_Colors:
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}