refine and fix some issue

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

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Name: Elsa_Effect_A-Standby
   m_EditorClassIdentifier: 
   m_VideoLocation: 1
-  m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi
+  m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi

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

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Name: Elsa_Effect_B-Standby
   m_EditorClassIdentifier: 
   m_VideoLocation: 1
-  m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi
+  m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi

Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf-Standby.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
-  m_Name: Olaf_CC065053-Standby
+  m_Name: Olaf-Standby
   m_EditorClassIdentifier: 
   m_VideoLocation: 1
-  m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi
+  m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi

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

@@ -1,15 +0,0 @@
-%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: Olaf_CC065056-Standby
-  m_EditorClassIdentifier: 
-  m_VideoLocation: 1
-  m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi

Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset.meta

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

Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Name: Space-Day
   m_EditorClassIdentifier: 
   m_VideoLocation: 1
-  m_VideoPath: ../FrozenMaterial/space-dark-mountain-sq.avi
+  m_VideoPath: ../FrozenMaterial/space-ice-forest-sq.avi

Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Name: Space-Night
   m_EditorClassIdentifier: 
   m_VideoLocation: 1
-  m_VideoPath: ../FrozenMaterial/space-dark-mountain-v1.avi
+  m_VideoPath: ../FrozenMaterial/space-dark-mountain-sq.avi

Unity_2018_Frozen/Assets/Frozen/Frozen.unity

@@ -953,8 +953,6 @@ GameObject:
   - component: {fileID: 368474580}
   - component: {fileID: 368474578}
   - component: {fileID: 368474581}
-  - component: {fileID: 368474583}
-  - component: {fileID: 368474582}
   m_Layer: 8
   m_Name: GiantSnowflake
   m_TagString: Untagged
@@ -1027,43 +1025,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9126593cba11d9145b83a6ab86efc050, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  clip: {fileID: 11400000, guid: ff53ec8ce37139a4eb553b1d7fcd2837, type: 2}
   kinect: {fileID: 712882417}
   triggerRadius: 1.6
   cooldown: 30
   offset: 1.5
   breakProgress: 0.1
---- !u!114 &368474582
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 368474576}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  target: 2
-  materials:
-  - {fileID: 2100000, guid: 3059bdeaeda202b489a491a3025d4843, type: 2}
-  attributeName: _MainTex
-  autoSize: 0
---- !u!114 &368474583
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 368474576}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  VideoAsset: {fileID: 11400000, guid: ff53ec8ce37139a4eb553b1d7fcd2837, type: 2}
-  LoadOnAwake: 1
-  PlayOnStart: 0
-  Looping: 0
-  AudioVolume: 1
 --- !u!1 &368967883
 GameObject:
   m_ObjectHideFlags: 0
@@ -1556,6 +1523,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 708f87d2cbae42445846a25f0ca06829, type: 2}
   players: []
   videoStopTime: 1.5
+  debug: 0
   debugString: 
 --- !u!1 &520040865
 GameObject:
@@ -1566,6 +1534,7 @@ GameObject:
   m_Component:
   - component: {fileID: 520040869}
   - component: {fileID: 520040868}
+  - component: {fileID: 520040866}
   m_Layer: 0
   m_Name: Final Camera
   m_TagString: Untagged
@@ -1573,6 +1542,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!114 &520040866
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 520040865}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 542c4b2aee71a0142928f8b82f70141f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  sharingName: MiniFrozenSpout
+  textureFormat: 28
+  yFlip: 1
+  output: {fileID: 0}
+  m_Shader: {fileID: 4800000, guid: ca95743014f24fd49897e12abbe931fc, type: 3}
 --- !u!20 &520040868
 Camera:
   m_ObjectHideFlags: 0
@@ -2634,7 +2619,7 @@ MonoBehaviour:
   width: 8
   length: 5
   height: 3
-  isAnimated: 0
+  isAnimated: 1
 --- !u!1 &952607033
 GameObject:
   m_ObjectHideFlags: 0
@@ -2697,6 +2682,136 @@ MonoBehaviour:
   PlayOnStart: 1
   Looping: 1
   AudioVolume: 1
+--- !u!43 &973459541
+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 &1000268178
 GameObject:
   m_ObjectHideFlags: 0
@@ -3114,7 +3229,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   standby: 1
-  disappearTime: 10
+  disappearTime: 1
   area: 0
   AppearArea: 02000000
   fakeButton: {fileID: 0}
