diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger.asset
index 6f2b41a..139da3e 100644
--- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger.asset
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger.asset
@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Name: Cloud-Trigger
   m_EditorClassIdentifier: 
   m_VideoLocation: 1
-  m_VideoPath: ../FrozenMaterial/effect/Cloud_Snow.avi
+  m_VideoPath: ../FrozenMaterial/effect/Cloud_Snow_hap.avi
diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/GiantSnowflake.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/GiantSnowflake.asset
index bbf897b..1b83a08 100644
--- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/GiantSnowflake.asset
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/GiantSnowflake.asset
@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Name: GiantSnowflake
   m_EditorClassIdentifier: 
   m_VideoLocation: 1
-  m_VideoPath: ../FrozenMaterial/effect/Floor_Effect.avi
+  m_VideoPath: ../FrozenMaterial/effect/Floor_Effect_hap.avi
diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset
new file mode 100644
index 0000000..2d2b9a2
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.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: Marshmallow-Standby
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi
diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset.meta
new file mode 100644
index 0000000..c8285f0
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 1691548c0a5a4494ba5e2c29ec477d7d
+timeCreated: 1524210684
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Trigger.asset
new file mode 100644
index 0000000..90230b4
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-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: Marshmallow-Trigger
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/night/Marshmallow_Hap.avi
diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Trigger.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Trigger.asset.meta
new file mode 100644
index 0000000..41f4522
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Trigger.asset.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 6ccf813116f07944faf4af6bc3b2c1f7
+timeCreated: 1524453128
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat b/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat
index 31a27a3..5558434 100644
--- a/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat
+++ b/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:
diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow.mat
new file mode 100644
index 0000000..c5608e4
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow.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: Marshmallow
+  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: 0488d36ab02f2d94c9f9c6506c2c3834, 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}
diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow.mat.meta
new file mode 100644
index 0000000..c0aca19
--- /dev/null
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow.mat.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 26431f824b7c8384bbc23c36bd054e2b
+timeCreated: 1525245333
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow.png.meta
index 7f8a32c..d370163 100644
--- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow.png.meta
+++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow.png.meta
@@ -49,7 +49,7 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
   textureType: 0
   textureShape: 1
@@ -67,6 +67,16 @@ TextureImporter:
     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: []