From 1f4a59c7cdf4e9e886b762991995348cc14444a3 Mon Sep 17 00:00:00 2001 From: uc-hoba Date: Tue, 15 May 2018 18:43:51 +0800 Subject: [PATCH] refine --- .../Frozen/DSAsset/Marshmallow-Standby.asset | 2 +- .../Assets/Frozen/DSAsset/Space-Day.asset | 2 +- .../Assets/Frozen/DSAsset/Space-Night.asset | 2 +- Unity_2018_Frozen/Assets/Frozen/Frozen.unity | 297 ++++++++---------- 4 files changed, 134 insertions(+), 169 deletions(-) diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset index 2d2b9a2..a1558a7 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Marshmallow-Standby m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi + m_VideoPath: ../FrozenMaterial/icon/icon_elsa.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset index 9974e01..7298edb 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset +++ b/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-ice-forest-sq.avi + m_VideoPath: ../FrozenMaterial/space-ice-forest-sq_720p.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset index 74b3e2d..cd1103c 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset +++ b/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-sq.avi + m_VideoPath: ../FrozenMaterial/space-dark-mountain-sq_720p.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index 7b7528c..d2216c7 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -788,6 +788,136 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &321841692 +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 &338663764 GameObject: m_ObjectHideFlags: 0 @@ -1510,7 +1640,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 0.1 area: 0 AppearArea: 0000000001000000 @@ -2057,7 +2186,6 @@ GameObject: - component: {fileID: 768391777} - component: {fileID: 768391780} - component: {fileID: 768391779} - - component: {fileID: 768391778} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -2078,18 +2206,6 @@ Transform: m_Father: {fileID: 1216863872} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &768391778 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 768391776} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 2 --- !u!23 &768391779 MeshRenderer: m_ObjectHideFlags: 0 @@ -2682,136 +2798,6 @@ 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 @@ -3228,7 +3214,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 0 AppearArea: 02000000 @@ -3298,7 +3283,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 0 AppearArea: 000000000100000002000000 @@ -3570,7 +3554,6 @@ GameObject: - component: {fileID: 1329758487} - component: {fileID: 1329758490} - component: {fileID: 1329758489} - - component: {fileID: 1329758488} m_Layer: 8 m_Name: trigger m_TagString: Untagged @@ -3591,18 +3574,6 @@ Transform: m_Father: {fileID: 1216863872} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1329758488 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1329758486} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 2 --- !u!23 &1329758489 MeshRenderer: m_ObjectHideFlags: 0 @@ -3785,7 +3756,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 973459541} + m_Mesh: {fileID: 321841692} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -4080,7 +4051,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 2 AppearArea: 02000000 @@ -4886,7 +4856,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 0 AppearArea: 000000000100000002000000 @@ -5013,7 +4982,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 2 AppearArea: 02000000 @@ -5084,7 +5052,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 0 AppearArea: 02000000 @@ -5154,7 +5121,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 0 AppearArea: 000000000100000002000000 @@ -5393,7 +5359,6 @@ MonoBehaviour: - {fileID: 1973785474} - {fileID: 1984882819} - {fileID: 1225287935} - debug: 0 --- !u!4 &2084936104 Transform: m_ObjectHideFlags: 0