@@ -3127,6 +3242,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 6ccf813116f07944faf4af6bc3b2c1f7, type: 2}
   players: []
   videoStopTime: 10
+  debug: 0
   debugString: 
 --- !u!114 &1216863878
 MonoBehaviour:
@@ -3149,7 +3265,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1225287932}
   - component: {fileID: 1225287935}
-  - component: {fileID: 1225287933}
   m_Layer: 8
   m_Name: Elsa_Effect_B
   m_TagString: Untagged
@@ -3172,18 +3287,6 @@ Transform:
   m_Father: {fileID: 199010598}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1225287933
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1225287931}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  area: 2
 --- !u!114 &1225287935
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3198,10 +3301,9 @@ MonoBehaviour:
   standby: 1
   disappearTime: 1
   area: 0
-  AppearArea: 02000000
+  AppearArea: 000000000100000002000000
   fakeButton: {fileID: 0}
-  specificPositions:
+  specificPositions: []
-  - {fileID: 1225287933}
   roaming: 0
   isStandbyLoop: 1
   standbyClip: {fileID: 11400000, guid: f2f10fb696e1a6145b55378c7c7ec9df, type: 2}
@@ -3209,6 +3311,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: d3a9925b2d77cce4a8fc3215dbaf41e1, type: 2}
   players: []
   videoStopTime: 1
+  debug: 0
   debugString: 
 --- !u!1 &1227078084
 GameObject:
@@ -3682,7 +3785,7 @@ MeshFilter:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1379541361}
-  m_Mesh: {fileID: 2039303666}
+  m_Mesh: {fileID: 973459541}
 --- !u!1 &1390635887
 GameObject:
   m_ObjectHideFlags: 0
@@ -3978,7 +4081,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   standby: 1
-  disappearTime: 10
+  disappearTime: 1
   area: 2
   AppearArea: 02000000
   fakeButton: {fileID: 0}
@@ -3991,6 +4094,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: a6af2089baf7ed8489a4e941dae4e928, type: 2}
   players: []
   videoStopTime: 10
+  debug: 0
   debugString: 
 --- !u!114 &1690794391
 MonoBehaviour:
@@ -4798,6 +4902,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 727d0f386e383414ca58642076340e45, type: 2}
   players: []
   videoStopTime: 1
+  debug: 0
   debugString: 
 --- !u!1 &1908931425
 GameObject:
@@ -4909,7 +5014,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   standby: 1
-  disappearTime: 10
+  disappearTime: 1
   area: 2
   AppearArea: 02000000
   fakeButton: {fileID: 0}
@@ -4922,6 +5027,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 2845fcd21d061464f8f97219a167ba7a, type: 2}
   players: []
   videoStopTime: 10
+  debug: 0
   debugString: 
 --- !u!114 &1933714487
 MonoBehaviour:
@@ -4979,7 +5085,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   standby: 1
-  disappearTime: 10
+  disappearTime: 1
   area: 0
   AppearArea: 02000000
   fakeButton: {fileID: 0}
@@ -4992,6 +5098,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 2ea2925de6b8a934fa0ea7a7020103b1, type: 2}
   players: []
   videoStopTime: 10
+  debug: 0
   debugString: 
 --- !u!114 &1973785478
 MonoBehaviour:
@@ -5014,7 +5121,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1984882816}
   - component: {fileID: 1984882819}
-  - component: {fileID: 1984882817}
   m_Layer: 8
   m_Name: Elsa_Effect_A
   m_TagString: Untagged
@@ -5037,18 +5143,6 @@ Transform:
   m_Father: {fileID: 199010598}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1984882817
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1984882815}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  area: 2
 --- !u!114 &1984882819
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5063,10 +5157,9 @@ MonoBehaviour:
   standby: 1
   disappearTime: 1
   area: 0
-  AppearArea: 02000000
+  AppearArea: 000000000100000002000000
   fakeButton: {fileID: 0}
-  specificPositions:
+  specificPositions: []
-  - {fileID: 1984882817}
   roaming: 0
   isStandbyLoop: 1
   standbyClip: {fileID: 11400000, guid: 7b0a38d5d484cf54089379ebbe5c1d9d, type: 2}
@@ -5074,6 +5167,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 23773c4900ad46e4f9ba5cb3d1c28912, type: 2}
   players: []
   videoStopTime: 1
