diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset index bc6e225..f871acc 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Elsa-Standby m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi + m_VideoPath: ../FrozenMaterial/night/Elsa_Icon.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index f27c073..04d6d28 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -113,6 +113,90 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &40068778 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 40068779} + - component: {fileID: 40068782} + - component: {fileID: 40068781} + - component: {fileID: 40068780} + m_Layer: 8 + m_Name: Olaf_CC065053 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &40068779 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 40068778} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -4, y: 0.44900006, z: -0.1} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_Children: [] + m_Father: {fileID: 1247992794} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!114 &40068780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 40068778} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 0 +--- !u!23 &40068781 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 40068778} + 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: 8ba933f3f4401b34ead3e5f188561901, 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 &40068782 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 40068778} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &102745337 GameObject: m_ObjectHideFlags: 0 @@ -196,11 +280,11 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 147055504} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.306, y: 0.483, z: 2.49} - m_LocalScale: {x: 1.084297, y: 1.0842984, z: 1.0842984} + m_LocalPosition: {x: -2.338, y: 0.462, z: 2.49} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_Children: [] m_Father: {fileID: 199010598} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &147055506 Rigidbody: @@ -229,7 +313,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 5 + disappearTime: 10 mat: {fileID: 0} area: 0 AppearArea: 0000000001000000 @@ -239,8 +323,10 @@ MonoBehaviour: triggerClip: {fileID: 11400000, guid: 727d0f386e383414ca58642076340e45, type: 2} players: [] color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 1.5 - specificPositions: [] + videoStopTime: 10 + specificPositions: + - {fileID: 1958951069} + - {fileID: 251596436} roaming: 0 isTriggerCollider: 0 --- !u!23 &147055508 @@ -284,8 +370,8 @@ MeshCollider: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 147055504} m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 + m_IsTrigger: 0 + m_Enabled: 0 serializedVersion: 3 m_Convex: 1 m_CookingOptions: 14 @@ -575,20 +661,103 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1906326617} + - {fileID: 1247992794} - {fileID: 147055505} + - {fileID: 2022668215} - {fileID: 411383573} - {fileID: 1933714481} - {fileID: 1690794385} - - {fileID: 461690049} - {fileID: 459917735} - {fileID: 1878556046} - {fileID: 1973785472} - {fileID: 1216863872} - - {fileID: 701848340} - - {fileID: 1956154491} m_Father: {fileID: 338663765} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &251596434 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 251596435} + - component: {fileID: 251596438} + - component: {fileID: 251596437} + - component: {fileID: 251596436} + m_Layer: 8 + m_Name: Olaf_CC065053 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &251596435 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 251596434} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 4, y: 0.515, z: -0.624} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_Children: [] + m_Father: {fileID: 2022668215} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!114 &251596436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 251596434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 1 +--- !u!23 &251596437 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 251596434} + 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: 9b8333bad640d1240ae139400daea38e, 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 &251596438 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 251596434} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &282141325 GameObject: m_ObjectHideFlags: 0 @@ -656,6 +825,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 917676528} + - {fileID: 889856157} - {fileID: 199010598} - {fileID: 368474577} m_Father: {fileID: 0} @@ -745,7 +915,7 @@ Transform: m_LocalScale: {x: 5, y: 5, z: 1} m_Children: [] m_Father: {fileID: 338663765} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!23 &368474578 MeshRenderer: @@ -815,7 +985,7 @@ MonoBehaviour: m_EditorClassIdentifier: kinect: {fileID: 712882417} triggerRadius: 1.5 - cooldown: 10 + cooldown: 30 breakProgress: 0.1 --- !u!114 &368474582 MonoBehaviour: @@ -973,7 +1143,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 199010598} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &432509337 GameObject: @@ -1171,11 +1341,11 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 459917734} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.28, y: 1.5, z: 2.49} + m_LocalPosition: {x: -3.28, y: 1.52, z: 2.49} m_LocalScale: {x: 2.1557226, y: 2.1557233, z: 2.1557233} m_Children: [] m_Father: {fileID: 199010598} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &459917736 Rigidbody: @@ -1204,7 +1374,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 5 + disappearTime: 0.1 mat: {fileID: 0} area: 0 AppearArea: 0000000001000000 @@ -1216,7 +1386,7 @@ MonoBehaviour: color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 1.5 specificPositions: [] - roaming: 0 + roaming: 0.08 isTriggerCollider: 0 --- !u!23 &459917738 MeshRenderer: @@ -1259,8 +1429,8 @@ MeshCollider: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 459917734} m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 + m_IsTrigger: 0 + m_Enabled: 0 serializedVersion: 3 m_Convex: 1 m_CookingOptions: 14 @@ -1282,17 +1452,14 @@ GameObject: m_Component: - component: {fileID: 461690049} - component: {fileID: 461690054} - - component: {fileID: 461690053} - component: {fileID: 461690052} - - component: {fileID: 461690051} - - component: {fileID: 461690050} m_Layer: 8 m_Name: Sven m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &461690049 Transform: m_ObjectHideFlags: 0 @@ -1300,53 +1467,12 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 461690048} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.556, y: 1.1800001, z: 2.49} - m_LocalScale: {x: 2.6014085, y: 2.6014092, z: 2.6014092} + 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: 199010598} - m_RootOrder: 5 + m_Father: {fileID: 1690794385} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &461690050 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 461690048} - 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 &461690051 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 461690048} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} - m_Name: - m_EditorClassIdentifier: - standby: 1 - disappearTime: 5 - mat: {fileID: 0} - area: 0 - AppearArea: 02000000 - wallRoi: {x: 0, y: 0} - fakeButton: {fileID: 0} - standbyClip: {fileID: 11400000, guid: 0dfbbcfb9e891fe49874e63122982159, type: 2} - triggerClip: {fileID: 11400000, guid: 0aa239f497b53734eb6adca529ab6225, type: 2} - players: [] - color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 1.5 - specificPositions: [] - roaming: 0 - isTriggerCollider: 0 --- !u!23 &461690052 MeshRenderer: m_ObjectHideFlags: 0 @@ -1381,20 +1507,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &461690053 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 461690048} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 3 - m_Convex: 1 - m_CookingOptions: 14 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &461690054 MeshFilter: m_ObjectHideFlags: 0 @@ -1672,180 +1784,52 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &701848339 +--- !u!1 &712882415 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 701848340} - - component: {fileID: 701848345} - - component: {fileID: 701848343} - - component: {fileID: 701848342} - - component: {fileID: 701848341} - - component: {fileID: 701848346} - m_Layer: 8 - m_Name: Marshmallow (1) + - 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 &701848340 +--- !u!4 &712882416 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 701848339} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 2.06, z: 2.49} - m_LocalScale: {x: 4.5145497, y: 4.5145497, z: 4.5145497} + 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: 199010598} - m_RootOrder: 10 + m_Father: {fileID: 386695297} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &701848341 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 701848339} - 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 &701848342 +--- !u!114 &712882417 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 701848339} + m_GameObject: {fileID: 712882415} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} - m_Name: - m_EditorClassIdentifier: - standby: 1 - disappearTime: 5 - mat: {fileID: 0} - area: 0 - AppearArea: 01000000 - 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: 1.5 - specificPositions: - - {fileID: 1673273259} - - {fileID: 1212561365} - - {fileID: 1256123372} - roaming: 5.11 - isTriggerCollider: 0 ---- !u!23 &701848343 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 701848339} - 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!33 &701848345 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 701848339} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!65 &701848346 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 701848339} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 0.1} - m_Center: {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_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: @@ -2535,6 +2519,47 @@ MonoBehaviour: debug: debugDraw: 0 debugShader: {fileID: 4800000, guid: 6ffbbc1e44667e348b62c7f3ea93ae4b, type: 3} +--- !u!1 &889856156 +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 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &889856157 +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_LocalPosition: {x: 0, y: 0, z: 1.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 338663765} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &889856158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 889856156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7fe449ac7fdb6943ac4f06843bce261, type: 3} + m_Name: + m_EditorClassIdentifier: + kinectMath: {fileID: 712882417} --- !u!1 &917676527 GameObject: m_ObjectHideFlags: 0 @@ -2840,55 +2865,55 @@ MonoBehaviour: fromGradient: {fileID: 11400000, guid: dc41f63c436894340a6736facd7dd4a9, type: 2} toGradient: {fileID: 11400000, guid: 64901b7b2c93cde4fa631ba16f78157c, type: 2} rate: 0 ---- !u!1 &1212561363 +--- !u!1 &1191975162 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1212561364} - - component: {fileID: 1212561369} - - component: {fileID: 1212561367} - - component: {fileID: 1212561365} + - component: {fileID: 1191975163} + - component: {fileID: 1191975166} + - component: {fileID: 1191975165} + - component: {fileID: 1191975164} m_Layer: 8 - m_Name: Marshmallow (3) + m_Name: Olaf_CC065053 (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1212561364 + m_IsActive: 1 +--- !u!4 &1191975163 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1212561363} + m_GameObject: {fileID: 1191975162} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.58, y: 2.06, z: 2.49} - m_LocalScale: {x: 4.5145497, y: 4.5145497, z: 4.5145497} + m_LocalPosition: {x: -3.173, y: 0.44500005, z: 2.49} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_Children: [] - m_Father: {fileID: 1956154491} - m_RootOrder: 1 + m_Father: {fileID: 1247992794} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1212561365 +--- !u!114 &1191975164 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1212561363} + m_GameObject: {fileID: 1191975162} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} m_Name: m_EditorClassIdentifier: area: 2 ---- !u!23 &1212561367 +--- !u!23 &1191975165 MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1212561363} + m_GameObject: {fileID: 1191975162} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -2897,7 +2922,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_Materials: - - {fileID: 2100000, guid: 26431f824b7c8384bbc23c36bd054e2b, type: 2} + - {fileID: 2100000, guid: 8ba933f3f4401b34ead3e5f188561901, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2917,12 +2942,12 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &1212561369 +--- !u!33 &1191975166 MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1212561363} + m_GameObject: {fileID: 1191975162} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1216863871 GameObject: @@ -2937,6 +2962,7 @@ GameObject: - component: {fileID: 1216863875} - component: {fileID: 1216863874} - component: {fileID: 1216863873} + - component: {fileID: 1216863878} m_Layer: 8 m_Name: Marshmallow m_TagString: Untagged @@ -2951,11 +2977,11 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1216863871} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.04, y: 2.06, z: 2.49} - m_LocalScale: {x: 4.514552, y: 4.514552, z: 4.514552} + 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: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &1216863873 Rigidbody: @@ -2984,7 +3010,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 5 + disappearTime: 10 mat: {fileID: 0} area: 0 AppearArea: 02000000 @@ -2994,8 +3020,9 @@ MonoBehaviour: triggerClip: {fileID: 11400000, guid: 6ccf813116f07944faf4af6bc3b2c1f7, type: 2} players: [] color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 1.5 - specificPositions: [] + videoStopTime: 10 + specificPositions: + - {fileID: 1216863878} roaming: 0 isTriggerCollider: 0 --- !u!23 &1216863875 @@ -3053,6 +3080,18 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1216863871} 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 @@ -3120,90 +3159,36 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1227078084} ---- !u!1 &1256123370 +--- !u!1 &1247992793 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1256123371} - - component: {fileID: 1256123376} - - component: {fileID: 1256123374} - - component: {fileID: 1256123372} + - component: {fileID: 1247992794} m_Layer: 8 - m_Name: Marshmallow (4) + m_Name: Olaf_CC065053-dummy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1256123371 + m_IsActive: 1 +--- !u!4 &1247992794 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1256123370} - m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 4, y: 2.33, z: -0.52} - m_LocalScale: {x: 4.5145516, y: 4.5145497, z: 4.5145516} - m_Children: [] - m_Father: {fileID: 1956154491} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!114 &1256123372 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1256123370} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 1 ---- !u!23 &1256123374 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1256123370} - 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!33 &1256123376 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1256123370} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} + m_GameObject: {fileID: 1247992793} + 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: + - {fileID: 1191975163} + - {fileID: 40068779} + m_Father: {fileID: 199010598} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1283180266 GameObject: m_ObjectHideFlags: 0 @@ -3391,90 +3376,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!1 &1673273257 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1673273258} - - component: {fileID: 1673273263} - - component: {fileID: 1673273261} - - component: {fileID: 1673273259} - m_Layer: 8 - m_Name: Marshmallow (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1673273258 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1673273257} - m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: -4, y: 2.06, z: -0.18000007} - m_LocalScale: {x: 4.5145516, y: 4.5145497, z: 4.5145516} - m_Children: [] - m_Father: {fileID: 1956154491} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} ---- !u!114 &1673273259 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1673273257} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 0 ---- !u!23 &1673273261 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1673273257} - 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!33 &1673273263 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1673273257} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1690794384 GameObject: m_ObjectHideFlags: 0 @@ -3488,6 +3389,7 @@ GameObject: - component: {fileID: 1690794388} - component: {fileID: 1690794387} - component: {fileID: 1690794386} + - component: {fileID: 1690794391} m_Layer: 8 m_Name: Kristoff m_TagString: Untagged @@ -3502,11 +3404,12 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1690794384} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.757, y: 1.102, z: 2.49} - m_LocalScale: {x: 2.4415894, y: 2.4415877, z: 2.4415877} - m_Children: [] + 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_Father: {fileID: 199010598} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &1690794386 Rigidbody: @@ -3535,9 +3438,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 5 + disappearTime: 10 mat: {fileID: 0} - area: 0 + area: 2 AppearArea: 02000000 wallRoi: {x: 0, y: 0} fakeButton: {fileID: 0} @@ -3545,8 +3448,9 @@ MonoBehaviour: triggerClip: {fileID: 11400000, guid: a6af2089baf7ed8489a4e941dae4e928, type: 2} players: [] color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 1.5 - specificPositions: [] + videoStopTime: 10 + specificPositions: + - {fileID: 1690794391} roaming: 0 isTriggerCollider: 0 --- !u!23 &1690794388 @@ -3590,8 +3494,8 @@ MeshCollider: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1690794384} m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 + m_IsTrigger: 0 + m_Enabled: 0 serializedVersion: 3 m_Convex: 1 m_CookingOptions: 14 @@ -3604,6 +3508,18 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1690794384} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1690794391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1690794384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 2 --- !u!1 &1761700811 GameObject: m_ObjectHideFlags: 0 @@ -4112,7 +4028,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 199010598} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1906326616 GameObject: @@ -4141,8 +4057,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1906326616} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.153, y: 0.665, z: 2.49} - m_LocalScale: {x: 1.0161152, y: 1.0161152, z: 1.0161152} + m_LocalPosition: {x: 3.17, y: 0.44900006, z: 2.49} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_Children: [] m_Father: {fileID: 199010598} m_RootOrder: 0 @@ -4174,7 +4090,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 5 + disappearTime: 10 mat: {fileID: 0} area: 0 AppearArea: 000000000100000002000000 @@ -4184,8 +4100,10 @@ MonoBehaviour: triggerClip: {fileID: 11400000, guid: 86cfefcea0dbaf349b192625aa06ef6a, type: 2} players: [] color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 1.5 - specificPositions: [] + videoStopTime: 10 + specificPositions: + - {fileID: 40068780} + - {fileID: 1191975164} roaming: 0 isTriggerCollider: 0 --- !u!23 &1906326620 @@ -4229,8 +4147,8 @@ MeshCollider: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1906326616} m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 + m_IsTrigger: 0 + m_Enabled: 0 serializedVersion: 3 m_Convex: 1 m_CookingOptions: 14 @@ -4303,7 +4221,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1908931425} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.185922, y: -2.2957585, z: 11.99986} + m_LocalPosition: {x: 0, y: 0, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -4322,6 +4240,7 @@ GameObject: - component: {fileID: 1933714484} - component: {fileID: 1933714483} - component: {fileID: 1933714482} + - component: {fileID: 1933714487} m_Layer: 8 m_Name: Anna m_TagString: Untagged @@ -4336,11 +4255,11 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1933714480} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.598, y: 0.997, z: 2.49} - m_LocalScale: {x: 1.8999614, y: 1.8999609, z: 1.8999609} + m_LocalPosition: {x: -0.477, y: 0.65, z: 2.49} + m_LocalScale: {x: 1.396876, y: 1.3968757, z: 1.3968757} m_Children: [] m_Father: {fileID: 199010598} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &1933714482 Rigidbody: @@ -4369,9 +4288,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 5 + disappearTime: 10 mat: {fileID: 0} - area: 0 + area: 2 AppearArea: 02000000 wallRoi: {x: 0, y: 0} fakeButton: {fileID: 0} @@ -4379,8 +4298,9 @@ MonoBehaviour: triggerClip: {fileID: 11400000, guid: 2845fcd21d061464f8f97219a167ba7a, type: 2} players: [] color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 1.5 - specificPositions: [] + videoStopTime: 10 + specificPositions: + - {fileID: 1933714487} roaming: 0 isTriggerCollider: 0 --- !u!23 &1933714484 @@ -4424,8 +4344,8 @@ MeshCollider: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1933714480} m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 + m_IsTrigger: 0 + m_Enabled: 0 serializedVersion: 3 m_Convex: 1 m_CookingOptions: 14 @@ -4438,37 +4358,102 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1933714480} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1956154490 +--- !u!114 &1933714487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1933714480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 2 +--- !u!1 &1958951067 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1956154491} + - component: {fileID: 1958951068} + - component: {fileID: 1958951071} + - component: {fileID: 1958951070} + - component: {fileID: 1958951069} m_Layer: 8 - m_Name: dummy + m_Name: Olaf_CC065053 (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1956154491 +--- !u!4 &1958951068 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1956154490} - 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: - - {fileID: 1673273258} - - {fileID: 1212561364} - - {fileID: 1256123371} - m_Father: {fileID: 199010598} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1958951067} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -4, y: 0.462, z: -1.64} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_Children: [] + m_Father: {fileID: 2022668215} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!114 &1958951069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1958951067} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 0 +--- !u!23 &1958951070 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1958951067} + 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: 9b8333bad640d1240ae139400daea38e, 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 &1958951071 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1958951067} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1973785471 GameObject: m_ObjectHideFlags: 0 @@ -4482,6 +4467,7 @@ GameObject: - component: {fileID: 1973785475} - component: {fileID: 1973785474} - component: {fileID: 1973785473} + - component: {fileID: 1973785478} m_Layer: 8 m_Name: Elsa m_TagString: Untagged @@ -4496,11 +4482,11 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1973785471} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.329, y: 0.809, z: 2.49} - m_LocalScale: {x: 2.0862558, y: 2.0862563, z: 2.0862563} + m_LocalPosition: {x: -0.075, y: 0.702, z: 2.49} + m_LocalScale: {x: 1.3805976, y: 1.3805978, z: 1.3805978} m_Children: [] m_Father: {fileID: 199010598} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &1973785473 Rigidbody: @@ -4529,7 +4515,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 5 + disappearTime: 10 mat: {fileID: 0} area: 0 AppearArea: 02000000 @@ -4539,8 +4525,9 @@ MonoBehaviour: triggerClip: {fileID: 11400000, guid: 2ea2925de6b8a934fa0ea7a7020103b1, type: 2} players: [] color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 1.5 - specificPositions: [] + videoStopTime: 10 + specificPositions: + - {fileID: 1973785478} roaming: 0 isTriggerCollider: 0 --- !u!23 &1973785475 @@ -4598,6 +4585,48 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1973785471} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1973785478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1973785471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 2 +--- !u!1 &2022668214 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2022668215} + m_Layer: 8 + m_Name: Olaf_CC065056-dummy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2022668215 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2022668214} + 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: + - {fileID: 1958951068} + - {fileID: 251596435} + m_Father: {fileID: 199010598} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2024329733 GameObject: m_ObjectHideFlags: 0 @@ -4736,16 +4765,19 @@ MonoBehaviour: snowMaterial: {fileID: 2100000, guid: 56457e5f2df74a44c933b2791da81324, type: 2} cosineGradient: {fileID: 1167120024} kinect: {fileID: 1848145251} + particleViewer: {fileID: 1035960135} + dayParticleRate: 0.2 dayCharacters: - {fileID: 1906326619} - {fileID: 1933714483} - {fileID: 1690794387} - - {fileID: 461690051} + - {fileID: 147055507} - {fileID: 459917737} nightCharacters: - {fileID: 147055507} - {fileID: 1973785474} - {fileID: 1216863874} + - {fileID: 1906326619} debug: 0 --- !u!4 &2084936104 Transform: diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat b/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat index 906abfc..31a27a3 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: 2.0670986e-25} + - _Color: {r: 1, g: 1, b: 1, a: 0.99999887} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/PostProcessingProfile.asset b/Unity_2018_Frozen/Assets/Frozen/PostProcessingProfile.asset index cb5e2ef..00dd05b 100644 --- a/Unity_2018_Frozen/Assets/Frozen/PostProcessingProfile.asset +++ b/Unity_2018_Frozen/Assets/Frozen/PostProcessingProfile.asset @@ -100,14 +100,14 @@ MonoBehaviour: m_Enabled: 1 m_Settings: bloom: - intensity: 2.17 + intensity: 1 threshold: 1.1 softKnee: 0.5 radius: 4 antiFlicker: 0 lensDirt: texture: {fileID: 0} - intensity: 3 + intensity: 0 colorGrading: m_Enabled: 1 m_Settings: diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs index 7f4cfec..4073402 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs @@ -11,7 +11,7 @@ public class CharacterBehaviour : MonoBehaviour private bool standby = true; - [Range(3, 15)] + [Range(0, 15)] public float disappearTime = 5; public Material mat; @@ -290,6 +290,7 @@ public class CharacterBehaviour : MonoBehaviour transform.position = dummy.transform.position; transform.rotation = dummy.transform.rotation; UpdateWallRoiFromPosition(); + UpdateButtonPos(); } void UpdateWallRoiFromPosition() @@ -378,9 +379,12 @@ public class CharacterBehaviour : MonoBehaviour public float GetDisappear() { + return disappearTime; + /* float distime = disappearTime - Random.Range(0, disappearTime / 2); distime = disappearTime * distime - distime * distime + 0.5f * distime; return distime; + */ } IEnumerator RandomPosNoTriggerOther() diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterDummy.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterDummy.cs index 165042b..fb58202 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterDummy.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterDummy.cs @@ -5,5 +5,10 @@ using UnityEngine; public class CharacterDummy : MonoBehaviour { public Area area; - + + private void Start() + { + if (GetComponent() == null) + gameObject.SetActive(false); + } } diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs b/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs new file mode 100644 index 0000000..529c5cd --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs @@ -0,0 +1,81 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace UltraCombos.Frozen +{ + public class ElsaEffectGenerator : MonoBehaviour + { + [SerializeField] + KinectOpticalFlowMath kinectMath; + + bool isHit = false; + Vector3 hitPoint = Vector3.zero; + + private void Start() + { + + } + + private void Update() + { + float padding = 0.5f; + Ray ray = new Ray(Vector3.zero, -new Vector3(kinectMath.averageVelocity.x, 0, kinectMath.averageVelocity.z)); + + float enter = 0.0f; + isHit = false; + Vector3 hit_point = Vector3.zero; + if (isHit == false) + { + 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) + { + isHit = true; + } + } + } + + if (isHit == false) + { + 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) + { + isHit = true; + } + } + } + + if (isHit == false) + { + 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) + { + isHit = true; + } + } + } + + + if (isHit) + { + 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/ElsaEffectGenerator.cs.meta b/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs.meta new file mode 100644 index 0000000..f9a266c --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: a7fe449ac7fdb6943ac4f06843bce261 +timeCreated: 1525923394 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs b/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs index 8fe5d38..d519ff4 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs @@ -59,6 +59,8 @@ public class FrozenScreenToWorldSpace : MonoBehaviour { Dictionary RenderTextureROIList = new Dictionary(); + Dictionary wallPlaneList = new Dictionary(); + private float totalLength; private float totalWidth; @@ -80,6 +82,9 @@ public class FrozenScreenToWorldSpace : MonoBehaviour { 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))); } public RenderTextureROI GetROI(Area area) @@ -89,6 +94,13 @@ public class FrozenScreenToWorldSpace : MonoBehaviour { return null; } + public Plane GetWallPlane(Area area) + { + if (wallPlaneList.ContainsKey(area)) + return wallPlaneList[area]; + return new Plane(); + } + public Vector2 GetFinalScreenPos(Area area, Vector2 wallROI) { if(!RenderTextureROIList.ContainsKey(area)) @@ -136,7 +148,7 @@ public class FrozenScreenToWorldSpace : MonoBehaviour { break; case Area.RightWall: { - roi.x = (-position.z + width * 0.5f) / width; + roi.x = (position.z + width * 0.5f) / width; roi.y = position.y / height; } break; diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs index 6c7212e..3a6dc24 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs @@ -26,6 +26,11 @@ namespace UltraCombos.Frozen [SerializeField] KinectOpticalFlow kinect; + [SerializeField] + ParticleViewerProcedural particleViewer; + [SerializeField, Range(0, 1)] + float dayParticleRate = 1.0f; + [SerializeField] List dayCharacters = new List(); @@ -49,9 +54,11 @@ namespace UltraCombos.Frozen uniform.rate = rate; spaceMaterial.SetFloat("_Rate", rate); - snowMaterial.SetFloat("_Size", Mathf.Lerp(0.0f, snowSize, 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; + 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/Texture/Character/Kristoff.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png index fe9910b..b8d4a12 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcd4d160496391f65c5d82c25a813a33ced7f1fbd744286fda05c11d15bc8591 -size 4243930 +oid sha256:e21eaba3dcbee8af9bf2367f66fd0f9791c1bd69015eedc520d81fc6e2e4ffdb +size 1162727 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png index 7005c24..08a3d19 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc30b571b0a3b792a969403d61dc7481db57c77f185a68bbde281e25a82e501e -size 1326760 +oid sha256:28c4ed9f97f5aefcf6b76345fe0ed3abf03931af0abc1d958cf885b07ff1f1ce +size 727689 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png index 0a89747..2a75af7 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:968e932b0aca3755bd816432b2fc5fe1c56c841991449f3d67904e1bae7e6caa -size 1976079 +oid sha256:c2faa189a760073f8c2b0e0f6faf54b0bfaed45a941b420d52f5fb11f6895845 +size 603903 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png index e2c4b48..9ac0c44 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1484e6561e9e445d90940eb970fcc04a2ca0add754c1c03046cc4c3fe594529 -size 4262397 +oid sha256:2fce8b15277572ebc8e3f31e9d07ead49cec49670cec71a775ed9c9df64736a0 +size 1085805 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png index 3e09c58..c61fec9 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:72b035a931b5164f7a6d6231faefb249771435ff155980abbbfcbd6c9022b4f2 -size 2654649 +oid sha256:40b107230b06ddd8ea2f317a961c19b436e6edce5e8a270092ca4c8db701fe7e +size 488374 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-layout.jpg b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-layout.jpg new file mode 100644 index 0000000..f86cad8 Binary files /dev/null and b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-layout.jpg differ diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-layout.jpg.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-layout.jpg.meta new file mode 100644 index 0000000..1ff23d7 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-layout.jpg.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 4078dff6c078ddd49865b51d25d30894 +timeCreated: 1525943464 +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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 8192 + 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-layout.jpg b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-layout.jpg new file mode 100644 index 0000000..42d3987 Binary files /dev/null and b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-layout.jpg differ diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-layout.jpg.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-layout.jpg.meta new file mode 100644 index 0000000..49296cd --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-layout.jpg.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8836979775ffec34395d5625d0de7a0c +timeCreated: 1525943466 +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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 8192 + 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/KinectOpticalFlow/KinectOpticalFlowMath.cs b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs index ec2c394..c3f8d68 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs @@ -14,12 +14,18 @@ namespace UltraCombos float step; float stamp = 0.0f; + [SerializeField] + int countThreshold = 30; + int home_count; - Vector4[] samples = new Vector4[512 * 424]; - + Vector4[] position_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; + [SerializeField] string debug; public string DebugString { get { return debug; } } @@ -38,26 +44,35 @@ namespace UltraCombos var data = new int[kinect.HomeCountBuffer.count]; kinect.HomeCountBuffer.GetData(data); home_count = data[0]; - kinect.HomePositionBuffer.GetData(samples, 0, 0, home_count); + kinect.HomePositionBuffer.GetData(position_samples, 0, 0, home_count); + kinect.HomeVelocityBuffer.GetData(velocity_samples, 0, 0, home_count); - if (home_count > 0) + averagePositinon = Vector3.zero; + averageVelocity = Vector3.zero; + if (home_count > countThreshold) { float div = 1.0f / home_count; float avg_dist = 0.0f; - averagePositinon = Vector3.zero; + standardDeviation = 0.0f; for (int i = 0; i < home_count; i++) { - var smp = new Vector3(samples[i].x, samples[i].y, samples[i].z); - averagePositinon += smp; - float dist = new Vector2(smp.x - transform.position.x, smp.z - transform.position.z).magnitude; + var pos_smp = new Vector3(position_samples[i].x, position_samples[i].y, position_samples[i].z); + averagePositinon += pos_smp; + float dist = new Vector2(pos_smp.x - transform.position.x, pos_smp.z - transform.position.z).magnitude; 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; } + averagePositinon.Scale(Vector4.one * div); avg_dist *= div; standardDeviation = Mathf.Sqrt(standardDeviation * div - avg_dist * avg_dist); + averageVelocity.Scale(Vector4.one * div); + debug = string.Format("{0}({1}): {2}", averagePositinon, avg_dist, standardDeviation); } else @@ -66,8 +81,6 @@ namespace UltraCombos debug = "null"; } } - - } }