diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset similarity index 92% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset index f78db50..c367f70 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} - m_Name: Sven-Standby + m_Name: Elsa_Effect_A-Standby m_EditorClassIdentifier: m_VideoLocation: 1 m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset.meta similarity index 83% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset.meta rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset.meta index 43ec21c..629d2d9 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset.meta +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0aa239f497b53734eb6adca529ab6225 +guid: 7b0a38d5d484cf54089379ebbe5c1d9d timeCreated: 1524453128 licenseType: Free NativeFormatImporter: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger.asset new file mode 100644 index 0000000..223f78c --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-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: Elsa_Effect_A-Trigger + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/effect/Elsa_Effect_A_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger.asset.meta similarity index 72% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset.meta rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger.asset.meta index d2aad7e..cae4ca2 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset.meta +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger.asset.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 0dfbbcfb9e891fe49874e63122982159 -timeCreated: 1524210684 +guid: 23773c4900ad46e4f9ba5cb3d1c28912 +timeCreated: 1524453128 licenseType: Free NativeFormatImporter: externalObjects: {} diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby.asset new file mode 100644 index 0000000..a7197f4 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-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: Elsa_Effect_B-Standby + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby.asset.meta new file mode 100644 index 0000000..63b66e7 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f2f10fb696e1a6145b55378c7c7ec9df +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger.asset new file mode 100644 index 0000000..dcb0ebf --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-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: Elsa_Effect_B-Trigger + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/effect/Elsa_Effect_B_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger.asset.meta new file mode 100644 index 0000000..657717d --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d3a9925b2d77cce4a8fc3215dbaf41e1 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset index 6ea2997..cafd509 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_hap.avi + m_VideoPath: ../FrozenMaterial/day/Sven_and_Krostoff_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset similarity index 81% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset index 97bd178..0f74183 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} - m_Name: Sven-Trigger + m_Name: Space-Day m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/day/Sven_hap.avi + m_VideoPath: ../FrozenMaterial/space-dark-mountain-sq.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset.meta new file mode 100644 index 0000000..e3dd7e3 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 93f0cd64ff27b384c81c546d57b38ea5 +timeCreated: 1526278276 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset new file mode 100644 index 0000000..dec713b --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.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: Space-Night + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/space-dark-mountain-v1.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset.meta new file mode 100644 index 0000000..3a0059a --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 545395317a3d4224785bd500453c4cfe +timeCreated: 1526278276 +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 04d6d28..dd1f36d 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -551,6 +551,77 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 165270300} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &179856631 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 179856632} + - component: {fileID: 179856634} + - component: {fileID: 179856633} + m_Layer: 8 + m_Name: Wall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &179856632 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 179856631} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 917676528} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &179856633 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 179856631} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 63732a6f5c28edd4e87389f4158094bd, 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: 0 + 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 &179856634 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 179856631} + m_Mesh: {fileID: 0} --- !u!1 &182553293 GameObject: m_ObjectHideFlags: 0 @@ -671,8 +742,10 @@ Transform: - {fileID: 1878556046} - {fileID: 1973785472} - {fileID: 1216863872} + - {fileID: 1984882816} + - {fileID: 1225287932} m_Father: {fileID: 338663765} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &251596434 GameObject: @@ -758,6 +831,68 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 251596434} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &260126567 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 260126568} + - component: {fileID: 260126570} + - component: {fileID: 260126569} + m_Layer: 0 + m_Name: Space-Night + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &260126568 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 260126567} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 917676528} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &260126569 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 260126567} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 2 + materials: + - {fileID: 2100000, guid: 63732a6f5c28edd4e87389f4158094bd, type: 2} + attributeName: _SubTex + autoSize: 0 +--- !u!114 &260126570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 260126567} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} + m_Name: + m_EditorClassIdentifier: + VideoAsset: {fileID: 11400000, guid: 545395317a3d4224785bd500453c4cfe, type: 2} + LoadOnAwake: 1 + PlayOnStart: 1 + Looping: 1 + AudioVolume: 1 --- !u!1 &282141325 GameObject: m_ObjectHideFlags: 0 @@ -825,7 +960,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 917676528} - - {fileID: 889856157} - {fileID: 199010598} - {fileID: 368474577} m_Father: {fileID: 0} @@ -915,7 +1049,7 @@ Transform: m_LocalScale: {x: 5, y: 5, z: 1} m_Children: [] m_Father: {fileID: 338663765} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!23 &368474578 MeshRenderer: @@ -984,8 +1118,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: kinect: {fileID: 712882417} - triggerRadius: 1.5 + triggerRadius: 1.6 cooldown: 30 + offset: 1.5 breakProgress: 0.1 --- !u!114 &368474582 MonoBehaviour: @@ -1314,6 +1449,136 @@ MonoBehaviour: uniform: {fileID: 11400000, guid: 43473f0506b1ba64c86ae17dd11d902a, type: 2} subUniform: {fileID: 11400000, guid: 54b82be1afe58664c8daeb575db89094, type: 2} rate: 0 +--- !u!43 &456004799 +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 &459917734 GameObject: m_ObjectHideFlags: 0 @@ -1443,77 +1708,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 459917734} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &461690048 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 461690049} - - component: {fileID: 461690054} - - component: {fileID: 461690052} - m_Layer: 8 - m_Name: Sven - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &461690049 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 461690048} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.198, y: 0.07061551, z: 0} - m_LocalScale: {x: 1.2246633, y: 1.2246647, z: 1.2246647} - m_Children: [] - m_Father: {fileID: 1690794385} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &461690052 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 461690048} - 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: 839c0e58e555dab48be2d0d4b169e1ca, 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 &461690054 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 461690048} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &520040865 GameObject: m_ObjectHideFlags: 0 @@ -1784,183 +1978,52 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &712882415 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 712882416} - - component: {fileID: 712882417} - m_Layer: 0 - m_Name: KinectOpticalFlowMath - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &712882416 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 712882415} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 386695297} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &712882417 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 712882415} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0e2f0c4ffce60f40a1fa79e4ec7955c, type: 3} - m_Name: - m_EditorClassIdentifier: - kinect: {fileID: 1848145251} - fps: 15 - countThreshold: 30 - averagePositinon: {x: 0, y: 0, z: 0} - standardDeviation: -1 - averageVelocity: {x: 0, y: 0, z: 0} - debug: ---- !u!43 &725363233 -Mesh: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: 'Space Mesh: (8x5x3)' - serializedVersion: 8 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 24 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_MeshCompression: 0 - m_IsReadable: 0 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 - m_Skin: [] - m_VertexData: - m_CurrentChannels: 11 - m_VertexCount: 16 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 512 - _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshOptimized: 0 +--- !u!1 &712882415 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 712882416} + - component: {fileID: 712882417} + m_Layer: 0 + m_Name: KinectOpticalFlowMath + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &712882416 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 712882415} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 386695297} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &712882417 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 712882415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0e2f0c4ffce60f40a1fa79e4ec7955c, type: 3} + m_Name: + m_EditorClassIdentifier: + kinect: {fileID: 1848145251} + fps: 15 + countThreshold: 30 + averagePositinon: {x: 0, y: 0, z: 0} + standardDeviation: -1 + debug: --- !u!1 &732632614 GameObject: m_ObjectHideFlags: 0 @@ -2519,134 +2582,117 @@ MonoBehaviour: debug: debugDraw: 0 debugShader: {fileID: 4800000, guid: 6ffbbc1e44667e348b62c7f3ea93ae4b, type: 3} ---- !u!1 &889856156 +--- !u!1 &917676527 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 889856157} - - component: {fileID: 889856158} - m_Layer: 0 - m_Name: ElsaEffectGenerator + - component: {fileID: 917676528} + - component: {fileID: 917676531} + m_Layer: 8 + m_Name: Space m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &889856157 +--- !u!4 &917676528 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 889856156} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 917676527} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1379541362} + - {fileID: 179856632} + - {fileID: 952607034} + - {fileID: 260126568} m_Father: {fileID: 338663765} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &889856158 +--- !u!114 &917676531 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 889856156} + m_GameObject: {fileID: 917676527} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a7fe449ac7fdb6943ac4f06843bce261, type: 3} + m_Script: {fileID: 11500000, guid: 16e57166815b2534daf1be5fd19595f2, type: 3} m_Name: m_EditorClassIdentifier: - kinectMath: {fileID: 712882417} ---- !u!1 &917676527 + update: 0 + width: 8 + length: 5 + height: 3 + isAnimated: 0 +--- !u!1 &952607033 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 917676528} - - component: {fileID: 917676531} - - component: {fileID: 917676530} - - component: {fileID: 917676529} - m_Layer: 8 - m_Name: Space + - component: {fileID: 952607034} + - component: {fileID: 952607036} + - component: {fileID: 952607035} + m_Layer: 0 + m_Name: Space-Day m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &917676528 + m_IsActive: 0 +--- !u!4 &952607034 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 917676527} + m_GameObject: {fileID: 952607033} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.5} + m_LocalPosition: {x: 0, y: 0, z: -1.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 338663765} - m_RootOrder: 0 + m_Father: {fileID: 917676528} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &917676529 -MeshRenderer: +--- !u!114 &952607035 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 917676527} + m_GameObject: {fileID: 952607033} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: c1451959794f55e4e90241e1720a9e08, 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: 0 - 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 &917676530 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 917676527} - m_Mesh: {fileID: 725363233} ---- !u!114 &917676531 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 2 + materials: + - {fileID: 2100000, guid: 63732a6f5c28edd4e87389f4158094bd, type: 2} + attributeName: _MainTex + autoSize: 0 +--- !u!114 &952607036 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 917676527} + m_GameObject: {fileID: 952607033} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 16e57166815b2534daf1be5fd19595f2, type: 3} + m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} m_Name: m_EditorClassIdentifier: - update: 0 - width: 8 - depth: 5 - height: 3 + VideoAsset: {fileID: 11400000, guid: 93f0cd64ff27b384c81c546d57b38ea5, type: 2} + LoadOnAwake: 1 + PlayOnStart: 1 + Looping: 1 + AudioVolume: 1 --- !u!1 &1000268178 GameObject: m_ObjectHideFlags: 0 @@ -2947,48 +2993,203 @@ MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1191975162} + m_GameObject: {fileID: 1191975162} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1216863871 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1216863872} + - component: {fileID: 1216863877} + - component: {fileID: 1216863876} + - component: {fileID: 1216863875} + - component: {fileID: 1216863874} + - component: {fileID: 1216863873} + - component: {fileID: 1216863878} + m_Layer: 8 + m_Name: Marshmallow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1216863872 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1216863871} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.741, y: 1.802, z: 2.49} + m_LocalScale: {x: 3.6796, y: 3.6796002, z: 3.6796002} + m_Children: [] + m_Father: {fileID: 199010598} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &1216863873 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1216863871} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1216863874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1216863871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} + m_Name: + m_EditorClassIdentifier: + standby: 1 + disappearTime: 10 + mat: {fileID: 0} + area: 0 + AppearArea: 02000000 + wallRoi: {x: 0, y: 0} + fakeButton: {fileID: 0} + standbyClip: {fileID: 11400000, guid: 1691548c0a5a4494ba5e2c29ec477d7d, type: 2} + triggerClip: {fileID: 11400000, guid: 6ccf813116f07944faf4af6bc3b2c1f7, type: 2} + players: [] + color: {r: 1, g: 1, b: 1, a: 1} + videoStopTime: 10 + specificPositions: + - {fileID: 1216863878} + roaming: 0 + isTriggerCollider: 0 +--- !u!23 &1216863875 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1216863871} + 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: 26431f824b7c8384bbc23c36bd054e2b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &1216863876 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1216863871} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 0 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 14 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1216863877 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1216863871} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1216863871 +--- !u!114 &1216863878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1216863871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 2 +--- !u!1 &1225287931 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1216863872} - - component: {fileID: 1216863877} - - component: {fileID: 1216863876} - - component: {fileID: 1216863875} - - component: {fileID: 1216863874} - - component: {fileID: 1216863873} - - component: {fileID: 1216863878} + - component: {fileID: 1225287932} + - component: {fileID: 1225287938} + - component: {fileID: 1225287937} + - component: {fileID: 1225287936} + - component: {fileID: 1225287935} + - component: {fileID: 1225287934} + - component: {fileID: 1225287933} m_Layer: 8 - m_Name: Marshmallow + m_Name: Elsa_Effect_B m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1216863872 +--- !u!4 &1225287932 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1216863871} + m_GameObject: {fileID: 1225287931} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.741, y: 1.802, z: 2.49} - m_LocalScale: {x: 3.6796, y: 3.6796002, z: 3.6796002} + m_LocalPosition: {x: -2.59, y: 1.35, z: 2.49} + m_LocalScale: {x: 2.7553, y: 2.7553, z: 2.7553} m_Children: [] m_Father: {fileID: 199010598} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1216863873 +--- !u!114 &1225287933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1225287931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 2 +--- !u!54 &1225287934 Rigidbody: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1216863871} + m_GameObject: {fileID: 1225287931} serializedVersion: 2 m_Mass: 1 m_Drag: 0 @@ -2998,12 +3199,12 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &1216863874 +--- !u!114 &1225287935 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1216863871} + m_GameObject: {fileID: 1225287931} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} @@ -3016,21 +3217,21 @@ MonoBehaviour: AppearArea: 02000000 wallRoi: {x: 0, y: 0} fakeButton: {fileID: 0} - standbyClip: {fileID: 11400000, guid: 1691548c0a5a4494ba5e2c29ec477d7d, type: 2} - triggerClip: {fileID: 11400000, guid: 6ccf813116f07944faf4af6bc3b2c1f7, type: 2} + standbyClip: {fileID: 11400000, guid: f2f10fb696e1a6145b55378c7c7ec9df, type: 2} + triggerClip: {fileID: 11400000, guid: d3a9925b2d77cce4a8fc3215dbaf41e1, type: 2} players: [] color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 10 specificPositions: - - {fileID: 1216863878} + - {fileID: 1225287933} roaming: 0 isTriggerCollider: 0 ---- !u!23 &1216863875 +--- !u!23 &1225287936 MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1216863871} + m_GameObject: {fileID: 1225287931} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -3039,7 +3240,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_Materials: - - {fileID: 2100000, guid: 26431f824b7c8384bbc23c36bd054e2b, type: 2} + - {fileID: 2100000, guid: 5f6b94c6b2a653d439fba4373746dade, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3059,39 +3260,27 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &1216863876 +--- !u!64 &1225287937 MeshCollider: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1216863871} + m_GameObject: {fileID: 1225287931} m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 + m_IsTrigger: 0 + m_Enabled: 0 serializedVersion: 3 - m_Convex: 1 + m_Convex: 0 m_CookingOptions: 14 m_SkinWidth: 0.01 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &1216863877 +--- !u!33 &1225287938 MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1216863871} + m_GameObject: {fileID: 1225287931} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &1216863878 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1216863871} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 2 --- !u!1 &1227078084 GameObject: m_ObjectHideFlags: 0 @@ -3267,6 +3456,77 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1379541361 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1379541362} + - component: {fileID: 1379541364} + - component: {fileID: 1379541363} + m_Layer: 8 + m_Name: Ground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1379541362 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1379541361} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 917676528} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1379541363 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1379541361} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: c1451959794f55e4e90241e1720a9e08, 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: 0 + 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 &1379541364 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1379541361} + m_Mesh: {fileID: 456004799} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -3391,7 +3651,7 @@ GameObject: - component: {fileID: 1690794386} - component: {fileID: 1690794391} m_Layer: 8 - m_Name: Kristoff + m_Name: Kristoff & Sven m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3404,10 +3664,9 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1690794384} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.206, y: 0.699, z: 2.49} - m_LocalScale: {x: 1.6522416, y: 1.65224, z: 1.65224} - m_Children: - - {fileID: 461690049} + m_LocalPosition: {x: 0.206, y: 0.878, z: 2.49} + m_LocalScale: {x: 2.150855, y: 2.1508515, z: 2.1508515} + m_Children: [] m_Father: {fileID: 199010598} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4188,8 +4447,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2ff90fc774b218468ffcff9472e0762, type: 3} m_Name: m_EditorClassIdentifier: - width: 5 - length: 8 + width: 8 + length: 5 height: 3 blackLength: 0.89 PixelsByMeter: 360 @@ -4255,8 +4514,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1933714480} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.477, y: 0.65, z: 2.49} - m_LocalScale: {x: 1.396876, y: 1.3968757, z: 1.3968757} + m_LocalPosition: {x: -0.477, y: 0.699, z: 2.49} + m_LocalScale: {x: 1.7966619, y: 1.7966619, z: 1.7966619} m_Children: [] m_Father: {fileID: 199010598} m_RootOrder: 5 @@ -4572,7 +4831,7 @@ MeshCollider: m_GameObject: {fileID: 1973785471} m_Material: {fileID: 0} m_IsTrigger: 1 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Convex: 1 m_CookingOptions: 14 @@ -4597,6 +4856,149 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: area: 2 +--- !u!1 &1984882815 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1984882816} + - component: {fileID: 1984882822} + - component: {fileID: 1984882821} + - component: {fileID: 1984882820} + - component: {fileID: 1984882819} + - component: {fileID: 1984882818} + - component: {fileID: 1984882817} + m_Layer: 8 + m_Name: Elsa_Effect_A + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1984882816 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1984882815} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.84, y: 1.35, z: 2.49} + m_LocalScale: {x: 2.7552948, y: 2.755295, z: 2.755295} + m_Children: [] + m_Father: {fileID: 199010598} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1984882817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1984882815} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 2 +--- !u!54 &1984882818 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1984882815} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1984882819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1984882815} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} + m_Name: + m_EditorClassIdentifier: + standby: 1 + disappearTime: 10 + mat: {fileID: 0} + area: 0 + AppearArea: 02000000 + wallRoi: {x: 0, y: 0} + fakeButton: {fileID: 0} + standbyClip: {fileID: 11400000, guid: 7b0a38d5d484cf54089379ebbe5c1d9d, type: 2} + triggerClip: {fileID: 11400000, guid: 23773c4900ad46e4f9ba5cb3d1c28912, type: 2} + players: [] + color: {r: 1, g: 1, b: 1, a: 1} + videoStopTime: 10 + specificPositions: + - {fileID: 1984882817} + roaming: 0 + isTriggerCollider: 0 +--- !u!23 &1984882820 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1984882815} + 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: d399e769f1f82344b9f305269a536595, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &1984882821 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1984882815} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 0 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 14 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1984882822 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1984882815} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2022668214 GameObject: m_ObjectHideFlags: 0 @@ -4760,13 +5162,16 @@ MonoBehaviour: m_EditorClassIdentifier: rate: 0 uniform: {fileID: 441718965} - spaceMaterial: {fileID: 2100000, guid: c1451959794f55e4e90241e1720a9e08, type: 2} + spaceMaterials: + - {fileID: 2100000, guid: c1451959794f55e4e90241e1720a9e08, type: 2} + - {fileID: 2100000, guid: 63732a6f5c28edd4e87389f4158094bd, type: 2} snowSize: 0.0164 snowMaterial: {fileID: 2100000, guid: 56457e5f2df74a44c933b2791da81324, type: 2} cosineGradient: {fileID: 1167120024} kinect: {fileID: 1848145251} + nightKinectAmount: 30 particleViewer: {fileID: 1035960135} - dayParticleRate: 0.2 + dayParticleRate: 0.1 dayCharacters: - {fileID: 1906326619} - {fileID: 1933714483} diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat b/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat index 31a27a3..b1cfbd1 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat @@ -72,5 +72,5 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 0.99999887} + - _Color: {r: 1, g: 1, b: 1, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat index 993d281..3f18532 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat @@ -70,7 +70,7 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 1 + - _DstBlend: 10 - _EmissionEnabled: 0 - _FlipbookMode: 0 - _GlossMapScale: 1 @@ -79,7 +79,7 @@ Material: - _InvFade: 1 - _LightingEnabled: 1 - _Metallic: 0 - - _Mode: 4 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat similarity index 96% rename from Unity_2018_Frozen/Assets/Frozen/Material/Space.mat rename to Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat index 5402123..acc56b1 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Space.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: Space + m_Name: Space-Ground m_Shader: {fileID: 4800000, guid: 9c06d40e212c2634f84f3f27c34986d2, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 @@ -70,12 +70,14 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rate: 1 + - _Rate: 0 - _SmoothnessTextureChannel: 0 + - _SpaceRate: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 + - _isGamma: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/Material/Space.mat.meta rename to Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat new file mode 100644 index 0000000..c168cfb --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat @@ -0,0 +1,83 @@ +%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: Space-Wall + m_Shader: {fileID: 4800000, guid: 9c06d40e212c2634f84f3f27c34986d2, type: 3} + m_ShaderKeywords: _ISGAMMA_ON + m_LightmapFlags: 4 + 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: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 2a0d6dab08d40bc4fa8783efdc682ca7, 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} + - _SubTex: + m_Texture: {fileID: 2800000, guid: ae04e57c11d96fa4ab1c13f67394f3b6, type: 3} + 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: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Rate: 0 + - _SmoothnessTextureChannel: 0 + - _SpaceRate: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + - _isGamma: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat.meta new file mode 100644 index 0000000..ef24262 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 63732a6f5c28edd4e87389f4158094bd +timeCreated: 1521000028 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs index 4073402..fbeb49d 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs @@ -194,7 +194,7 @@ public class CharacterBehaviour : MonoBehaviour { case Area.TopWall: { - float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.length * 0.5f); + float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.width * 0.5f); float x = Mathf.Clamp(pos.x + noise, -minmax, minmax); transform.localPosition = new Vector3(x, pos.y, pos.z); } @@ -202,7 +202,7 @@ public class CharacterBehaviour : MonoBehaviour case Area.LeftWall: case Area.RightWall: { - float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.width * 0.5f); + float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.length * 0.5f); float z = Mathf.Clamp(pos.z + noise, -minmax, minmax); transform.localPosition = new Vector3(pos.x, pos.y, z); } @@ -231,17 +231,17 @@ public class CharacterBehaviour : MonoBehaviour Quaternion q = new Quaternion(); if (area == Area.LeftWall) { - newPos.x = -FrozenScreenToWorldSpace.Instance.length / 2; + newPos.x = -FrozenScreenToWorldSpace.Instance.width / 2; q.SetLookRotation(Vector3.left); } if (area == Area.RightWall) { - newPos.x = FrozenScreenToWorldSpace.Instance.length / 2; + newPos.x = FrozenScreenToWorldSpace.Instance.width / 2; q.SetLookRotation(Vector3.right); } if (area == Area.TopWall) { - newPos.z = FrozenScreenToWorldSpace.Instance.width / 2; + newPos.z = FrozenScreenToWorldSpace.Instance.length / 2; q.SetLookRotation(Vector3.forward); } transform.rotation = q; @@ -255,9 +255,9 @@ public class CharacterBehaviour : MonoBehaviour float minX = transform.localScale.x / 2; if (randomPos.x == 0) - wallRoi.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.length - minX) / FrozenScreenToWorldSpace.Instance.length; - else wallRoi.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.width - minX) / FrozenScreenToWorldSpace.Instance.width; + else + wallRoi.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.length - minX) / FrozenScreenToWorldSpace.Instance.length; wallRoi.y = origin_height / FrozenScreenToWorldSpace.Instance.height; UpdatePos(); @@ -268,9 +268,9 @@ public class CharacterBehaviour : MonoBehaviour { Vector3 n_pos = transform.localPosition; if (area == Area.TopWall) - n_pos.x = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.length / 2, FrozenScreenToWorldSpace.Instance.length / 2, wallRoi.x); + n_pos.x = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.width / 2, FrozenScreenToWorldSpace.Instance.width / 2, wallRoi.x); else - n_pos.z = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.width / 2, FrozenScreenToWorldSpace.Instance.width / 2, wallRoi.x); + n_pos.z = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.length / 2, FrozenScreenToWorldSpace.Instance.length / 2, wallRoi.x); n_pos.y = Mathf.Lerp(0, (float)FrozenScreenToWorldSpace.Instance.height, wallRoi.y); transform.localPosition = n_pos; //SetButtonPos(); diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs b/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs index 529c5cd..6c08a29 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs @@ -19,6 +19,7 @@ namespace UltraCombos.Frozen private void Update() { + /* float padding = 0.5f; Ray ray = new Ray(Vector3.zero, -new Vector3(kinectMath.averageVelocity.x, 0, kinectMath.averageVelocity.z)); @@ -30,7 +31,7 @@ namespace UltraCombos.Frozen if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.LeftWall).Raycast(ray, out enter)) { hit_point = ray.GetPoint(enter); - if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.width * 0.5f - padding) + if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.length * 0.5f - padding) { isHit = true; } @@ -42,7 +43,7 @@ namespace UltraCombos.Frozen if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.RightWall).Raycast(ray, out enter)) { hit_point = ray.GetPoint(enter); - if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.width * 0.5f - padding) + if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.length * 0.5f - padding) { isHit = true; } @@ -54,7 +55,7 @@ namespace UltraCombos.Frozen if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.TopWall).Raycast(ray, out enter)) { hit_point = ray.GetPoint(enter); - if (Mathf.Abs(hit_point.x) < FrozenScreenToWorldSpace.Instance.length * 0.5f - padding) + if (Mathf.Abs(hit_point.x) < FrozenScreenToWorldSpace.Instance.width * 0.5f - padding) { isHit = true; } @@ -66,14 +67,17 @@ namespace UltraCombos.Frozen { hitPoint = hit_point + transform.position; } + */ } private void OnDrawGizmosSelected() { + /* Gizmos.DrawLine(transform.position, transform.position - new Vector3(kinectMath.averageVelocity.x, 0, kinectMath.averageVelocity.z) * 50.0f); if (isHit == false) return; Gizmos.DrawWireCube(hitPoint, Vector3.one); + */ } } diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs b/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs index d519ff4..8a03f71 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs @@ -25,8 +25,8 @@ public class FrozenScreenToWorldSpace : MonoBehaviour { } private static FrozenScreenToWorldSpace instacnce; - public float width = 5; - public float length = 8; + public float width = 8; + public float length = 5; public float height = 3; public float blackLength = 0.89f; public float PixelsByMeter = 360; @@ -72,19 +72,19 @@ public class FrozenScreenToWorldSpace : MonoBehaviour { void InitailROISetting() { - totalLength = height * 2 + length; - totalWidth = height + width + blackLength; - LeftWall = new RenderTextureROI(0, height / totalWidth, height / totalLength, width / totalWidth); - RightWall = new RenderTextureROI((height + length) / totalLength, height / totalWidth, height / totalLength, width / totalWidth); - TopWall = new RenderTextureROI((height) / totalLength, 0, length / totalLength, height / totalWidth); - Floor = new RenderTextureROI(height / totalLength, height / totalWidth, length / totalLength, width / totalWidth); + totalLength = height * 2 + width; + totalWidth = height + length + blackLength; + LeftWall = new RenderTextureROI(0, height / totalWidth, height / totalLength, length / totalWidth); + RightWall = new RenderTextureROI((height + width) / totalLength, height / totalWidth, height / totalLength, length / totalWidth); + TopWall = new RenderTextureROI((height) / totalLength, 0, width / totalLength, height / totalWidth); + Floor = new RenderTextureROI(height / totalLength, height / totalWidth, width / totalLength, length / totalWidth); RenderTextureROIList.Add(Area.LeftWall, LeftWall); RenderTextureROIList.Add(Area.RightWall, RightWall); RenderTextureROIList.Add(Area.TopWall, TopWall); RenderTextureROIList.Add(Area.Floor, Floor); - wallPlaneList.Add(Area.LeftWall, new Plane(Vector3.right, new Vector3(-length * 0.5f, 0, 0))); - wallPlaneList.Add(Area.RightWall, new Plane(Vector3.left, new Vector3(length * 0.5f, 0, 0))); - wallPlaneList.Add(Area.TopWall, new Plane(Vector3.back, new Vector3(0, 0, width * 0.5f))); + wallPlaneList.Add(Area.LeftWall, new Plane(Vector3.right, new Vector3(-width * 0.5f, 0, 0))); + wallPlaneList.Add(Area.RightWall, new Plane(Vector3.left, new Vector3(width * 0.5f, 0, 0))); + wallPlaneList.Add(Area.TopWall, new Plane(Vector3.back, new Vector3(0, 0, length * 0.5f))); } public RenderTextureROI GetROI(Area area) @@ -136,19 +136,19 @@ public class FrozenScreenToWorldSpace : MonoBehaviour { { case Area.TopWall: { - roi.x = (position.x + length * 0.5f) / length; + roi.x = (position.x + width * 0.5f) / width; roi.y = position.y / height; } break; case Area.LeftWall: { - roi.x = (position.z + width * 0.5f) / width; + roi.x = (position.z + length * 0.5f) / length; roi.y = position.y / height; } break; case Area.RightWall: { - roi.x = (position.z + width * 0.5f) / width; + roi.x = (position.z + length * 0.5f) / length; roi.y = position.y / height; } break; diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs index aac7b5b..0148d7a 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs @@ -21,10 +21,15 @@ namespace UltraCombos.Frozen [SerializeField] float cooldown = 2.0f; + [SerializeField] + float offset = 1.5f; + Vector3 root; + private void Start() { material = GetComponent().sharedMaterial; player = GetComponent(); + root = transform.position; StartCoroutine(Flow()); } @@ -98,6 +103,9 @@ namespace UltraCombos.Frozen } yield return new WaitForSeconds(cooldown); + + transform.position = root + new Vector3(Random.Range(-offset, offset), 0, 0); + yield return null; //Debug.Log("Flow done"); } } diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs index 3a6dc24..4e1fa5d 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs @@ -13,7 +13,7 @@ namespace UltraCombos.Frozen UniformBlendedStructuredBuffer uniform; [SerializeField] - Material spaceMaterial; + List spaceMaterials = new List(); [SerializeField, Range(0.0f, 0.1f)] float snowSize = 0.01f; @@ -25,6 +25,8 @@ namespace UltraCombos.Frozen [SerializeField] KinectOpticalFlow kinect; + [SerializeField] + float nightKinectAmount = 30.0f; [SerializeField] ParticleViewerProcedural particleViewer; @@ -53,11 +55,12 @@ namespace UltraCombos.Frozen } uniform.rate = rate; - spaceMaterial.SetFloat("_Rate", rate); + foreach (var mat in spaceMaterials) + mat.SetFloat("_Rate", rate); //snowMaterial.SetFloat("_Size", Mathf.Lerp(0.0f, snowSize, rate)); snowMaterial.SetFloat("_Size", snowSize); cosineGradient.rate = rate; - kinect.kinectAmount = rate < 0.5 ? 1.0f : 30.0f; + kinect.kinectAmount = Mathf.Lerp(1.0f, nightKinectAmount, rate); particleViewer.VertexCount = (int)(Mathf.Lerp(dayParticleRate, 1.0f, rate) * particleViewer.buffer.count); foreach (var chr in dayCharacters) diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs index 74ff3c2..3620709 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs @@ -11,38 +11,72 @@ namespace UltraCombos.Frozen bool update = false; [SerializeField] - int width = 1; + int width = 8; [SerializeField] - int depth = 1; + int length = 5; [SerializeField] - int height = 1; - + int height = 3; + + [SerializeField] + bool isAnimated = false; + + Vector3 size = Vector3.zero; + + private void Start() + { + update = true; + + if (Application.isPlaying) + { + if (isAnimated) + { + var players = GetComponentsInChildren(); + foreach (var mp in players) + { + mp.gameObject.SetActive(true); + } + } + + var renderers = GetComponentsInChildren(); + if (renderers.Length > 1) + { + renderers[1].sharedMaterial.SetFloat("_isGamma", isAnimated ? 1.0f : 0.0f); + } + } + } + private void Update() { - var mesh_filter = GetComponent(); + size.Set(width, height, length); if (update) { update = false; - if (Application.isPlaying) - Destroy(mesh_filter.sharedMesh); - else - DestroyImmediate(mesh_filter.sharedMesh); - mesh_filter.sharedMesh = null; + ClearFilterMesh(); } - if (mesh_filter.sharedMesh == null) + var mesh_filters = GetComponentsInChildren(); + for (int i = 0; i < mesh_filters.Length; i++) { - mesh_filter.sharedMesh = CreateMesh(); + var filter = mesh_filters[i]; + if (filter.sharedMesh == null) + { + if (Application.isPlaying) + { + filter.sharedMesh = (i == 0) ? CreateGroundMesh() : CreateWallMesh(); + } + else if (i == 0) + { + filter.sharedMesh = CreateGroundMesh(); + } + } } - } private void OnDrawGizmosSelected() { - var size = new Vector3(width, height, depth); var center = transform.position; center.y += size.y * 0.5f; var c = Gizmos.color; @@ -51,11 +85,23 @@ namespace UltraCombos.Frozen Gizmos.color = c; } - private Mesh CreateMesh() + private void ClearFilterMesh() + { + var mesh_filters = GetComponentsInChildren(); + foreach (var filter in mesh_filters) + { + if (Application.isPlaying) + Destroy(filter.sharedMesh); + else + DestroyImmediate(filter.sharedMesh); + filter.sharedMesh = null; + } + } + + private Mesh CreateWallMesh() { - var size = new Vector3(width, height, depth); var half_size = size * 0.5f; - var tex_size = new Vector2(depth * 2.0f + width, depth + height); + var tex_size = new Vector2(width, height * 3.0f); var points = new List(); points.Add(new Vector3(-half_size.x, 0.0f, -half_size.z)); @@ -72,27 +118,16 @@ namespace UltraCombos.Frozen var indices = new List(); var normals = new List(); - // Ground - AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(0, 1, 0)); - vertices.Add(points[0]); - vertices.Add(points[1]); - vertices.Add(points[2]); - vertices.Add(points[3]); - uvs.Add(new Vector2(depth / tex_size.x, 0.0f)); - uvs.Add(new Vector2(depth / tex_size.x, depth / tex_size.y)); - uvs.Add(new Vector2((depth + width) / tex_size.x, 0.0f)); - uvs.Add(new Vector2((depth + width) / tex_size.x, depth / tex_size.y)); - // Front AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(0, 0, -1)); vertices.Add(points[1]); vertices.Add(points[5]); vertices.Add(points[3]); vertices.Add(points[7]); - uvs.Add(new Vector2(depth / tex_size.x, depth / tex_size.y)); - uvs.Add(new Vector2(depth / tex_size.x, (depth + height) / tex_size.y)); - uvs.Add(new Vector2((depth + width) / tex_size.x, depth / tex_size.y)); - uvs.Add(new Vector2((depth + width) / tex_size.x, (depth + height) / tex_size.y)); + uvs.Add(new Vector2(0.0f, height * 1.0f / tex_size.y)); + uvs.Add(new Vector2(0.0f, height * 0.0f / tex_size.y)); + uvs.Add(new Vector2(width / tex_size.x, height * 1.0f / tex_size.y)); + uvs.Add(new Vector2(width / tex_size.x, height * 0.0f / tex_size.y)); // Left AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(1, 0, 0)); @@ -100,10 +135,10 @@ namespace UltraCombos.Frozen vertices.Add(points[4]); vertices.Add(points[1]); vertices.Add(points[5]); - uvs.Add(new Vector2(0.0f, depth / tex_size.y)); - uvs.Add(new Vector2(0.0f, (depth + height) / tex_size.y)); - uvs.Add(new Vector2(depth / tex_size.x, depth / tex_size.y)); - uvs.Add(new Vector2(depth / tex_size.x, (depth + height) / tex_size.y)); + uvs.Add(new Vector2(0.0f, height * 2.0f / tex_size.y)); + uvs.Add(new Vector2(0.0f, height * 1.0f / tex_size.y)); + uvs.Add(new Vector2(length / tex_size.x, height * 2.0f / tex_size.y)); + uvs.Add(new Vector2(length / tex_size.x, height * 1.0f / tex_size.y)); // Right AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(-1, 0, 0)); @@ -111,14 +146,97 @@ namespace UltraCombos.Frozen vertices.Add(points[7]); vertices.Add(points[2]); vertices.Add(points[6]); - uvs.Add(new Vector2((depth + width) / tex_size.x, depth / tex_size.y)); - uvs.Add(new Vector2((depth + width) / tex_size.x, (depth + height) / tex_size.y)); - uvs.Add(new Vector2((depth * 2.0f + width) / tex_size.x, depth / tex_size.y)); - uvs.Add(new Vector2((depth * 2.0f + width) / tex_size.x, (depth + height) / tex_size.y)); + uvs.Add(new Vector2(0.0f, height * 3.0f / tex_size.y)); + uvs.Add(new Vector2(0.0f, height * 2.0f / tex_size.y)); + uvs.Add(new Vector2(length / tex_size.x, height * 3.0f / tex_size.y)); + uvs.Add(new Vector2(length / tex_size.x, height * 2.0f / tex_size.y)); + + if (isAnimated == false) + { + for (int i = 0; i < uvs.Count; i++) + uvs[i] = new Vector2(uvs[i].x, 1.0f - uvs[i].y); + } + + var mesh = new Mesh(); + mesh.name = string.Format("Space Wall Mesh: ({0}x{1}x{2})", width, length, height); + mesh.SetVertices(vertices); + mesh.SetUVs(0, uvs); + mesh.SetNormals(normals); + mesh.SetIndices(indices.ToArray(), MeshTopology.Triangles, 0); + mesh.UploadMeshData(true); + + return mesh; + } + + private Mesh CreateGroundMesh() + { + var half_size = size * 0.5f; + var tex_size = new Vector2(this.length * 2.0f + width, this.length + height); + + var points = new List(); + points.Add(new Vector3(-half_size.x, 0.0f, -half_size.z)); + points.Add(new Vector3(-half_size.x, 0.0f, +half_size.z)); + points.Add(new Vector3(+half_size.x, 0.0f, -half_size.z)); + points.Add(new Vector3(+half_size.x, 0.0f, +half_size.z)); + points.Add(new Vector3(-half_size.x, size.y, -half_size.z)); + points.Add(new Vector3(-half_size.x, size.y, +half_size.z)); + points.Add(new Vector3(+half_size.x, size.y, -half_size.z)); + points.Add(new Vector3(+half_size.x, size.y, +half_size.z)); + var vertices = new List(); + var uvs = new List(); + var indices = new List(); + var normals = new List(); + + // Ground + AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(0, 1, 0)); + vertices.Add(points[0]); + vertices.Add(points[1]); + vertices.Add(points[2]); + vertices.Add(points[3]); + uvs.Add(new Vector2(this.length / tex_size.x, 0.0f)); + uvs.Add(new Vector2(this.length / tex_size.x, this.length / tex_size.y)); + uvs.Add(new Vector2((this.length + width) / tex_size.x, 0.0f)); + uvs.Add(new Vector2((this.length + width) / tex_size.x, this.length / tex_size.y)); + + if (Application.isPlaying == false) + { + // Front + AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(0, 0, -1)); + vertices.Add(points[1]); + vertices.Add(points[5]); + vertices.Add(points[3]); + vertices.Add(points[7]); + uvs.Add(new Vector2(length / tex_size.x, length / tex_size.y)); + uvs.Add(new Vector2(length / tex_size.x, (length + height) / tex_size.y)); + uvs.Add(new Vector2((length + width) / tex_size.x, length / tex_size.y)); + uvs.Add(new Vector2((length + width) / tex_size.x, (length + height) / tex_size.y)); + + // Left + AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(1, 0, 0)); + vertices.Add(points[0]); + vertices.Add(points[4]); + vertices.Add(points[1]); + vertices.Add(points[5]); + uvs.Add(new Vector2(0.0f, length / tex_size.y)); + uvs.Add(new Vector2(0.0f, (length + height) / tex_size.y)); + uvs.Add(new Vector2(length / tex_size.x, length / tex_size.y)); + uvs.Add(new Vector2(length / tex_size.x, (length + height) / tex_size.y)); + + // Right + AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(-1, 0, 0)); + vertices.Add(points[3]); + vertices.Add(points[7]); + vertices.Add(points[2]); + vertices.Add(points[6]); + uvs.Add(new Vector2((length + width) / tex_size.x, length / tex_size.y)); + uvs.Add(new Vector2((length + width) / tex_size.x, (length + height) / tex_size.y)); + uvs.Add(new Vector2((length * 2.0f + width) / tex_size.x, length / tex_size.y)); + uvs.Add(new Vector2((length * 2.0f + width) / tex_size.x, (length + height) / tex_size.y)); + } var mesh = new Mesh(); - mesh.name = string.Format("Space Mesh: ({0}x{1}x{2})", width, depth, height); + mesh.name = string.Format("Space Ground Mesh: ({0}x{1}x{2})", width, this.length, height); mesh.SetVertices(vertices); mesh.SetUVs(0, uvs); mesh.SetNormals(normals); diff --git a/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitBlendedTexture.shader b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitBlendedTexture.shader index f980dac..c4df3ee 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitBlendedTexture.shader +++ b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitBlendedTexture.shader @@ -5,6 +5,7 @@ _MainTex ("Texture", 2D) = "white" {} _SubTex ("Texture", 2D) = "white" {} _Rate ("Rate", Range(0, 1)) = 0 + [Toggle] _isGamma("is Gamma", Float) = 0 } SubShader { @@ -35,6 +36,7 @@ float4 _MainTex_ST; sampler2D _SubTex; float _Rate; + float _isGamma; v2f vert (appdata v) { @@ -49,6 +51,7 @@ fixed4 col = tex2D(_MainTex, i.uv); fixed4 sub_col = tex2D(_SubTex, i.uv); fixed3 frag_color = lerp(col.xyz, sub_col.xyz, _Rate); + frag_color = lerp(frag_color, GammaToLinearSpace(frag_color), _isGamma); return fixed4(frag_color, 1.0); } ENDCG diff --git a/Unity_2018_Frozen/Assets/Frozen/Shader/SnowflakeParticleUpdate.compute b/Unity_2018_Frozen/Assets/Frozen/Shader/SnowflakeParticleUpdate.compute index d39e366..97d9412 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Shader/SnowflakeParticleUpdate.compute +++ b/Unity_2018_Frozen/Assets/Frozen/Shader/SnowflakeParticleUpdate.compute @@ -58,7 +58,8 @@ void CSMain(uint3 id : SV_DispatchThreadID) //if (isEmit == 0 && current_life > 0.0) current_life -= duration; p.position = home_position.xyz; p.color.rgb = float3(1, 1, 1); - p.velocity = home_velocity.xyz * 20.0f * pow(length(home_velocity.xyz), 2.0f); + //p.velocity = home_velocity.xyz * 20.0f * pow(length(home_velocity.xyz), 2.0f); + p.velocity = home_velocity.xyz * 100.0f * uni.homeStrength; //p.velocity = forceDirection * 3.0f; } p.life = current_life / duration; @@ -83,13 +84,14 @@ void CSMain(uint3 id : SV_DispatchThreadID) } // home as tangential + /* { F = cross(p.position, float3(0, 1, 0)); float d = clamp(abs(p.position.y), 1, 100); F = normalize(F) * 10.0f / pow(d, 2 * 2); acc += F * uni.homeStrength; } - + */ // force { F = float3(0, 0, 0); diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven.mat similarity index 94% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven.mat index 3ffcf54..c645e2f 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: Kristoff + m_Name: Kristoff_Sven 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: 8a3849f71f810db4094f196d78e406ea, type: 3} + m_Texture: {fileID: 2800000, guid: d8e00fc77117d3c4d9db386a3981feb8, 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.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven.mat.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven.mat.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png new file mode 100644 index 0000000..d656af7 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f0666c1c66f75d978e56b7eadaddde39f1bc3a5a7f08e307539296e55547324 +size 1037417 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png.meta new file mode 100644 index 0000000..46b22fb --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: d8e00fc77117d3c4d9db386a3981feb8 +timeCreated: 1526286554 +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: 0 + 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/anna.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png index c61fec9..838f673 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40b107230b06ddd8ea2f317a961c19b436e6edce5e8a270092ca4c8db701fe7e -size 488374 +oid sha256:ef44675520992d7f79105d3abad601a9807205bb9a07337c9ef4c5299e72fe7f +size 817464 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png new file mode 100644 index 0000000..3f967e5 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9acc6de36d4b47218f859ba38956322f74cc001b1c3551347b3ae377916c5be +size 1450853 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png.meta new file mode 100644 index 0000000..0192f7d --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: d2326e93b3259884bb63ae615548d026 +timeCreated: 1526286554 +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: 0 + 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/Effect/Cloud_Snow.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.mat index f2ca376..01875fd 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.mat @@ -8,8 +8,8 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: Cloud_Snow m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _EMISSION - m_LightmapFlags: 1 + m_ShaderKeywords: _ALPHATEST_ON + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -55,22 +55,43 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _BlendOp: 0 - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _InvFade: 1 + - _LightingEnabled: 0 - _Metallic: 0 - _Mode: 1 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 m_Colors: + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.png.meta index bfc9936..7d11224 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.png.meta +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.png.meta @@ -37,7 +37,7 @@ TextureImporter: wrapU: -1 wrapV: -1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -49,7 +49,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -67,6 +67,16 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat new file mode 100644 index 0000000..be7014f --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat @@ -0,0 +1,78 @@ +%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: Elsa_Effect_A + m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + 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: 9276cdc01befe754ebf3086fdf0c880c, 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 + - _InvFade: 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} + - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat.meta new file mode 100644 index 0000000..a19dd9d --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d399e769f1f82344b9f305269a536595 +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A_hap.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A_hap.png new file mode 100644 index 0000000..3b5a581 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A_hap.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:212eaf74b0c2332067a073d2ac02dfa2a6ba9a5aee6ee88d20eee7f23474af27 +size 1807137 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A_hap.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A_hap.png.meta new file mode 100644 index 0000000..eb71173 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A_hap.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 9276cdc01befe754ebf3086fdf0c880c +timeCreated: 1526287584 +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: 0 + 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/Effect/Elsa_Effect_B.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B.mat new file mode 100644 index 0000000..95010f8 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B.mat @@ -0,0 +1,78 @@ +%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: Elsa_Effect_B + m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + 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: 8e5a3a327c02f7c498513f78872fd584, 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 + - _InvFade: 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} + - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B.mat.meta new file mode 100644 index 0000000..2eccc9c --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5f6b94c6b2a653d439fba4373746dade +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B_hap.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B_hap.png new file mode 100644 index 0000000..7c60ebb --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B_hap.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70b8d42fb2339b877b586812b9cfd255e7ce8a17b9dc951c52ff2554c0d996e7 +size 3308008 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B_hap.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B_hap.png.meta new file mode 100644 index 0000000..5f3d9e9 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B_hap.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8e5a3a327c02f7c498513f78872fd584 +timeCreated: 1526287583 +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: 0 + 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/space-dark-mountain-sq.jpg b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-sq.jpg new file mode 100644 index 0000000..0949489 Binary files /dev/null and b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-sq.jpg differ diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-sq.jpg.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-sq.jpg.meta new file mode 100644 index 0000000..6943854 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-sq.jpg.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: ae04e57c11d96fa4ab1c13f67394f3b6 +timeCreated: 1526285199 +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: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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/space-ice-forest-sq.jpg b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-sq.jpg new file mode 100644 index 0000000..d0b4929 Binary files /dev/null and b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-sq.jpg differ diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-sq.jpg.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-sq.jpg.meta new file mode 100644 index 0000000..a5abdaa --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-sq.jpg.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 2a0d6dab08d40bc4fa8783efdc682ca7 +timeCreated: 1526289300 +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: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 4096 + 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/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute b/Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute index 26744b1..32088b2 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute @@ -11,7 +11,7 @@ float4 FluidDim; float timeStep; float temperatureAmount; float densityAmount; -//float kinectAmount; +float kinectAmount; [numthreads(NUM_THREADS, NUM_THREADS, NUM_THREADS)] void CSMain(uint3 id : SV_DispatchThreadID) @@ -25,8 +25,6 @@ void CSMain(uint3 id : SV_DispatchThreadID) KinectGridBuffer[idx] = float4(vel, obs); //KinectGridBuffer[idx] = float4(1, 0, 0, 1); - float kinectAmount = 1.0; - float obstacle = 0; // boundary diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute b/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute index 44a9ead..4f52f87 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute @@ -69,7 +69,7 @@ void CSMain(uint3 id : SV_DispatchThreadID) } float3 kpos = mul(kinect_matrix, float4(t_p3d, 1.0)).xyz; - float3 kvel = mul(kinect_matrix, float4(vel3d, 0.0)).xyz; + float3 kvel = mul(kinect_matrix, float4(-vel3d, 0.0)).xyz; if ((kpos.x < -clip_box.x * 0.5 || kpos.x > clip_box.x * 0.5 || kpos.z < -clip_box.z * 0.5 || kpos.z > clip_box.z * 0.5 || diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs index c3f8d68..6005b35 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs @@ -19,12 +19,12 @@ namespace UltraCombos int home_count; Vector4[] position_samples = new Vector4[512 * 424 * 2]; - Vector4[] velocity_samples = new Vector4[512 * 424 * 2]; + //Vector4[] velocity_samples = new Vector4[512 * 424 * 2]; public Vector3 averagePositinon = Vector3.zero; public float standardDeviation = -1.0f; - public Vector3 averageVelocity = Vector3.zero; + //public Vector3 averageVelocity = Vector3.zero; [SerializeField] string debug; @@ -45,10 +45,10 @@ namespace UltraCombos kinect.HomeCountBuffer.GetData(data); home_count = data[0]; kinect.HomePositionBuffer.GetData(position_samples, 0, 0, home_count); - kinect.HomeVelocityBuffer.GetData(velocity_samples, 0, 0, home_count); + //kinect.HomeVelocityBuffer.GetData(velocity_samples, 0, 0, home_count); averagePositinon = Vector3.zero; - averageVelocity = Vector3.zero; + //averageVelocity = Vector3.zero; if (home_count > countThreshold) { float div = 1.0f / home_count; @@ -63,17 +63,17 @@ namespace UltraCombos avg_dist += dist; standardDeviation += Mathf.Pow(dist, 2.0f); - var vel_smp = new Vector3(velocity_samples[i].x, velocity_samples[i].y, velocity_samples[i].z); - averageVelocity += vel_smp; + //var vel_smp = new Vector3(velocity_samples[i].x, velocity_samples[i].y, velocity_samples[i].z); + //averageVelocity += vel_smp; } averagePositinon.Scale(Vector4.one * div); avg_dist *= div; standardDeviation = Mathf.Sqrt(standardDeviation * div - avg_dist * avg_dist); - averageVelocity.Scale(Vector4.one * div); + //averageVelocity.Scale(Vector4.one * div); - debug = string.Format("{0}({1}): {2}", averagePositinon, avg_dist, standardDeviation); + debug = string.Format("{0}, {1}({2}): {3}", home_count, averagePositinon, avg_dist, standardDeviation); } else {