+  debug: 0
   debugString: 
 --- !u!1 &2008324328
 GameObject:
@@ -5174,136 +5268,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 22
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!43 &2039303666
-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 &2084135709
 GameObject:
   m_ObjectHideFlags: 0

Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat

@@ -39,7 +39,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 86f3cfc9597a8cb439f8b1a059e766c5, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

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

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

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

@@ -70,14 +70,14 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Rate: 1
+    - _Rate: 0
     - _SmoothnessTextureChannel: 0
     - _SpaceRate: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1
-    - _isGamma: 0
+    - _isGamma: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs

@@ -6,10 +6,6 @@ using UnityEngine.UI;
 
 public class CharacterBehaviour : MonoBehaviour
 {
-
-    [SerializeField]
-    private bool standby = true;
-
     [Range(0, 15)]
     public float disappearTime = 5;
 
@@ -28,7 +24,7 @@ public class CharacterBehaviour : MonoBehaviour
     float roaming = 0.0f;
     float roaming_seed = 0.0f;
 
-    [Header("Direct Show Player")]
+    [Header("DShow Player")]
     [SerializeField]
     bool isStandbyLoop = true;
     public DShowClip standbyClip;
@@ -56,6 +52,8 @@ public class CharacterBehaviour : MonoBehaviour
 
     Coroutine flow = null;
 
+    [SerializeField, Header("Debug")]
+    bool debug = false;
     [SerializeField]
     string debugString;
 
@@ -153,6 +151,7 @@ public class CharacterBehaviour : MonoBehaviour
         foreach (var rdr in renderers)
         {
             rdr.material.color = new Color(1, 1, 1, 0);
+            rdr.material.SetColor("_TintColor", new Color(1, 1, 1, 0));
         }
         foreach (var ply in players)
         {
@@ -165,7 +164,7 @@ public class CharacterBehaviour : MonoBehaviour
 
     IEnumerator Flow()
     {
-        debugString = "setup";
+        if (debug) debugString = "setup";
         // setup
         {
             if (specificPositions.Count > 0)
@@ -185,7 +184,7 @@ public class CharacterBehaviour : MonoBehaviour
             yield return null;
         }
 
-        debugString = "STANDBY";
+        if (debug) debugString = "STANDBY";
         // standby
         {
             state = State.STANDBY;
@@ -195,14 +194,15 @@ public class CharacterBehaviour : MonoBehaviour
 
             while (isTriggered == false)
             {
-                debugString = "STANDBY is not triggered";
+                if (debug) debugString = "STANDBY is not triggered";
 
                 if (player.Loop == false)
                 {
                     if (player.IsPlaying == false)
                     {
-                        player.Pause();
+                        //player.Pause();
-                        player.Frame = player.TotalNumFrames;
+                        //player.Frame = player.TotalNumFrames;
+                        if (debug) debugString = "STANDBY is not triggered and set frame";
                     }
                 }
 
@@ -212,7 +212,7 @@ public class CharacterBehaviour : MonoBehaviour
 
         }
 
-        debugString = "TRIGGER";
+        if (debug) debugString = "TRIGGER";
         // trigger
         {
             state = State.TRIGGER;
@@ -221,18 +221,18 @@ public class CharacterBehaviour : MonoBehaviour
 
             while (player.IsPlaying)
             {
-                debugString = "TRIGGER is playing";
+                if (debug) debugString = "TRIGGER is playing";
                 yield return null;
             }
 
             player.Pause();
             player.Frame = player.TotalNumFrames;
 
-            debugString = "TRIGGER is stopped";
+            if (debug) debugString = "TRIGGER is stopped";
             yield return new WaitForSeconds(videoStopTime);
         }
 
-        debugString = "SLEEP";
+        if (debug) debugString = "SLEEP";
         // sleep
         {
             state = State.SLEEP;
@@ -260,7 +260,10 @@ public class CharacterBehaviour : MonoBehaviour
         for (int i = 0; i < players.Length; i++)
         {
             if (players[i].IsPlaying)
+            {
                 renderers[i].material.mainTexture = players[i].Texture;
+            }
+                
         }
 
         // standby material
@@ -270,7 +273,9 @@ public class CharacterBehaviour : MonoBehaviour
                 smooth = 1.0f;
             float alpha = System.Convert.ToInt32(state == State.STANDBY);
             var mat = renderers[(int)State.STANDBY].material;
-            mat.color = new Color(1, 1, 1, Mathf.Lerp(mat.color.a, alpha, smooth));
+            var col = new Color(1, 1, 1, Mathf.Lerp(mat.color.a, alpha, smooth));
+            mat.color = col;
+            mat.SetColor("_TintColor", col);
         }
 
         // trigger material
@@ -280,7 +285,9 @@ public class CharacterBehaviour : MonoBehaviour
                 smooth = 1.0f;
             float alpha = System.Convert.ToInt32(state == State.TRIGGER);
             var mat = renderers[(int)State.TRIGGER].material;
-            mat.color = new Color(1, 1, 1, Mathf.Lerp(mat.color.a, alpha, smooth));
+            var col = new Color(1, 1, 1, Mathf.Lerp(mat.color.a, alpha, smooth));
+            mat.color = col;
+            mat.SetColor("_TintColor", col);
         }
         
 
@@ -366,7 +373,7 @@ public class CharacterBehaviour : MonoBehaviour
             q.SetLookRotation(Vector3.forward);
         }
         transform.rotation = q;
-        transform.position = newPos + FrozenScreenToWorldSpace.Instance.Position;
+        transform.position = newPos;// + FrozenScreenToWorldSpace.Instance.Position;
         RandomPos();
     }
 

Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs

@@ -1,85 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace UltraCombos.Frozen
-{
-    public class ElsaEffectGenerator : MonoBehaviour
-    {
-        [SerializeField]
-        KinectOpticalFlowMath kinectMath;
-
-        bool isHit = false;
-        Vector3 hitPoint = Vector3.zero;
-
-        private void Start()
-        {
-
-        }
-
-        private void Update()
-        {
-            /*
-            float padding = 0.5f;
-            Ray ray = new Ray(Vector3.zero, -new Vector3(kinectMath.averageVelocity.x, 0, kinectMath.averageVelocity.z));
-
-            float enter = 0.0f;
-            isHit = false;
-            Vector3 hit_point = Vector3.zero;
-            if (isHit == false)
-            {
-                if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.LeftWall).Raycast(ray, out enter))
-                {
-                    hit_point = ray.GetPoint(enter);
-                    if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.length * 0.5f - padding)
-                    {
-                        isHit = true;
-                    }
-                }
-            }
-
-            if (isHit == false)
-            {
-                if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.RightWall).Raycast(ray, out enter))
-                {
-                    hit_point = ray.GetPoint(enter);
-                    if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.length * 0.5f - padding)
-                    {
-                        isHit = true;
-                    }
-                }
-            }
-
-            if (isHit == false)
-            {
-                if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.TopWall).Raycast(ray, out enter))
-                {
-                    hit_point = ray.GetPoint(enter);
-                    if (Mathf.Abs(hit_point.x) < FrozenScreenToWorldSpace.Instance.width * 0.5f - padding)
-                    {
-                        isHit = true;
-                    }
-                }
-            }
-
-
-            if (isHit)
-            {
-                hitPoint = hit_point + transform.position;
-            }
-            */
-        }
-
-        private void OnDrawGizmosSelected()
-        {
-            /*
-            Gizmos.DrawLine(transform.position, transform.position - new Vector3(kinectMath.averageVelocity.x, 0, kinectMath.averageVelocity.z) * 50.0f);
-            if (isHit == false)
-                return;
-            Gizmos.DrawWireCube(hitPoint, Vector3.one);
-            */
-        }
-    }
-
-}
-

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

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

Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs

@@ -10,6 +10,8 @@ namespace UltraCombos.Frozen
         float alpha = 0.0f;
         float smooth = 0.025f;
 
+        [SerializeField]
+        DShowClip clip;
         DShowMoviePlayer player;
 
         [SerializeField]
@@ -25,13 +27,31 @@ namespace UltraCombos.Frozen
         float offset = 1.5f;
         Vector3 root;
 
+        Coroutine flow = null;
+
         private void Start()
         {
-            material = GetComponent<MeshRenderer>().material;
-            player = GetComponent<DShowMoviePlayer>();
             root = transform.position;
 
-            StartCoroutine(Flow());
+            //StartCoroutine(Flow());
+        }
+
+        private void OnEnable()
+        {
+            if (material == null)
+                material = GetComponent<MeshRenderer>().material;
+
+            if (player == null)
+            {
+                player = gameObject.AddComponent<DShowMoviePlayer>();
+                player.VideoAsset = clip;
+                player.Load();
+            }
+
+            if (flow != null)
+                StopCoroutine(flow);
+
+            flow = StartCoroutine(Flow());
         }
 
         private void FixedUpdate()
@@ -47,7 +67,10 @@ namespace UltraCombos.Frozen
 
             material.color = new Color(1.0f, 1.0f, 1.0f, alpha);
 
-            
+            material.mainTexture = player.Texture;
+
+            if (flow == null)
+                flow = StartCoroutine(Flow());
         }
 
         private void OnDrawGizmosSelected()
