From c3c75240896eaa3edb033fbfeea7fca123156741 Mon Sep 17 00:00:00 2001 From: uc-hoba Date: Fri, 4 May 2018 14:14:58 +0800 Subject: [PATCH] update Sven and Krisoff material --- .../Assets/Frozen/DSAsset/Kristoff-Trigger.asset | 2 +- .../Assets/Frozen/DSAsset/Sven-Trigger.asset | 2 +- Unity_2018_Frozen/Assets/Frozen/Frozen.unity | 8 ++++---- Unity_2018_Frozen/Assets/Frozen/Material/Point.mat | 2 +- Unity_2018_Frozen/Assets/Frozen/Material/Space.mat | 2 +- .../Assets/Frozen/Texture/Character/Kristoff.png | 4 ++-- .../Assets/Frozen/Texture/Character/Kristoff.png.meta | 2 +- .../Assets/Frozen/Texture/Character/Sven.png | 4 ++-- .../Assets/Frozen/Texture/Character/Sven.png.meta | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset index abc937e..6ea2997 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Kristoff-Trigger m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/day/Kristoff.avi + m_VideoPath: ../FrozenMaterial/day/Kristoff_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset index 10fd15c..97bd178 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Sven-Trigger m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/day/Sven.avi + m_VideoPath: ../FrozenMaterial/day/Sven_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index 65d645e..ba57e66 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -983,7 +983,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &459917735 Transform: m_ObjectHideFlags: 0 @@ -1119,7 +1119,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 461690048} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.556, y: 1.117, z: 2.49} + m_LocalPosition: {x: -0.556, y: 1.299, z: 2.49} m_LocalScale: {x: 1.8937764, y: 1.8937769, z: 1.8937769} m_Children: [] m_Father: {fileID: 917676528} @@ -2773,7 +2773,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1690794384} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.757, y: 1.035, z: 2.49} + m_LocalPosition: {x: -1.757, y: 1.109, z: 2.49} m_LocalScale: {x: 1.4554749, y: 1.4554745, z: 1.4554745} m_Children: [] m_Father: {fileID: 917676528} @@ -3717,7 +3717,7 @@ Transform: m_GameObject: {fileID: 1973785471} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.329, y: 0.809, z: 2.49} - m_LocalScale: {x: 1.7848748, y: 1.7848743, z: 1.7848743} + m_LocalScale: {x: 2.294612, y: 1.7848743, z: 1.7848743} m_Children: [] m_Father: {fileID: 917676528} m_RootOrder: 8 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat index 2716760..8af543a 100644 --- 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 + - _Size: 0.0164 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 - _SoftParticlesFarFadeDistance: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Space.mat index 2fcd2ca..5402123 100644 --- 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 + - _Rate: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png index a209155..fe9910b 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33276ef7c6e2c08775cfc7f76e58f70f382d1007e1abe3b7a0e5a306f6c92264 -size 1342645 +oid sha256:bcd4d160496391f65c5d82c25a813a33ced7f1fbd744286fda05c11d15bc8591 +size 4243930 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta index fdfcee0..725756b 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta @@ -48,7 +48,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png index 43983a9..e2c4b48 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3eb120df72a001632ae978e722ad506c3b1b17345aae5234591ac9950dc66f72 -size 1659188 +oid sha256:d1484e6561e9e445d90940eb970fcc04a2ca0add754c1c03046cc4c3fe594529 +size 4262397 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta index 62c2397..51bd719 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta @@ -48,7 +48,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0