From b413ae528ae0c12192959fce9c2ccb0d920f8e46 Mon Sep 17 00:00:00 2001 From: uc deploy Date: Tue, 26 Jun 2018 15:21:24 +0800 Subject: [PATCH] update on stage for more fun --- .../Frozen/DSAsset/Cloud-Standby 3.asset | 15 + .../Frozen/DSAsset/Cloud-Standby 3.asset.meta | 10 + .../Frozen/DSAsset/Cloud-Trigger 3.asset | 15 + .../Frozen/DSAsset/Cloud-Trigger 3.asset.meta | 10 + .../DSAsset/Elsa_Effect_A-Standby 2.asset | 15 + .../Elsa_Effect_A-Standby 2.asset.meta | 10 + .../DSAsset/Elsa_Effect_A-Trigger 2.asset | 15 + .../Elsa_Effect_A-Trigger 2.asset.meta | 10 + .../DSAsset/Elsa_Effect_B-Standby 2.asset | 15 + .../Elsa_Effect_B-Standby 2.asset.meta | 10 + .../DSAsset/Elsa_Effect_B-Trigger 2.asset | 15 + .../Elsa_Effect_B-Trigger 2.asset.meta | 10 + .../DSAsset/Olaf_CC065053-Trigger.asset | 2 +- .../DSAsset/Olaf_CC065056-Trigger.asset | 2 +- Unity_2018_Frozen/Assets/Frozen/Frozen.unity | 991 +++++++++++++++--- .../Frozen/FrozenNightParticleUniforms.asset | 2 +- .../Frozen/Script/CharacterBehaviour.cs | 17 + .../Assets/Frozen/Script/GiantSnowflake.cs | 38 +- .../ApplyKinectFluidBufferShader.compute | 2 +- .../KinectOpticalFlowMath.cs | 10 +- 20 files changed, 1037 insertions(+), 177 deletions(-) create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 3.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 3.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 3.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 3.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 2.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 2.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 2.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 2.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 2.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 2.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 2.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 2.asset.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 3.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 3.asset new file mode 100644 index 0000000..df581ec --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 3.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: Cloud-Standby 3 + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/icon/icon_cloud.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 3.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 3.asset.meta new file mode 100644 index 0000000..5691b5b --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 3.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: bddde81afd2a6774fb8fa0cb3e4751c1 +timeCreated: 1524210684 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 3.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 3.asset new file mode 100644 index 0000000..2e7a9f5 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 3.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: Cloud-Trigger 3 + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/effect/Cloud_Snow_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 3.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 3.asset.meta new file mode 100644 index 0000000..3812013 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 3.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 449886f54dd9e4446ad39d4fb290d4c0 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 2.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 2.asset new file mode 100644 index 0000000..461952a --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 2.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-Standby 2 + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 2.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 2.asset.meta new file mode 100644 index 0000000..c617c7d --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 2.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e83615d38d3560c488a57ce710881f59 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 2.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 2.asset new file mode 100644 index 0000000..a886b7d --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 2.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 2 + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/effect/Elsa_Effect_A_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 2.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 2.asset.meta new file mode 100644 index 0000000..9ea0e35 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 2.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 020766b7ed4acb2419cd8578013b4959 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 2.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 2.asset new file mode 100644 index 0000000..ad25a40 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 2.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 2 + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 2.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 2.asset.meta new file mode 100644 index 0000000..9368dfe --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 2.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b2664ad4b776f9f42a9b467e62fcf93b +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 2.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 2.asset new file mode 100644 index 0000000..a155597 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 2.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 2 + 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 2.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 2.asset.meta new file mode 100644 index 0000000..c47d926 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 2.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: aa72046cb573df245a7e4dbd51bbd333 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset index 7b5fadd..28c06be 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Olaf_CC065053-Trigger m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/day/Olaf_CC065053_Hap.avi + m_VideoPath: ../FrozenMaterial/day/Olaf_CC065057_fast.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset index ed0657f..a3f3527 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Olaf_CC065056-Trigger m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/night/Olaf_CC065056_Hap.avi + m_VideoPath: ../FrozenMaterial/day/Olaf_CC065056_fast.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index 292f21f..a1be8d6 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -113,136 +113,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!43 &2500288 -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 &33825545 GameObject: m_ObjectHideFlags: 0 @@ -272,7 +142,7 @@ Transform: - {fileID: 409590976} - {fileID: 1686473287} m_Father: {fileID: 199010598} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &33825547 MonoBehaviour: @@ -572,6 +442,77 @@ Transform: m_Father: {fileID: 859578237} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &64793643 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 64793644} + - component: {fileID: 64793646} + - component: {fileID: 64793645} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &64793644 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 64793643} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} + m_Children: [] + m_Father: {fileID: 430669115} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &64793645 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 64793643} + 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: 482d068533c073147b880ef1a3cbbbdc, 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 &64793646 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 64793643} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &66098174 GameObject: m_ObjectHideFlags: 0 @@ -1177,6 +1118,77 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 182553293} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &188375360 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 188375361} + - component: {fileID: 188375363} + - component: {fileID: 188375362} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &188375361 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 188375360} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} + m_Children: [] + m_Father: {fileID: 314832562} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &188375362 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 188375360} + 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: 8c39c22eb38d35d469dada1042a71ea9, 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 &188375363 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 188375360} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!114 &197334246 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 114569137293014918, guid: 1f68bf7cec2600e49a46d2f0554453c8, @@ -1216,6 +1228,7 @@ Transform: - {fileID: 459917735} - {fileID: 947900027} - {fileID: 234989374} + - {fileID: 430669115} - {fileID: 1878556046} - {fileID: 1973785472} - {fileID: 1216863872} @@ -1223,11 +1236,84 @@ Transform: - {fileID: 1225287932} - {fileID: 1008043395} - {fileID: 33825546} + - {fileID: 245867825} + - {fileID: 314832562} - {fileID: 1186117295} - {fileID: 639322481} m_Father: {fileID: 338663765} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &216370228 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 216370229} + - component: {fileID: 216370231} + - component: {fileID: 216370230} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &216370229 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 216370228} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} + m_Children: [] + m_Father: {fileID: 245867825} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &216370230 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 216370228} + 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: ef4c4d78f0eeb744baec7916f94db5be, 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 &216370231 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 216370228} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &234989373 GameObject: m_ObjectHideFlags: 0 @@ -1235,58 +1321,131 @@ GameObject: m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 234989374} - - component: {fileID: 234989375} + - component: {fileID: 234989374} + - component: {fileID: 234989375} + m_Layer: 8 + m_Name: Cloud-2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &234989374 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 234989373} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.28, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 663412326} + - {fileID: 1722222727} + m_Father: {fileID: 199010598} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &234989375 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 234989373} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} + m_Name: + m_EditorClassIdentifier: + appearSataes: 01000000 + videoStopTime: 1.5 + disappearTime: 0.1 + area: 0 + appearAreas: 01000000 + specificPositions: [] + roaming: 0.08 + fakeButton: {fileID: 0} + isStandbyLoop: 1 + standbyClip: {fileID: 11400000, guid: 696d013e4c412744fb94ecf601816f51, type: 2} + triggerClips: + - {fileID: 11400000, guid: a836c026a2d034e498d76b47fa8e49e8, type: 2} + triggerFrame: 0 + onTrigger: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1373766507} + m_MethodName: PlayOneShot + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + mode: 0 + info: +--- !u!1 &245867824 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 245867825} + - component: {fileID: 245867826} m_Layer: 8 - m_Name: Cloud-2 + m_Name: Elsa_Effect_A-2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &234989374 +--- !u!4 &245867825 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 234989373} + m_GameObject: {fileID: 245867824} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.28, y: 0, z: 2.49} + m_LocalPosition: {x: -0.064, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 663412326} - - {fileID: 1722222727} + - {fileID: 1418579082} + - {fileID: 216370229} m_Father: {fileID: 199010598} - m_RootOrder: 7 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &234989375 +--- !u!114 &245867826 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 234989373} + m_GameObject: {fileID: 245867824} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - appearSataes: 01000000 - videoStopTime: 1.5 - disappearTime: 0.1 + appearSataes: 02000000 + videoStopTime: 0.5 + disappearTime: 0.5 area: 0 - appearAreas: 01000000 + appearAreas: 02000000 specificPositions: [] - roaming: 0.08 + roaming: 0 fakeButton: {fileID: 0} isStandbyLoop: 1 - standbyClip: {fileID: 11400000, guid: 696d013e4c412744fb94ecf601816f51, type: 2} + standbyClip: {fileID: 11400000, guid: e83615d38d3560c488a57ce710881f59, type: 2} triggerClips: - - {fileID: 11400000, guid: a836c026a2d034e498d76b47fa8e49e8, type: 2} + - {fileID: 11400000, guid: 020766b7ed4acb2419cd8578013b4959, type: 2} triggerFrame: 0 onTrigger: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1373766507} + - m_Target: {fileID: 1206946026} m_MethodName: PlayOneShot m_Mode: 1 m_Arguments: @@ -1475,6 +1634,79 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &314832561 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 314832562} + - component: {fileID: 314832563} + m_Layer: 8 + m_Name: Elsa_Effect_B-2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &314832562 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 314832561} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.59, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 875420588} + - {fileID: 188375361} + m_Father: {fileID: 199010598} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &314832563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 314832561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} + m_Name: + m_EditorClassIdentifier: + appearSataes: 02000000 + videoStopTime: 0.5 + disappearTime: 0.5 + area: 0 + appearAreas: 02000000 + specificPositions: [] + roaming: 0 + fakeButton: {fileID: 0} + isStandbyLoop: 1 + standbyClip: {fileID: 11400000, guid: b2664ad4b776f9f42a9b467e62fcf93b, type: 2} + triggerClips: + - {fileID: 11400000, guid: aa72046cb573df245a7e4dbd51bbd333, type: 2} + triggerFrame: 0 + onTrigger: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1206946026} + m_MethodName: PlayOneShot + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + mode: 0 + info: --- !u!1 &338663764 GameObject: m_ObjectHideFlags: 0 @@ -1719,7 +1951,7 @@ MonoBehaviour: stopTime: 10 cooldown: 30 offset: 1.5 - breakProgress: 0.2 + breakProgress: 0.17 onPlay: m_PersistentCalls: m_Calls: @@ -2055,6 +2287,79 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 423869583} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &430669114 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 430669115} + - component: {fileID: 430669116} + m_Layer: 8 + m_Name: Cloud-3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &430669115 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 430669114} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.28, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 603456585} + - {fileID: 64793644} + m_Father: {fileID: 199010598} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &430669116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 430669114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} + m_Name: + m_EditorClassIdentifier: + appearSataes: 01000000 + videoStopTime: 1.5 + disappearTime: 0.1 + area: 0 + appearAreas: 01000000 + specificPositions: [] + roaming: 0.08 + fakeButton: {fileID: 0} + isStandbyLoop: 1 + standbyClip: {fileID: 11400000, guid: bddde81afd2a6774fb8fa0cb3e4751c1, type: 2} + triggerClips: + - {fileID: 11400000, guid: 449886f54dd9e4446ad39d4fb290d4c0, type: 2} + triggerFrame: 0 + onTrigger: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1373766507} + m_MethodName: PlayOneShot + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + mode: 0 + info: --- !u!1 &432509337 GameObject: m_ObjectHideFlags: 0 @@ -2341,7 +2646,7 @@ MonoBehaviour: videoStopTime: 1.5 disappearTime: 0.1 area: 0 - appearAreas: 0000000001000000 + appearAreas: 00000000 specificPositions: [] roaming: 0.08 fakeButton: {fileID: 0} @@ -2717,6 +3022,77 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 575691238} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &603456584 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 603456585} + - component: {fileID: 603456587} + - component: {fileID: 603456586} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &603456585 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 603456584} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0.172, y: 1.3, z: 0} + m_LocalScale: {x: 1.8760327, y: 1.8760332, z: 1.8760332} + m_Children: [] + m_Father: {fileID: 430669115} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!23 &603456586 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 603456584} + 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: 38c501add24d6eb4fbc6903d634d88f3, 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 &603456587 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 603456584} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &617692218 Prefab: m_ObjectHideFlags: 0 @@ -2850,7 +3226,7 @@ Transform: - {fileID: 276089016} - {fileID: 1470412009} m_Father: {fileID: 199010598} - m_RootOrder: 16 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &639322482 MonoBehaviour: @@ -3183,6 +3559,7 @@ MonoBehaviour: fps: 15 maxSampleCount: 10000 countThreshold: 30 + doCalculate: 0 averagePositinon: {x: 0, y: 0, z: 0} standardDeviation: -1 debug: @@ -3783,20 +4160,91 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &859578237 +--- !u!4 &859578237 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 859578236} + 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: 60963459} + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &875420587 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 875420588} + - component: {fileID: 875420590} + - component: {fileID: 875420589} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &875420588 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 859578236} - 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: 60963459} - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 875420587} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0.39, y: 1.52, z: 0} + m_LocalScale: {x: 2.7489872, y: 2.7489867, z: 2.7489867} + m_Children: [] + m_Father: {fileID: 314832562} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!23 &875420589 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 875420587} + 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: 5f6b94c6b2a653d439fba4373746dade, 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 &875420590 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 875420587} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &887356092 GameObject: m_ObjectHideFlags: 0 @@ -4125,7 +4573,7 @@ Transform: - {fileID: 1783570513} - {fileID: 575691239} m_Father: {fileID: 199010598} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1008043396 MonoBehaviour: @@ -4602,7 +5050,7 @@ Transform: - {fileID: 1890969984} - {fileID: 38018604} m_Father: {fileID: 199010598} - m_RootOrder: 15 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1186117296 MonoBehaviour: @@ -4877,7 +5325,7 @@ Transform: - {fileID: 1329758487} - {fileID: 768391777} m_Father: {fileID: 199010598} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1216863874 MonoBehaviour: @@ -4963,7 +5411,7 @@ Transform: - {fileID: 2008324329} - {fileID: 1674052467} m_Father: {fileID: 199010598} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1225287935 MonoBehaviour: @@ -5567,7 +6015,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 2500288} + m_Mesh: {fileID: 1779781707} --- !u!114 &1379541365 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5735,6 +6183,77 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1395728836} +--- !u!1 &1418579081 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1418579082} + - component: {fileID: 1418579084} + - component: {fileID: 1418579083} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1418579082 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1418579081} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 1.53, z: 0} + m_LocalScale: {x: 3.0327268, y: 3.032728, z: 3.032728} + m_Children: [] + m_Father: {fileID: 245867825} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!23 &1418579083 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1418579081} + 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!33 &1418579084 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1418579081} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1443956512 GameObject: m_ObjectHideFlags: 0 @@ -6929,6 +7448,136 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1774693141} +--- !u!43 &1779781707 +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 &1783570512 GameObject: m_ObjectHideFlags: 0 @@ -7404,7 +8053,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 199010598} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1890969983 GameObject: @@ -7829,7 +8478,7 @@ Transform: - {fileID: 351311319} - {fileID: 47501850} m_Father: {fileID: 199010598} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1973785474 MonoBehaviour: @@ -7915,7 +8564,7 @@ Transform: - {fileID: 565906441} - {fileID: 436028453} m_Father: {fileID: 199010598} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1984882819 MonoBehaviour: diff --git a/Unity_2018_Frozen/Assets/Frozen/FrozenNightParticleUniforms.asset b/Unity_2018_Frozen/Assets/Frozen/FrozenNightParticleUniforms.asset index 0f11763..d098a89 100644 --- a/Unity_2018_Frozen/Assets/Frozen/FrozenNightParticleUniforms.asset +++ b/Unity_2018_Frozen/Assets/Frozen/FrozenNightParticleUniforms.asset @@ -18,7 +18,7 @@ MonoBehaviour: lifeDuration: 5 lifeVariation: 0 convergence: 0 - homeStrength: 0.243 + homeStrength: 0.586 noiseStrength: 0.055 noiseSeed: 0.5 noiseTimeScale: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs index 3b2fe74..abadb65 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs @@ -29,6 +29,7 @@ namespace UltraCombos.Frozen [SerializeField] private RectTransform fakeButton; + private CanvasGroup canvas_group; [Header("DShow Player")] [SerializeField] @@ -121,6 +122,9 @@ namespace UltraCombos.Frozen TouchArea touch_area = fakeButton.gameObject.AddComponent(); touch_area.PointerDown.AddListener((data) => { Trigger(data); }); touch_area.PointerDrag.AddListener((data) => { Trigger(data); }); + canvas_group = fakeButton.gameObject.AddComponent(); + canvas_group.blocksRaycasts = true; + canvas_group.interactable = true; } private void Start() @@ -144,13 +148,22 @@ namespace UltraCombos.Frozen //color = new Color(1, 1, 1, 0); //StartCoroutine(Sleep()); if (fakeButton != null) + { fakeButton.gameObject.SetActive(true); + canvas_group.interactable = true; + canvas_group.blocksRaycasts = true; + } + } private void OnDisable() { if (fakeButton != null) + { fakeButton.gameObject.SetActive(false); + canvas_group.interactable = false; + canvas_group.blocksRaycasts = false; + } } public bool Active @@ -229,6 +242,8 @@ namespace UltraCombos.Frozen if (mode) info = "STANDBY"; // standby { + canvas_group.interactable = true; + canvas_group.blocksRaycasts = true; status = Status.STANDBY; var player = StatePlayer; player.Loop = isStandbyLoop; @@ -257,6 +272,8 @@ namespace UltraCombos.Frozen if (mode) info = "TRIGGER"; // trigger { + canvas_group.interactable = false; + canvas_group.blocksRaycasts = false; onTrigger.Invoke(); status = Status.TRIGGER; var player = StatePlayer; diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs index 6c712d4..4b8574b 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs @@ -93,18 +93,28 @@ namespace UltraCombos.Frozen material.mainTexture = player.Texture; + if (flow != null && SceneController.Instance.state != State.Night) + { + StopCoroutine(flow); + flow = null; + } + if (flow == null && SceneController.Instance.state == State.Night) + { flow = StartCoroutine(Flow()); + } } private void OnDrawGizmosSelected() { + /* var pos = kinect.averagePositinon; Gizmos.DrawWireSphere(pos, 0.5f); if (new Vector2(pos.x - transform.position.x, pos.z - transform.position.z).magnitude < triggerRadius) { Gizmos.color = Color.red; } + */ Gizmos.DrawWireSphere(transform.position, triggerRadius); Gizmos.color = Color.white; @@ -138,7 +148,7 @@ namespace UltraCombos.Frozen while (progress < breakProgress) { if (mode) info = $"{progress}"; - +#if false var pos = kinect.averagePositinon; float dist = new Vector2(pos.x - transform.position.x, pos.z - transform.position.z).magnitude; @@ -151,7 +161,33 @@ namespace UltraCombos.Frozen { progress = Mathf.Max(progress - 0.001f, pause_progress); } +#else + bool is_hit = false; + if (kinect.Valid) + { + var samples = kinect.Samples; + int max_sample = 500; + int inc = Mathf.Max(kinect.HomeCount / max_sample, 1); + + for (int i = 0; i < kinect.HomeCount; i += inc) + { + float dist = new Vector2(samples[i].x - transform.position.x, samples[i].z - transform.position.z).magnitude; + if (dist < triggerRadius) + { + Debug.Log("is_hit"); + progress += 0.001f; + is_hit = true; + break; + } + } + + } + if (is_hit == false) + { + progress = Mathf.Max(progress - 0.001f, pause_progress); + } +#endif player.Frame = (uint)(player.TotalNumFrames * progress); yield return null; } diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute b/Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute index 32088b2..86dbb56 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute @@ -57,6 +57,6 @@ void CSMain(uint3 id : SV_DispatchThreadID) temperature = max(temperature, 0); TemperatureBuffer[idx] = temperature; - velocity += KinectGridBuffer[idx].xyz * kinectAmount; + velocity += KinectGridBuffer[idx].xyz * kinectAmount * 10.0; VelocityBuffer[idx] = velocity; } \ No newline at end of file diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs index 3ada8a8..18f81b1 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs @@ -22,8 +22,13 @@ 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 bool Valid { get { return home_count > countThreshold; } } + public int HomeCount { get { return home_count; } } + public Vector4[] Samples { get { return position_samples; } } + + public bool doCalculate = false; public Vector3 averagePositinon = Vector3.zero; public float standardDeviation = -1.0f; @@ -50,6 +55,9 @@ namespace UltraCombos kinect.HomePositionBuffer.GetData(position_samples, 0, 0, home_count); //kinect.HomeVelocityBuffer.GetData(velocity_samples, 0, 0, home_count); + if (doCalculate == false) + return; + averagePositinon = Vector3.zero; //averageVelocity = Vector3.zero; if (home_count > countThreshold)