@@ -70,44 +93,43 @@ namespace UltraCombos.Frozen
         {
             float video_stamp = 0.0f;
             float progress = 0.0f;
-            while (true)
+
+
+            video_stamp = Time.time;
+            progress = 0.0f;
+            player.Pause();
+            player.Frame = 0;
+            //Debug.Log("Begin");
+            while (progress < breakProgress)
             {
-                video_stamp = Time.time;
+                var pos = kinect.averagePositinon;
-                progress = 0.0f;
+                float dist = new Vector2(pos.x - transform.position.x, pos.z - transform.position.z).magnitude;
-                player.Pause();
+
-                player.Frame = 0;
+                if (dist < triggerRadius)
-                //Debug.Log("Begin");
-                while (progress < breakProgress)
                 {
-                    var pos = kinect.averagePositinon;
+                    //Debug.Log("OK");
-                    float dist = new Vector2(pos.x - transform.position.x, pos.z - transform.position.z).magnitude;
+                    progress += 0.001f;
-
-                    if (dist < triggerRadius)
-                    {
-                        //Debug.Log("OK");
-                        progress += 0.001f;
-                    }
-                    else
-                    {
-                        progress = Mathf.Max(progress - 0.001f, 0.0f);
-                    }
-
-                    player.Frame = (uint)(player.TotalNumFrames * progress);
-                    yield return null;
                 }
-                //Debug.Log("Play the rest");
+                else
-                player.Play();
-                while (player.IsFinished == false)
                 {
-                    yield return null;
+                    progress = Mathf.Max(progress - 0.001f, 0.0f);
                 }
 
-                yield return new WaitForSeconds(cooldown);
+                player.Frame = (uint)(player.TotalNumFrames * progress);
-
+                yield return null;
-                transform.position = root + new Vector3(Random.Range(-offset, offset), 0, 0);
+            }
+            //Debug.Log("Play the rest");
+            player.Play();
+            while (player.IsFinished == false)
+            {
                 yield return null;
-                //Debug.Log("Flow done");
+            }
-            }            
+
+            yield return new WaitForSeconds(cooldown);
+
+            transform.position = root + new Vector3(Random.Range(-offset, offset), 0, 0);
+            yield return null;
+            //Debug.Log("Flow done");
         }
     }
 

Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs

@@ -39,8 +39,8 @@ namespace UltraCombos.Frozen
         [SerializeField]
         List<CharacterBehaviour> nightCharacters = new List<CharacterBehaviour>();
 
-        [SerializeField]
+        //[SerializeField]
-        bool debug = false;
+        //bool debug = false;
         float target_rate = 0.0f;
 
         private void Start()
@@ -50,10 +50,10 @@ namespace UltraCombos.Frozen
 
         private void Update()
         {
-            if (debug)
+            //if (debug)
             {
                 //rate = Mathf.Sin(Time.time * 0.2f) * 0.5f + 0.5f;
-                if (Input.GetKeyDown(KeyCode.Q))
+                if (Input.GetKeyDown(KeyCode.PageDown) || Input.GetKeyDown(KeyCode.PageUp))
                 {
                     target_rate = 1.0f - target_rate;
                 }

Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs

@@ -32,7 +32,7 @@ namespace UltraCombos.Frozen
             {
                 if (isAnimated)
                 {
-                    var players = GetComponentsInChildren<DShowMoviePlayer>();
+                    var players = GetComponentsInChildren<DShowMoviePlayer>(true);
                     foreach (var mp in players)
                     {
                         mp.gameObject.SetActive(true);

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

@@ -75,4 +75,4 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
-    - _TintColor: {r: 1, g: 1, b: 1, a: 0.5}
+    - _TintColor: {r: 1, g: 1, b: 1, a: 1}