diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_day-Standby.asset similarity index 78% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_day-Standby.asset index a226467..9a35c2f 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_day-Standby.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} - m_Name: Kristoff-Standby + m_Name: Anna_day-Standby m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/day/snowball_only_hap.avi + m_VideoPath: ../FrozenMaterial/day/snow_only_day_version_timeRemap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_day-Standby.asset.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset.meta rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_day-Standby.asset.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_day-Trigger.asset similarity index 81% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_day-Trigger.asset index 0809b5a..88e73a8 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_day-Trigger.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} - m_Name: Anna-Standby + m_Name: Anna_day-Trigger m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/day/snowball_only_hap.avi + m_VideoPath: ../FrozenMaterial/day/anna_day_version.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_day-Trigger.asset.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset.meta rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_day-Trigger.asset.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-Standby.asset new file mode 100644 index 0000000..13e4031 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-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: Anna_night-Standby + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/day/snow_only_night_version_timeRemap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-Standby.asset.meta new file mode 100644 index 0000000..3c4ed8e --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-Standby.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e01bda1b2f4d30449943b9721c77f15a +timeCreated: 1524210684 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-Trigger.asset similarity index 80% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-Trigger.asset index 632bc87..1a25ea7 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-Trigger.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} - m_Name: Anna-Trigger + m_Name: Anna_night-Trigger m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/day/anna_hap.avi + m_VideoPath: ../FrozenMaterial/day/anna_night_version.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-Trigger.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-Trigger.asset.meta new file mode 100644 index 0000000..1e8ce49 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna_night-Trigger.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 09d68748e0fd58e47baf6183a8fd34c7 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_day-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_day-Standby.asset new file mode 100644 index 0000000..093a0db --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_day-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: Kristoff_day-Standby + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/day/snow_only_day_version_timeRemap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_day-Standby.asset.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset.meta rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_day-Standby.asset.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_day-Trigger.asset similarity index 78% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_day-Trigger.asset index cafd509..5316c53 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_day-Trigger.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} - m_Name: Kristoff-Trigger + m_Name: Kristoff_day-Trigger m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/day/Sven_and_Krostoff_hap.avi + m_VideoPath: ../FrozenMaterial/day/Sven_and_Krostoff_day_version.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_day-Trigger.asset.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset.meta rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_day-Trigger.asset.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-Standby.asset new file mode 100644 index 0000000..3d738f1 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-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: Kristoff_night-Standby + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/day/snow_only_night_version_timeRemap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-Standby.asset.meta new file mode 100644 index 0000000..4bd78d6 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-Standby.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d695b444261b7244b9ff121652bf969c +timeCreated: 1524210684 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-Trigger.asset new file mode 100644 index 0000000..4d775a5 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-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: Kristoff_night-Trigger + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/day/Sven_and_Krostoff_night_version.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-Trigger.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-Trigger.asset.meta new file mode 100644 index 0000000..e453e32 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff_night-Trigger.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3c7f1e73fcea2fa4c8eb036551a33fce +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index 00fd660..1e76a1a 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -185,6 +185,77 @@ MonoBehaviour: Culture=neutral, PublicKeyToken=null mode: 0 info: +--- !u!1 &38018603 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 38018604} + - component: {fileID: 38018606} + - component: {fileID: 38018605} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &38018604 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 38018603} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.064, z: 0} + m_LocalScale: {x: 2.2408729, y: 2.2408736, z: 2.2408736} + m_Children: [] + m_Father: {fileID: 1186117295} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &38018605 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 38018603} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 6428822e793992140920a5fc4aed3246, 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!33 &38018606 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 38018603} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &40068778 GameObject: m_ObjectHideFlags: 0 @@ -905,6 +976,8 @@ Transform: - {fileID: 1225287932} - {fileID: 1008043395} - {fileID: 33825546} + - {fileID: 1186117295} + - {fileID: 639322481} m_Father: {fileID: 338663765} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1042,6 +1115,77 @@ MonoBehaviour: PlayOnStart: 1 Looping: 1 AudioVolume: 1 +--- !u!1 &276089015 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 276089016} + - component: {fileID: 276089018} + - component: {fileID: 276089017} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &276089016 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 276089015} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.131, y: 1.288, z: 0} + m_LocalScale: {x: 2.865287, y: 2.8652864, z: 2.8652864} + m_Children: [] + m_Father: {fileID: 639322481} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &276089017 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 276089015} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 3b49bed3888e5484ca0ed09576d2039c, 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!33 &276089018 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 276089015} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &282141325 GameObject: m_ObjectHideFlags: 0 @@ -1115,136 +1259,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &350531548 -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 &350883107 GameObject: m_ObjectHideFlags: 0 @@ -1744,7 +1758,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 423869583} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.876, z: 0} + m_LocalPosition: {x: 0, y: 1.064, z: 0} m_LocalScale: {x: 2.2408729, y: 2.2408736, z: 2.2408736} m_Children: [] m_Father: {fileID: 1933714481} @@ -2504,6 +2518,92 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} m_IsPrefabParent: 0 +--- !u!1 &639322480 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 639322481} + - component: {fileID: 639322483} + - component: {fileID: 639322482} + m_Layer: 8 + m_Name: Kristoff&Sven_night + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &639322481 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 639322480} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.462, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 276089016} + - {fileID: 1470412009} + m_Father: {fileID: 199010598} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &639322482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 639322480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 2 +--- !u!114 &639322483 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 639322480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} + m_Name: + m_EditorClassIdentifier: + appearSataes: 02000000 + videoStopTime: 10 + disappearTime: 1 + area: 2 + appearAreas: + specificPositions: + - {fileID: 639322482} + roaming: 0 + fakeButton: {fileID: 0} + isStandbyLoop: 0 + standbyClip: {fileID: 11400000, guid: d695b444261b7244b9ff121652bf969c, type: 2} + triggerClips: + - {fileID: 11400000, guid: 3c7f1e73fcea2fa4c8eb036551a33fce, type: 2} + onTrigger: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1443956514} + m_MethodName: PlayOneShot + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + mode: 0 + info: --- !u!1 &658720283 GameObject: m_ObjectHideFlags: 0 @@ -3782,7 +3882,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1061158671} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.116, z: 0} + m_LocalPosition: {x: -0.131, y: 1.288, z: 0} m_LocalScale: {x: 2.865287, y: 2.8652864, z: 2.8652864} m_Children: [] m_Father: {fileID: 1690794385} @@ -4008,6 +4108,92 @@ MonoBehaviour: fromGradient: {fileID: 11400000, guid: dc41f63c436894340a6736facd7dd4a9, type: 2} toGradient: {fileID: 11400000, guid: 64901b7b2c93cde4fa631ba16f78157c, type: 2} rate: 0 +--- !u!1 &1186117294 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1186117295} + - component: {fileID: 1186117297} + - component: {fileID: 1186117296} + m_Layer: 8 + m_Name: Anna_night + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1186117295 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1186117294} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.883, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1890969984} + - {fileID: 38018604} + m_Father: {fileID: 199010598} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1186117296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1186117294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 2 +--- !u!114 &1186117297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1186117294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} + m_Name: + m_EditorClassIdentifier: + appearSataes: 02000000 + videoStopTime: 10 + disappearTime: 1 + area: 2 + appearAreas: + specificPositions: + - {fileID: 1186117296} + roaming: 0 + fakeButton: {fileID: 0} + isStandbyLoop: 0 + standbyClip: {fileID: 11400000, guid: e01bda1b2f4d30449943b9721c77f15a, type: 2} + triggerClips: + - {fileID: 11400000, guid: 09d68748e0fd58e47baf6183a8fd34c7, type: 2} + onTrigger: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1443956514} + m_MethodName: PlayOneShot + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + mode: 0 + info: --- !u!1 &1191975162 GameObject: m_ObjectHideFlags: 0 @@ -4902,7 +5088,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 350531548} + m_Mesh: {fileID: 2032789833} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -5087,7 +5273,7 @@ MonoBehaviour: m_EditorClassIdentifier: width: 8 length: 5 - height: 0.65 + height: 1.53 --- !u!1 &1451842896 GameObject: m_ObjectHideFlags: 0 @@ -5153,6 +5339,77 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1470412008 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1470412009} + - component: {fileID: 1470412011} + - component: {fileID: 1470412010} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1470412009 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1470412008} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.13100004, y: 1.288, z: 0} + m_LocalScale: {x: 2.865287, y: 2.8652864, z: 2.8652864} + m_Children: [] + m_Father: {fileID: 639322481} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1470412010 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1470412008} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 891a410e740f0c245b286ff17d335da7, 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!33 &1470412011 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1470412008} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1533221621 GameObject: m_ObjectHideFlags: 0 @@ -5468,7 +5725,7 @@ GameObject: - component: {fileID: 1690794387} - component: {fileID: 1690794391} m_Layer: 8 - m_Name: Kristoff & Sven + m_Name: Kristoff&Sven_day m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5500,7 +5757,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - appearSataes: 0100000002000000 + appearSataes: 01000000 videoStopTime: 10 disappearTime: 1 area: 2 @@ -6291,7 +6548,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1858061292} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.116, z: 0} + m_LocalPosition: {x: -0.13100004, y: 1.288, z: 0} m_LocalScale: {x: 2.865287, y: 2.8652864, z: 2.8652864} m_Children: [] m_Father: {fileID: 1690794385} @@ -6437,6 +6694,77 @@ Transform: m_Father: {fileID: 199010598} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1890969983 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1890969984} + - component: {fileID: 1890969986} + - component: {fileID: 1890969985} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1890969984 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1890969983} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.064, z: 0} + m_LocalScale: {x: 2.2408729, y: 2.2408736, z: 2.2408736} + m_Children: [] + m_Father: {fileID: 1186117295} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1890969985 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1890969983} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 209ec433e17fece4b9fedb2ca4e940da, 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!33 &1890969986 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1890969983} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1906326616 GameObject: m_ObjectHideFlags: 0 @@ -6682,7 +7010,7 @@ GameObject: - component: {fileID: 1933714483} - component: {fileID: 1933714487} m_Layer: 8 - m_Name: Anna + m_Name: Anna_day m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6714,7 +7042,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - appearSataes: 0100000002000000 + appearSataes: 01000000 videoStopTime: 10 disappearTime: 1 area: 2 @@ -7014,6 +7342,136 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &2032789833 +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 @@ -7248,7 +7706,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2086317000} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.876, z: 0} + m_LocalPosition: {x: 0, y: 1.064, z: 0} m_LocalScale: {x: 2.2408729, y: 2.2408736, z: 2.2408736} m_Children: [] m_Father: {fileID: 1933714481} diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs index 796ed44..4fe1f71 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs @@ -66,8 +66,7 @@ namespace UltraCombos.Frozen [SerializeField, Header("Debug")] bool mode = false; - [SerializeField] - string info; + public string info; private void Awake() { @@ -196,7 +195,10 @@ namespace UltraCombos.Frozen ply.Frame = 0; } - flow = StartCoroutine(Flow()); + if (is_alive) + { + flow = StartCoroutine(Flow()); + } } IEnumerator Flow() diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_day-icn.mat similarity index 94% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_day-icn.mat index 3eaaf68..16f2fdb 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_day-icn.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: Sven + m_Name: Anna_day-icn m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} m_ShaderKeywords: _ALPHATEST_ON _EMISSION m_LightmapFlags: 1 @@ -39,7 +39,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 110fcbd4884145b40a9b0d51024aaecf, type: 3} + m_Texture: {fileID: 2800000, guid: b651412fa7667be4ea9f2ca02b6ead8e, 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/Anna-icn.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_day-icn.mat.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_day-icn.mat.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_day.mat similarity index 95% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_day.mat index b1e8d86..9955a68 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_day.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: Anna-icn + m_Name: Anna_day m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} m_ShaderKeywords: _ALPHATEST_ON _EMISSION m_LightmapFlags: 1 @@ -39,7 +39,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: d2326e93b3259884bb63ae615548d026, type: 3} + m_Texture: {fileID: 2800000, guid: 264c457108bce9340bb6254bf12a666c, 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/Anna.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_day.mat.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_day.mat.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night-icn.mat similarity index 94% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven.mat rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night-icn.mat index c645e2f..537ff71 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night-icn.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: Kristoff_Sven + m_Name: Anna_night-icn m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} m_ShaderKeywords: _ALPHATEST_ON _EMISSION m_LightmapFlags: 1 @@ -39,7 +39,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: d8e00fc77117d3c4d9db386a3981feb8, type: 3} + m_Texture: {fileID: 2800000, guid: 1bfe7a4abd3460d4b9c73fd583936892, 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/Sven.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night-icn.mat.meta similarity index 83% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night-icn.mat.meta index b1eb94d..fc87640 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat.meta +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night-icn.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 839c0e58e555dab48be2d0d4b169e1ca +guid: 6428822e793992140920a5fc4aed3246 timeCreated: 1525245333 licenseType: Free NativeFormatImporter: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night.mat similarity index 94% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night.mat index 1eac9a8..749af27 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: Anna + m_Name: Anna_night m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} m_ShaderKeywords: _ALPHATEST_ON _EMISSION m_LightmapFlags: 1 @@ -39,7 +39,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 6e92be5ab67533c4b8681d9ec0a2ebb8, type: 3} + m_Texture: {fileID: 2800000, guid: 232dd7a7448c39e49ad9be6b54b6c5a2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night.mat.meta similarity index 50% rename from Unity_2018_Frozen/Assets/Klak/DFVolume.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night.mat.meta index 1acc0f3..d884af2 100644 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume.meta +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna_night.mat.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: ca518c47d081cd74da803a9492ef8bc7 -folderAsset: yes -timeCreated: 1520409176 +guid: 209ec433e17fece4b9fedb2ca4e940da +timeCreated: 1525245333 licenseType: Free -DefaultImporter: +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png deleted file mode 100644 index b8d4a12..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e21eaba3dcbee8af9bf2367f66fd0f9791c1bd69015eedc520d81fc6e2e4ffdb -size 1162727 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_day-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_day-icn.mat new file mode 100644 index 0000000..b72388d --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_day-icn.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: Kristoff_Sven_day-icn + 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: b651412fa7667be4ea9f2ca02b6ead8e, 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/Kristoff_Sven-icn.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_day-icn.mat.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_day-icn.mat.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_day.mat similarity index 94% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_day.mat index 0176713..dc0a4f1 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_day.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: Kristoff_Sven-icn + m_Name: Kristoff_Sven_day m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} m_ShaderKeywords: _ALPHATEST_ON _EMISSION m_LightmapFlags: 1 @@ -39,7 +39,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: d2326e93b3259884bb63ae615548d026, type: 3} + m_Texture: {fileID: 2800000, guid: bba2bd05f27d41f419c29119ced01390, 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/Kristoff_Sven.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_day.mat.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven.mat.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_day.mat.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_night-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_night-icn.mat new file mode 100644 index 0000000..45044d4 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_night-icn.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: Kristoff_Sven_night-icn + 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: 1bfe7a4abd3460d4b9c73fd583936892, 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/Kristoff_Sven_night-icn.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_night-icn.mat.meta new file mode 100644 index 0000000..c9db4f4 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_night-icn.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 891a410e740f0c245b286ff17d335da7 +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_night.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_night.mat new file mode 100644 index 0000000..50840f7 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_night.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: Kristoff_Sven_night + 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: 11a216e33ca81e648af7978be04019d5, 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/Kristoff_Sven_night.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_night.mat.meta new file mode 100644 index 0000000..874e410 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven_night.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3b49bed3888e5484ca0ed09576d2039c +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png deleted file mode 100644 index 9ac0c44..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2fce8b15277572ebc8e3f31e9d07ead49cec49670cec71a775ed9c9df64736a0 -size 1085805 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_day_version.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_day_version.png new file mode 100644 index 0000000..162ce35 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_day_version.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8012fcf9bb6a11953bddf305ad95853d81e3e3473afc33379eacbd67b8528c4 +size 1041311 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_day_version.png.meta similarity index 96% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_day_version.png.meta index 725756b..566ac12 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_day_version.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 8a3849f71f810db4094f196d78e406ea -timeCreated: 1525321799 +guid: bba2bd05f27d41f419c29119ced01390 +timeCreated: 1527492825 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_night_version.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_night_version.png new file mode 100644 index 0000000..d0640be --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_night_version.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85fe90b819c0cfb423d706c0ebbc842b3de6061e0864f596592f4240c6d4b912 +size 1051511 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_night_version.png.meta similarity index 96% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_night_version.png.meta index 51bd719..c3f9b43 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff_night_version.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 110fcbd4884145b40a9b0d51024aaecf -timeCreated: 1525321797 +guid: 11a216e33ca81e648af7978be04019d5 +timeCreated: 1527492822 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png deleted file mode 100644 index 4a171ee..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e90ddd6acf38a4835fbb853c37f89bb030c43a1e8e05498f6fc6da73cda03b13 -size 285060 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_day_version.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_day_version.png new file mode 100644 index 0000000..23a97fb --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_day_version.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:484fcb442bbe9e455af367816f328ea3fcf1e5c729ff2b79b3ef1354dd951392 +size 556052 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_day_version.png.meta similarity index 96% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_day_version.png.meta index 6a0253d..3ea6435 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png.meta +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_day_version.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 6e92be5ab67533c4b8681d9ec0a2ebb8 -timeCreated: 1525321799 +guid: 264c457108bce9340bb6254bf12a666c +timeCreated: 1527492824 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_night_version.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_night_version.png new file mode 100644 index 0000000..b5a388e --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_night_version.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:220e2bb6b75f20b04da9ba59b53ddc43c18ee96f409a4fdb1d82a532e854c510 +size 573127 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_night_version.png.meta similarity index 96% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_night_version.png.meta index 0192f7d..4b1bd00 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png.meta +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna_night_version.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: d2326e93b3259884bb63ae615548d026 -timeCreated: 1526286554 +guid: 232dd7a7448c39e49ad9be6b54b6c5a2 +timeCreated: 1527492823 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -37,7 +37,7 @@ TextureImporter: wrapU: -1 wrapV: -1 wrapW: -1 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 spriteMode: 0 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_day_version_timeRemap.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_day_version_timeRemap.png new file mode 100644 index 0000000..cce71de --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_day_version_timeRemap.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbcfce61818fc553738cb51d53ddf3deb1104ec1faf80a836cf09f8477462933 +size 1542198 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_day_version_timeRemap.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_day_version_timeRemap.png.meta new file mode 100644 index 0000000..15b9676 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_day_version_timeRemap.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: b651412fa7667be4ea9f2ca02b6ead8e +timeCreated: 1527492824 +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: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_night_version_timeRemap.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_night_version_timeRemap.png new file mode 100644 index 0000000..11a025b --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_night_version_timeRemap.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af067808cca979dbe2d786e4d6acaa5530ea013ddf1b60efc0dcd6af6e999bac +size 1228252 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_night_version_timeRemap.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_night_version_timeRemap.png.meta new file mode 100644 index 0000000..1deba14 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snow_only_night_version_timeRemap.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 1bfe7a4abd3460d4b9c73fd583936892 +timeCreated: 1527492823 +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: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png deleted file mode 100644 index 3f967e5..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9acc6de36d4b47218f859ba38956322f74cc001b1c3551347b3ae377916c5be -size 1450853 diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor.meta b/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor.meta deleted file mode 100644 index 0b67216..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: aab843967d2cba349b396e899e4a4f3e -folderAsset: yes -timeCreated: 1495866268 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeDataEditor.cs b/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeDataEditor.cs deleted file mode 100644 index e8ec011..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeDataEditor.cs +++ /dev/null @@ -1,17 +0,0 @@ -// DFVolume - Distance field volume generator for Unity -// https://github.com/keijiro/DFVolume - -using UnityEngine; -using UnityEditor; - -namespace DFVolume -{ - [CustomEditor(typeof(VolumeData))] - class VolumeDataEditor : Editor - { - public override void OnInspectorGUI() - { - // There is nothing to show in the inspector. - } - } -} diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeDataEditor.cs.meta b/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeDataEditor.cs.meta deleted file mode 100644 index d2c41e9..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeDataEditor.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: e4bc68d473b019949ad3452e429eca70 -timeCreated: 1495873608 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeSamplerEditor.cs b/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeSamplerEditor.cs deleted file mode 100644 index e4ee704..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeSamplerEditor.cs +++ /dev/null @@ -1,70 +0,0 @@ -// DFVolume - Distance field volume generator for Unity -// https://github.com/keijiro/DFVolume - -using UnityEngine; -using UnityEditor; -using System.Collections.Generic; -using System.IO; -using System.Linq; - -namespace DFVolume -{ - [CanEditMultipleObjects] - [CustomEditor(typeof(VolumeSampler))] - class VolumeSamplerEditor : Editor - { - SerializedProperty _resolution; - SerializedProperty _extent; - - void OnEnable() - { - _resolution = serializedObject.FindProperty("_resolution"); - _extent = serializedObject.FindProperty("_extent"); - } - - public override void OnInspectorGUI() - { - serializedObject.Update(); - - EditorGUILayout.PropertyField(_resolution); - EditorGUILayout.PropertyField(_extent); - - serializedObject.ApplyModifiedProperties(); - - if (GUILayout.Button("Create Volume Data")) CreateVolumeData(); - - CheckSkewedTransform(); - } - - void CreateVolumeData() - { - var output = new List(); - - foreach (VolumeSampler sampler in targets) - { - var path = "Assets/New Volume Data.asset"; - path = AssetDatabase.GenerateUniqueAssetPath(path); - - var asset = ScriptableObject.CreateInstance(); - asset.Initialize(sampler); - - AssetDatabase.CreateAsset(asset, path); - AssetDatabase.AddObjectToAsset(asset.texture, asset); - } - - AssetDatabase.SaveAssets(); - - EditorUtility.FocusProjectWindow(); - Selection.objects = output.ToArray(); - } - - void CheckSkewedTransform() - { - if (targets.Any(o => ((Component)o).transform.lossyScale != Vector3.one)) - EditorGUILayout.HelpBox( - "Using scale in transform may introduce error in output volumes.", - MessageType.Warning - ); - } - } -} diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeSamplerEditor.cs.meta b/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeSamplerEditor.cs.meta deleted file mode 100644 index e14b0e5..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeSamplerEditor.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 4672eacadf8f922469c2d31bc2c8cc98 -timeCreated: 1495866282 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeVisualizer.cs b/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeVisualizer.cs deleted file mode 100644 index e1ff61c..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeVisualizer.cs +++ /dev/null @@ -1,35 +0,0 @@ -// DFVolume - Distance field volume generator for Unity -// https://github.com/keijiro/DFVolume - -using UnityEngine; -using UnityEditor; - -namespace DFVolume -{ - [CanEditMultipleObjects] - [CustomEditor(typeof(VolumeVisualizer))] - class VolumeVisualizerEditor : Editor - { - SerializedProperty _data; - SerializedProperty _mode; - SerializedProperty _depth; - - void OnEnable() - { - _data = serializedObject.FindProperty("_data"); - _mode = serializedObject.FindProperty("_mode"); - _depth = serializedObject.FindProperty("_depth"); - } - - public override void OnInspectorGUI() - { - serializedObject.Update(); - - EditorGUILayout.PropertyField(_data); - EditorGUILayout.PropertyField(_mode); - EditorGUILayout.PropertyField(_depth); - - serializedObject.ApplyModifiedProperties(); - } - } -} diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeVisualizer.cs.meta b/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeVisualizer.cs.meta deleted file mode 100644 index 8280464..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/Editor/VolumeVisualizer.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 9e6edf4b9a972704f92c4329f66b08e5 -timeCreated: 1495949435 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/Shader.meta b/Unity_2018_Frozen/Assets/Klak/DFVolume/Shader.meta deleted file mode 100644 index 4ac6417..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/Shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: f9932d3e3540d7d42967c0084417fc5c -folderAsset: yes -timeCreated: 1495885014 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/Shader/Visualizer.shader b/Unity_2018_Frozen/Assets/Klak/DFVolume/Shader/Visualizer.shader deleted file mode 100644 index 15025f8..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/Shader/Visualizer.shader +++ /dev/null @@ -1,60 +0,0 @@ -// DFVolume - Distance field volume generator for Unity -// https://github.com/keijiro/DFVolume - -Shader "Hidden/DFVolume/Visualizer" -{ - Properties - { - _MainTex("", 3D) = "white" {} - } - - CGINCLUDE - - #include "UnityCG.cginc" - - struct appdata - { - float4 vertex : POSITION; - float2 texcoord : TEXCOORD; - }; - - struct v2f - { - float4 vertex : SV_POSITION; - float2 texcoord : TEXCOORD; - }; - - sampler3D _MainTex; - float _Depth; - float _Mode; - - v2f vert(appdata v) - { - v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); - o.texcoord = v.texcoord; - return o; - } - - fixed4 frag(v2f i) : SV_Target - { - fixed4 data = tex3D(_MainTex, float3(i.texcoord, _Depth)); - fixed dist = abs(0.5 - frac(data.a * 10)) * 2; - fixed3 grad = data.rgb + 0.5; - return fixed4(lerp(dist, grad, _Mode), 1); - } - - ENDCG - - SubShader - { - Tags { "RenderType"="Opaque" } - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - ENDCG - } - } -} diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/Shader/Visualizer.shader.meta b/Unity_2018_Frozen/Assets/Klak/DFVolume/Shader/Visualizer.shader.meta deleted file mode 100644 index c86f352..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/Shader/Visualizer.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: e87e89fb693f01e47ac90f63e832ed83 -timeCreated: 1495876326 -licenseType: Pro -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeData.cs b/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeData.cs deleted file mode 100644 index e692d89..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeData.cs +++ /dev/null @@ -1,54 +0,0 @@ -// DFVolume - Distance field volume generator for Unity -// https://github.com/keijiro/DFVolume - -using System.Collections.Generic; -using UnityEngine; - -namespace DFVolume -{ - public class VolumeData : ScriptableObject - { - #region Exposed attributes - - [SerializeField] Texture3D _texture; - - public Texture3D texture { - get { return _texture; } - } - - List _data; - - public List data - { - get { return _data; } - } - - #endregion - -#if UNITY_EDITOR - - #region Editor functions - - public void Initialize(VolumeSampler sampler) - { - var bmp = sampler.GenerateBitmap(); - - var dim = sampler.resolution; - _texture = new Texture3D(dim, dim, dim, TextureFormat.RGBAHalf, true); - - _texture.name = "Distance Field Texture"; - _texture.filterMode = FilterMode.Bilinear; - _texture.wrapMode = TextureWrapMode.Clamp; - _texture.SetPixels(bmp); - _texture.Apply(); - - _data = new List(); - foreach (var c in bmp) - _data.Add(new Vector4(c.r, c.g, c.b, c.a)); - } - - #endregion - - #endif - } -} diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeData.cs.meta b/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeData.cs.meta deleted file mode 100644 index d06e035..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeData.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 432ac308e27df9f4ebdfd3523b98cad3 -timeCreated: 1495869190 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeSampler.cs b/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeSampler.cs deleted file mode 100644 index bdaf0f1..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeSampler.cs +++ /dev/null @@ -1,122 +0,0 @@ -// DFVolume - Distance field volume generator for Unity -// https://github.com/keijiro/DFVolume - -using UnityEngine; - -namespace DFVolume -{ - public class VolumeSampler : MonoBehaviour - { - #region Exposed attributes - - [SerializeField] int _resolution = 50; - - public int resolution { - get { return _resolution; } - } - - [SerializeField] float _extent = 0.5f; - - public float extent { - get { return _extent; } - } - - #endregion - - #if UNITY_EDITOR - - #region Editor functions - - void OnDrawGizmos() - { - Gizmos.matrix = transform.localToWorldMatrix; - Gizmos.color = Color.yellow; - Gizmos.DrawWireCube(Vector3.zero, Vector3.one * _extent * 2); - } - - public Color[] GenerateBitmap() - { - // Generate a distance field. - var df = new float[_resolution * _resolution * _resolution]; - - for (var xi = 0; xi < _resolution; xi++) - { - var x = 2.0f * xi / (_resolution - 1) - 1; - for (var yi = 0; yi < _resolution; yi++) - { - var y = 2.0f * yi / (_resolution - 1) - 1; - for (var zi = 0; zi < _resolution; zi++) - { - var z = 2.0f * zi / (_resolution - 1) - 1; - - var pt = new Vector3(x, y, z) * _extent; - pt = transform.TransformPoint(pt); - - var dist = SearchDistance(pt) * 0.5f / _extent; - df[GetIndex(xi, yi, zi)] = dist; - } - } - } - - // Compute gradients and pack them into a bitmap. - var bmp = new Color[df.Length]; - var dds2 = (_resolution - 1) / 2.0f; - - for (var xi = 0; xi < _resolution; xi++) - { - for (var yi = 0; yi < _resolution; yi++) - { - for (var zi = 0; zi < _resolution; zi++) - { - var d = df[GetIndex(xi, yi, zi)]; - var dx0 = df[GetIndex(xi - 1, yi, zi)]; - var dx1 = df[GetIndex(xi + 1, yi, zi)]; - var dy0 = df[GetIndex(xi, yi - 1, zi)]; - var dy1 = df[GetIndex(xi, yi + 1, zi)]; - var dz0 = df[GetIndex(xi, yi, zi - 1)]; - var dz1 = df[GetIndex(xi, yi, zi + 1)]; - - bmp[GetIndex(xi, yi, zi)] = new Color( - (dx1 - dx0) * dds2, - (dy1 - dy0) * dds2, - (dz1 - dz0) * dds2, - d - ); - } - } - } - - return bmp; - } - - #endregion - - #region Private functions - - int GetIndex(int xi, int yi, int zi) - { - xi = Mathf.Clamp(xi, 0, _resolution - 1); - yi = Mathf.Clamp(yi, 0, _resolution - 1); - zi = Mathf.Clamp(zi, 0, _resolution - 1); - return xi + _resolution * (yi + _resolution * zi); - } - - float SearchDistance(Vector3 pt) - { - var r = _extent; - var s = _extent * 0.5f; - - for (var i = 0; i < 10; i++) - { - r += (Physics.CheckSphere(pt, r) ? -1 : 1) * s; - s *= 0.5f; - } - - return r; - } - - #endregion - - #endif - } -} diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeSampler.cs.meta b/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeSampler.cs.meta deleted file mode 100644 index 9d512e2..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeSampler.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 8b8cecf65d18af24daf10718a8526e01 -timeCreated: 1495864966 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeVisualizer.cs b/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeVisualizer.cs deleted file mode 100644 index 043c175..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeVisualizer.cs +++ /dev/null @@ -1,49 +0,0 @@ -// DFVolume - Distance field volume generator for Unity -// https://github.com/keijiro/DFVolume - -using UnityEngine; - -namespace DFVolume -{ - [ExecuteInEditMode] - public class VolumeVisualizer : MonoBehaviour - { - enum Mode { Distance, Gradient } - - [SerializeField] VolumeData _data; - [SerializeField] Mode _mode; - [SerializeField, Range(0, 1)] float _depth = 0.5f; - - [SerializeField, HideInInspector] Mesh _quadMesh; - [SerializeField, HideInInspector] Shader _shader; - - Material _material; - - void OnDestroy() - { - if (_material != null) - if (Application.isPlaying) - Destroy(_material); - else - DestroyImmediate(_material); - } - - void Update() - { - if (_material == null) - { - _material = new Material(_shader); - _material.hideFlags = HideFlags.DontSave; - } - - _material.SetTexture("_MainTex", _data.texture); - _material.SetFloat("_Depth", _depth); - _material.SetFloat("_Mode", (int)_mode); - - Graphics.DrawMesh( - _quadMesh, transform.localToWorldMatrix, - _material, gameObject.layer - ); - } - } -} diff --git a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeVisualizer.cs.meta b/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeVisualizer.cs.meta deleted file mode 100644 index 58d636e..0000000 --- a/Unity_2018_Frozen/Assets/Klak/DFVolume/VolumeVisualizer.cs.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: 86572f0349d91434d90f40861f708217 -timeCreated: 1495884309 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: - - _data: {instanceID: 0} - - _quadMesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} - - _shader: {fileID: 4800000, guid: e87e89fb693f01e47ac90f63e832ed83, type: 3} - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: