update CharacterBehaviour and tuio

8 years ago · 63a06ba2ec
parent 69929d2047
commit 63a06ba2ec
26 changed files with 1105 additions and 268 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,2 @@
+/Build/
+/FrozenMaterial/
--- a/Build/Kinect2Motion_binary/data/KinectV2-settings.xml
+++ b/Build/Kinect2Motion_binary/data/KinectV2-settings.xml
@ -10,7 +10,7 @@
 	<Median_Size>3</Median_Size>
 	<Position>0, 0.102041, 4.08163</Position>
 	<Rotation>11.9388, -0.918365, 0.459183</Rotation>
-	<Box_Size>7.58673, 5, 7.53061</Box_Size>
+	<Box_Size>7.53061, 5, 4.55612</Box_Size>
 	<Clip>1</Clip>
 	<ofxOpticalFlow>
 		<Max_Level>4</Max_Level>
@ -18,4 +18,5 @@
 		<Half_Window>2</Half_Window>
 	</ofxOpticalFlow>
 <KKinectV2/>
+<Compress>0</Compress>
 </KKinectV2>
--- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Standby.asset
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Standby.asset
@ -9,7 +9,7 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
-  m_Name: SnowStandby
+  m_Name: Olaf_CC065053-Standby
  m_EditorClassIdentifier: 
  m_VideoLocation: 1
-  m_VideoPath: ../Material/Model_B-standby.avi
+  m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi
--- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Standby.asset.meta
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Standby.asset.meta
--- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.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: Olaf_CC065053-Trigger
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/Demo/Olaf_CC065053_Hap.avi
--- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset.meta
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset.meta
--- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset
@ -9,7 +9,7 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
-  m_Name: SnowTrigger
+  m_Name: Olaf_CC065056-Standby
  m_EditorClassIdentifier: 
  m_VideoLocation: 1
-  m_VideoPath: ../Material/Model_B-play.avi
+  m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi
--- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset.meta
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 52eefee2f9118e04bbb195c0e27b0fc5
+timeCreated: 1524210684
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.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: Olaf_CC065056-Trigger
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/Demo/Olaf_CC065056_Hap.avi
--- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset.meta
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 727d0f386e383414ca58642076340e45
+timeCreated: 1524453128
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity
+++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity
@ -235,6 +235,133 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &147055504
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 147055505}
+  - component: {fileID: 147055510}
+  - component: {fileID: 147055509}
+  - component: {fileID: 147055508}
+  - component: {fileID: 147055507}
+  - component: {fileID: 147055506}
+  m_Layer: 8
+  m_Name: Olaf_CC065056
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &147055505
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 147055504}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.496, y: 0.483, z: 2.49}
+  m_LocalScale: {x: 1.0630362, y: 1.0630376, z: 1.0630376}
+  m_Children: []
+  m_Father: {fileID: 917676528}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!54 &147055506
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 147055504}
+  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 &147055507
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 147055504}
+  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
+  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
+  isTriggerCollider: 0
+--- !u!23 &147055508
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 147055504}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 9b8333bad640d1240ae139400daea38e, 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!64 &147055509
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 147055504}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 1
+  m_CookingOptions: 14
+  m_SkinWidth: 0.01
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &147055510
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 147055504}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &151858420
 GameObject:
  m_ObjectHideFlags: 0
@ -468,7 +595,7 @@ Transform:
  m_Children:
  - {fileID: 917676528}
  m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 15
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &350883107
 GameObject:
@ -650,6 +777,34 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &411383572
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 411383573}
+  m_Layer: 8
+  m_Name: '---- Day Character ----'
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &411383573
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 411383572}
+  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: []
+  m_Father: {fileID: 917676528}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &432509337
 GameObject:
  m_ObjectHideFlags: 0
@ -676,7 +831,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 18
+  m_RootOrder: 19
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &438615021
 GameObject:
@ -768,7 +923,7 @@ RectTransform:
  - {fileID: 770059767}
  - {fileID: 1774693142}
  m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 18
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -882,7 +1037,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 23
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &528715328
 GameObject:
@ -1009,136 +1164,48 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  bufferName: KinectVelocityBuffer
--- !u!43 &567455712
-Mesh:
+--- !u!1001 &617692218
+Prefab:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: Space Mesh
-  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
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &658720283
 GameObject:
  m_ObjectHideFlags: 0
@ -1369,6 +1436,136 @@ CanvasRenderer:
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 718864548}
+--- !u!43 &725363233
+Mesh:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 'Space 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 &732632614
 GameObject:
  m_ObjectHideFlags: 0
@ -1412,6 +1609,7 @@ GameObject:
  m_Component:
  - component: {fileID: 750667763}
  - component: {fileID: 750667762}
+  - component: {fileID: 750667759}
  m_Layer: 5
  m_Name: Spout Canvas
  m_TagString: Untagged
@ -1419,6 +1617,24 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!114 &750667759
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 750667758}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0c29cacbda07285449365329adeb3b02, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  MonitorCamera: {fileID: 520040868}
+  castMouseOnly: 0
 --- !u!223 &750667762
 Canvas:
  m_ObjectHideFlags: 0
@ -1451,7 +1667,7 @@ RectTransform:
  m_Children:
  - {fileID: 1000268179}
  m_Father: {fileID: 0}
-  m_RootOrder: 20
+  m_RootOrder: 21
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -1484,7 +1700,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 16
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &770059766
 GameObject:
@ -1961,7 +2177,11 @@ Transform:
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 1.5}
  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 411383573}
+  - {fileID: 1906326617}
+  - {fileID: 1878556046}
+  - {fileID: 147055505}
  m_Father: {fileID: 338663765}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2005,7 +2225,7 @@ MeshFilter:
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 917676527}
-  m_Mesh: {fileID: 567455712}
+  m_Mesh: {fileID: 725363233}
 --- !u!114 &917676531
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -2542,7 +2762,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 17
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1390635887
 GameObject:
@ -2888,7 +3108,7 @@ RectTransform:
  - {fileID: 1227078085}
  - {fileID: 2084135710}
  m_Father: {fileID: 0}
-  m_RootOrder: 23
+  m_RootOrder: 24
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -3055,7 +3275,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 19
+  m_RootOrder: 20
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1817143150
 MonoBehaviour:
@ -3293,6 +3513,227 @@ MonoBehaviour:
  colorize: 1
  debugMaterial: {fileID: 2100000, guid: 95b4d9b25b7a7e3449627228b10d9009, type: 2}
  debugInfo: 
+--- !u!1 &1878556045
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1878556046}
+  m_Layer: 8
+  m_Name: '---- Night Character ----'
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1878556046
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1878556045}
+  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: []
+  m_Father: {fileID: 917676528}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1906326616
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1906326617}
+  - component: {fileID: 1906326622}
+  - component: {fileID: 1906326621}
+  - component: {fileID: 1906326620}
+  - component: {fileID: 1906326619}
+  - component: {fileID: 1906326618}
+  m_Layer: 8
+  m_Name: Olaf_CC065053
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1906326617
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1906326616}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 1.369, y: 0.932, z: 2.49}
+  m_LocalScale: {x: 1.06304, y: 1.06304, z: 1.06304}
+  m_Children: []
+  m_Father: {fileID: 917676528}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!54 &1906326618
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1906326616}
+  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 &1906326619
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1906326616}
+  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
+  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
+  isTriggerCollider: 0
+--- !u!23 &1906326620
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1906326616}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 8ba933f3f4401b34ead3e5f188561901, 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!64 &1906326621
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1906326616}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 1
+  m_CookingOptions: 14
+  m_SkinWidth: 0.01
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &1906326622
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1906326616}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &1908931425
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1908931427}
+  - component: {fileID: 1908931426}
+  m_Layer: 0
+  m_Name: FrozenScreenToWorldSpace
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1908931426
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1908931425}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c2ff90fc774b218468ffcff9472e0762, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  width: 5
+  length: 8
+  height: 3
+  blackLength: 0.89
+  PixelsByMeter: 360
+  finalPixelsByMeter: 90
+  LeftWall:
+    X: 0
+    Y: 0
+    ROI_X: 0
+    ROI_Y: 0
+  TopWall:
+    X: 0
+    Y: 0
+    ROI_X: 0
+    ROI_Y: 0
+  RightWall:
+    X: 0
+    Y: 0
+    ROI_X: 0
+    ROI_Y: 0
+  Floor:
+    X: 0
+    Y: 0
+    ROI_X: 0
+    ROI_Y: 0
+--- !u!4 &1908931427
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1908931425}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -5.185922, y: -2.2957585, z: 11.99986}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 14
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1974547830
 GameObject:
  m_ObjectHideFlags: 0
@ -3399,7 +3840,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 21
+  m_RootOrder: 22
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2084135709
 GameObject:
@ -3510,7 +3951,11 @@ MonoBehaviour:
  snowSize: 0.0164
  snowMaterial: {fileID: 2100000, guid: 56457e5f2df74a44c933b2791da81324, type: 2}
  cosineGradient: {fileID: 1167120024}
-  debug: 0
+  dayCharacters:
+  - {fileID: 1906326619}
+  nightCharacters:
+  - {fileID: 147055507}
+  debug: 1
 --- !u!4 &2084936104
 Transform:
  m_ObjectHideFlags: 0
@ -3580,65 +4025,3 @@ Canvas:
  m_SortingLayerID: 0
  m_SortingOrder: 0
  m_TargetDisplay: 0
--- !u!1 &2129467936
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 2129467939}
-  - component: {fileID: 2129467938}
-  - component: {fileID: 2129467937}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &2129467937
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 2129467936}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
--- !u!114 &2129467938
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 2129467936}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 5
--- !u!4 &2129467939
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 2129467936}
-  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: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Unity_2018_Frozen/Assets/Frozen/FrozenDayParticleUniforms.asset
+++ b/Unity_2018_Frozen/Assets/Frozen/FrozenDayParticleUniforms.asset
@ -14,7 +14,7 @@ MonoBehaviour:
  numRate: 1
  movement: 1
  geomSize: 0.556
-  velocityDamping: 0.85
+  velocityDamping: 0.1
  lifeDuration: 10
  lifeVariation: 0
  convergence: 0
--- a/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat
+++ b/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat
@ -81,7 +81,7 @@ Material:
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
-    - _Size: 0.0034641223
+    - _Size: 0
    - _SmoothnessTextureChannel: 0
    - _SoftParticlesEnabled: 0
    - _SoftParticlesFarFadeDistance: 1
--- a/Unity_2018_Frozen/Assets/Frozen/Material/Space.mat
+++ b/Unity_2018_Frozen/Assets/Frozen/Material/Space.mat
@ -70,7 +70,7 @@ Material:
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
-    - _Rate: 0.21122697
+    - _Rate: 0
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
--- a/Unity_2018_Frozen/Assets/Frozen/PostProcessingProfile.asset
+++ b/Unity_2018_Frozen/Assets/Frozen/PostProcessingProfile.asset
@ -101,7 +101,7 @@ MonoBehaviour:
    m_Settings:
      bloom:
        intensity: 2.17
-        threshold: 1
+        threshold: 1.1
        softKnee: 0.5
        radius: 4
        antiFlicker: 0
--- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs
+++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs
@ -3,57 +3,72 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
-public class CharacterBehaviour : MonoBehaviour {
+
+public class CharacterBehaviour : MonoBehaviour
+{

    [SerializeField]
    private bool standby = true;


    [Range(3, 15)]
-    public float DisAppearTime = 5;
+    public float disappearTime = 5;

    public Material mat;

    public Area area;
-    public Vector2 WallROI;
-    public float bottomHeight = 0.1f;
-    public float minHeight = 0;
-    public float MaxHeight = 0.5f;
+    public Vector2 wallRoi;
+    public Vector2 heightRange = new Vector2(0.0f, 0.5f);
+    float origin_height = 0.0f;
    [SerializeField]
-    private RectTransform m_recttrans;
+    private RectTransform fakeButton;

-    public DShowClip standbyclip;
-    public DShowClip TriggerClip;
+    public DShowClip standbyClip;
+    public DShowClip triggerClip;
    [SerializeField]
    private DShowMoviePlayer[] players;
    private MeshRenderer m_meshRender;
    public Color color;
    private bool isSleep;

-    public float VideoStopTime = 1.5f;
+    public float videoStopTime = 1.5f;

    private void Awake()
    {
        m_meshRender = GetComponent<MeshRenderer>();
        mat = new Material(Shader.Find("Unlit/ColorTransparent"));
        m_meshRender.material = mat;
-        List<Material> mats = new List<Material>();
-        mats.Add(mat);
-        InitialDSPlayer();
+
+        origin_height = transform.position.y;
+
+        InitialiseDSPlayer();
    }

-    void InitialDSPlayer()
+    void InitialiseDSPlayer()
    {
-        GameObject TriggerObj = new GameObject("Trigger");
-        TriggerObj.transform.parent = this.transform;
-        SetClip(TriggerObj.AddComponent<DShowMoviePlayer>(), TriggerClip);
+#if false
+        GameObject triggerObj = new GameObject("Trigger");
+        triggerObj.transform.parent = this.transform;
+        SetClip(triggerObj.AddComponent<DShowMoviePlayer>(), triggerClip);
        GameObject standbyObj = new GameObject("Standby");
        standbyObj.transform.parent = this.transform;
-        SetClip(standbyObj.AddComponent<DShowMoviePlayer>(), standbyclip);
+        SetClip(standbyObj.AddComponent<DShowMoviePlayer>(), standbyClip);
+#else
+        CreateDSPlayer(triggerClip);
+        CreateDSPlayer(standbyClip);
+        
+#endif
        players = GetComponentsInChildren<DShowMoviePlayer>();
    }

-    void SetClip(DShowMoviePlayer player,DShowClip clip)
+    void CreateDSPlayer(DShowClip clip)
+    {
+        GameObject triggerObj = new GameObject(clip.name);
+        triggerObj.transform.parent = this.transform;
+        SetClip(triggerObj.AddComponent<DShowMoviePlayer>(), clip);
+    }
+
+    void SetClip(DShowMoviePlayer player, DShowClip clip)
    {
        player.VideoAsset = clip;
        player.Load();
@ -61,35 +76,43 @@ public class CharacterBehaviour : MonoBehaviour {

    void InitialTouchButton()
    {
-        if (m_recttrans != null)
+        if (fakeButton != null)
            return;
        GameObject obj = new GameObject(gameObject.name);
        obj.transform.parent = GameObject.Find("Final Canvas").transform;
-        m_recttrans = obj.AddComponent<RectTransform>();
-        m_recttrans.anchorMin = new Vector2(0, 0);
-        m_recttrans.anchorMax = new Vector2(0, 0);
-        m_recttrans.pivot = new Vector2(0.5f, 0.5f);
-        m_recttrans.sizeDelta = new Vector2(transform.localScale.x, transform.localScale.y) * FrozenScreenToWorldSpace.Instance.finalPixelsByMeter;
-        m_recttrans.gameObject.AddComponent<RawImage>();
-        m_recttrans.GetComponent<RawImage>().color = new Color(1, 1, 1, 0);
-        TouchArea toucharea = m_recttrans.gameObject.AddComponent<TouchArea>();
-        toucharea.PointerDown.AddListener((data)=> { Trigger(data); });
-        toucharea.PointerDrag.AddListener((data) => { Trigger(data); });
+        fakeButton = obj.AddComponent<RectTransform>();
+        fakeButton.anchorMin = new Vector2(0, 0);
+        fakeButton.anchorMax = new Vector2(0, 0);
+        fakeButton.pivot = new Vector2(0.5f, 0.5f);
+        fakeButton.sizeDelta = new Vector2(transform.localScale.x, transform.localScale.y) * FrozenScreenToWorldSpace.Instance.finalPixelsByMeter;
+        fakeButton.anchoredPosition3D = new Vector3(0, 0, 0);
+        fakeButton.localScale = Vector3.one;
+        fakeButton.gameObject.AddComponent<RawImage>();
+        fakeButton.GetComponent<RawImage>().color = new Color(1, 1, 1, 0);
+        TouchArea touch_area = fakeButton.gameObject.AddComponent<TouchArea>();
+        touch_area.PointerDown.AddListener((data) => { Trigger(data); });
+        touch_area.PointerDrag.AddListener((data) => { Trigger(data); });
    }

-    
-    // Use this for initialization
-    void Start () {
-
+    private void Start()
+    {
        standby = true;
        isSleep = false;
        mat.mainTextureScale = new Vector2(1, -1);
-        mat.mainTextureOffset = new Vector2(0,-1);
+        mat.mainTextureOffset = new Vector2(0, -1);
        StartCoroutine(PlayOnStart());
        InitialTouchButton();
        StartCoroutine(RandomPosNoTriggerOther());
    }
-	
+
+    private void OnEnable()
+    {
+        standby = true;
+        isSleep = false;
+        StartCoroutine(PlayOnStart());
+        StartCoroutine(RandomPosNoTriggerOther());
+    }
+
    IEnumerator PlayOnStart()
    {
        DShowMoviePlayer player = currentPlayer;
@ -101,13 +124,13 @@ public class CharacterBehaviour : MonoBehaviour {
            yield return null;
        }
    }
-
-	// Update is called once per frame
-	void Update () {
+    
+    void Update()
+    {

        if (Input.GetKeyDown(KeyCode.R))
        {
-            if(!isTriggerCollider)
+            if (!isTriggerCollider)
                StartCoroutine(RandomPosNoTriggerOther());
        }

@ -128,7 +151,7 @@ public class CharacterBehaviour : MonoBehaviour {

    void CheckPlayFinished()
    {
-        if(currentPlayer.IsFinished)
+        if (currentPlayer.IsFinished)
        {
            StartCoroutine(Sleep());
        }
@ -163,10 +186,10 @@ public class CharacterBehaviour : MonoBehaviour {
    {
        Vector3 n_pos = transform.localPosition;
        if (area == Area.TopWall)
-            n_pos.x = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.length / 2, FrozenScreenToWorldSpace.Instance.length / 2, WallROI.x);
+            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);
+            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();
    }
@ -178,19 +201,19 @@ public class CharacterBehaviour : MonoBehaviour {
        float minX = transform.localScale.x / 2;

        if (randomPos.x == 0)
-            WallROI.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.length - minX) / FrozenScreenToWorldSpace.Instance.length;
+            wallRoi.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.length - minX) / FrozenScreenToWorldSpace.Instance.length;
        else
-            WallROI.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.width - minX) / FrozenScreenToWorldSpace.Instance.width;
-
-        WallROI.y = Random.Range((transform.localScale.y/2) - transform.localScale.y * bottomHeight + minHeight, MaxHeight) / (float)FrozenScreenToWorldSpace.Instance.height;
+            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;
        UpdatePos();
        SetButtonPos();
    }

    void SetButtonPos()
    {
-        Vector2 newScreenPos = FrozenScreenToWorldSpace.Instance.GetFinalScreenPos(area, WallROI);
-        m_recttrans.anchoredPosition = newScreenPos;
+        Vector2 newScreenPos = FrozenScreenToWorldSpace.Instance.GetFinalScreenPos(area, wallRoi);
+        fakeButton.anchoredPosition = newScreenPos;
    }

    private void Trigger(PointerEventData data)
@ -225,9 +248,9 @@ public class CharacterBehaviour : MonoBehaviour {
    {
        float value = 0;
        float origin = color.a;
-        while(value < 1)
+        while (value < 1)
        {
-            value = Mathf.Clamp(value + Time.deltaTime, 0,1);
+            value = Mathf.Clamp(value + Time.deltaTime, 0, 1);
            color.a = Mathf.Lerp(origin, targetA, value);
            yield return null;
        }
@ -244,7 +267,7 @@ public class CharacterBehaviour : MonoBehaviour {

    IEnumerator WaitVideoStopTimeFadeOut()
    {
-        yield return new WaitForSeconds(VideoStopTime);
+        yield return new WaitForSeconds(videoStopTime);
        yield return StartCoroutine(Fade(0));
        currentPlayer.Pause();
        currentPlayer.Frame = 0;
@ -271,8 +294,8 @@ public class CharacterBehaviour : MonoBehaviour {

    public float GetDisAppear()
    {
-        float distime = DisAppearTime - Random.Range(0, DisAppearTime / 2);
-        distime = DisAppearTime * distime - distime * distime + 0.5f * distime;
+        float distime = disappearTime - Random.Range(0, disappearTime / 2);
+        distime = disappearTime * distime - distime * distime + 0.5f * distime;
        return distime;
    }

--- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs
+++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs
@ -23,7 +23,11 @@ namespace UltraCombos.Frozen
        [SerializeField]
        BlendedCosineGradient cosineGradient;

+        [SerializeField]
+        List<CharacterBehaviour> dayCharacters = new List<CharacterBehaviour>();

+        [SerializeField]
+        List<CharacterBehaviour> nightCharacters = new List<CharacterBehaviour>();

        [SerializeField]
        bool debug = false;
@ -44,6 +48,16 @@ namespace UltraCombos.Frozen
            spaceMaterial.SetFloat("_Rate", rate);
            snowMaterial.SetFloat("_Size", Mathf.Lerp(0.0f, snowSize, rate));
            cosineGradient.rate = rate;
+
+            foreach (var chr in dayCharacters)
+            {
+                chr.gameObject.SetActive(rate < 0.5);
+            }
+
+            foreach (var chr in nightCharacters)
+            {
+                chr.gameObject.SetActive(rate > 0.5);
+            }
        }
    }
 }
--- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character.meta
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: a1f84fc011fb25549a87a26ff485f4c9
+folderAsset: yes
+timeCreated: 1525237785
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.mat
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.mat
@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Olaf_CC065053
+  m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3}
+  m_ShaderKeywords: _ALPHATEST_ON _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 27cff25a4554d2244bf3ce981ea0b14e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 1
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
--- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.mat.meta
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.mat.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 8ba933f3f4401b34ead3e5f188561901
+timeCreated: 1525245333
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea2a1abb08b7025e5c6fe28dec6128b9dd637a05587b73bded23391cfbce8b09
+size 1396447
--- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png.meta
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png.meta
@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 27cff25a4554d2244bf3ce981ea0b14e
+timeCreated: 1525254109
+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: 
--- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.mat
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.mat
@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Olaf_CC065056
+  m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3}
+  m_ShaderKeywords: _ALPHATEST_ON _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: c539a429349a5f24aa71a56e379a14f8, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 1
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
--- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.mat.meta
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.mat.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 9b8333bad640d1240ae139400daea38e
+timeCreated: 1525245333
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9dbff66109fd831cb3838e1eedf1c9b2db179faa53a4833f583c4487453511ea
+size 2219569
--- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png.meta
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png.meta
@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: c539a429349a5f24aa71a56e379a14f8
+timeCreated: 1525254109
+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: