diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 1.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 1.asset new file mode 100644 index 0000000..7c32002 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 1.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 1 + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/icon/icon_cloud.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 1.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 1.asset.meta new file mode 100644 index 0000000..24b06ce --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 1.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9e519da1c7293b645b3c2bce2455acf6 +timeCreated: 1524210684 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 2.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 2.asset new file mode 100644 index 0000000..8579177 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-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: Cloud-Standby 2 + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/icon/icon_cloud.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 2.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 2.asset.meta new file mode 100644 index 0000000..3d06fca --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby 2.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 696d013e4c412744fb94ecf601816f51 +timeCreated: 1524210684 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 1.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 1.asset new file mode 100644 index 0000000..e5b74e2 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 1.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 1 + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/effect/Cloud_Snow_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 1.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 1.asset.meta new file mode 100644 index 0000000..3cee907 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 1.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e6c4f6a38e1dfe04eaf0bb12757a7067 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 2.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 2.asset new file mode 100644 index 0000000..2cc0721 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-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: Cloud-Trigger 2 + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/effect/Cloud_Snow_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 2.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 2.asset.meta new file mode 100644 index 0000000..4b49a6e --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Trigger 2.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a836c026a2d034e498d76b47fa8e49e8 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 1.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 1.asset new file mode 100644 index 0000000..ff4d86a --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 1.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 1 + 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 1.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 1.asset.meta new file mode 100644 index 0000000..c764842 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby 1.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c4b4ef67857577d4fb6e9761b359839a +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 1.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 1.asset new file mode 100644 index 0000000..32eb273 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 1.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 1 + 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 1.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 1.asset.meta new file mode 100644 index 0000000..26230a7 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger 1.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9460e88d21c95ab4db234d30c9c7bec0 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 1.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 1.asset new file mode 100644 index 0000000..3aa4c8b --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 1.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 1 + 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 1.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 1.asset.meta new file mode 100644 index 0000000..52925b9 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby 1.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e19cadcb21fdcbf449164a9d5995a365 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 1.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 1.asset new file mode 100644 index 0000000..ef5704d --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 1.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 1 + 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 1.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 1.asset.meta new file mode 100644 index 0000000..7fb5158 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger 1.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d24d41f7a768ef342b08908a46421d58 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index dc4d1dd..1a10b2d 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -113,6 +113,78 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &33825545 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 33825546} + - component: {fileID: 33825547} + m_Layer: 8 + m_Name: Elsa_Effect_B-1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &33825546 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 33825545} + 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: 409590976} + - {fileID: 1686473287} + m_Father: {fileID: 199010598} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &33825547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 33825545} + 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: 01000000 + specificPositions: [] + roaming: 0 + fakeButton: {fileID: 0} + isStandbyLoop: 1 + standbyClip: {fileID: 11400000, guid: e19cadcb21fdcbf449164a9d5995a365, type: 2} + triggerClips: + - {fileID: 11400000, guid: d24d41f7a768ef342b08908a46421d58, type: 2} + 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 &40068778 GameObject: m_ObjectHideFlags: 0 @@ -137,13 +209,13 @@ Transform: 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: -3.99, y: 0.44900006, z: -0.1} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 3.99, y: 0, z: -0.792} + m_LocalScale: {x: 0.891734, y: 0.891734, z: 0.891734} m_Children: [] m_Father: {fileID: 1247992794} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!114 &40068780 MonoBehaviour: m_ObjectHideFlags: 0 @@ -155,7 +227,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} m_Name: m_EditorClassIdentifier: - area: 0 + area: 1 --- !u!23 &40068781 MeshRenderer: m_ObjectHideFlags: 0 @@ -221,7 +293,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 47501849} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalPosition: {x: -0.338, y: 1, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] m_Father: {fileID: 1973785472} @@ -298,6 +370,220 @@ Transform: m_Father: {fileID: 859578237} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &66098174 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 66098175} + - component: {fileID: 66098178} + - component: {fileID: 66098177} + - component: {fileID: 66098176} + m_Layer: 8 + m_Name: Olaf_CC065053 (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &66098175 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 66098174} + m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: 3.99, y: 0, z: 1.622} + m_LocalScale: {x: 0.8917304, y: 0.89172995, z: 0.8917304} + m_Children: [] + m_Father: {fileID: 1247992794} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!114 &66098176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 66098174} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 1 +--- !u!23 &66098177 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 66098174} + 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 &66098178 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 66098174} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!43 &93797640 +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 &96822205 GameObject: m_ObjectHideFlags: 0 @@ -740,14 +1026,90 @@ Transform: - {fileID: 1933714481} - {fileID: 1690794385} - {fileID: 459917735} + - {fileID: 947900027} + - {fileID: 234989374} - {fileID: 1878556046} - {fileID: 1973785472} - {fileID: 1216863872} - {fileID: 1984882816} - {fileID: 1225287932} + - {fileID: 1008043395} + - {fileID: 33825546} m_Father: {fileID: 338663765} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &234989373 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - 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} + 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 &260126567 GameObject: m_ObjectHideFlags: 0 @@ -876,6 +1238,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1448496801} - {fileID: 917676528} - {fileID: 199010598} - {fileID: 368474577} @@ -958,8 +1321,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 351311318} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.7, z: 0} - m_LocalScale: {x: 1.38, y: 1.38, z: 1.38} + m_LocalPosition: {x: 0, y: 0.906, z: 0} + m_LocalScale: {x: 1.8271319, y: 1.8271316, z: 1.8271316} m_Children: [] m_Father: {fileID: 1973785472} m_RootOrder: 0 @@ -1034,7 +1397,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: @@ -1252,6 +1615,83 @@ MonoBehaviour: folder: FrozenMaterial\sound\sfx\20180514_Frozen_SFX_Character_Stem filenames: [] volumeScale: 1 + onPlayFinished: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + info: +--- !u!1 &409590975 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 409590976} + - component: {fileID: 409590978} + - component: {fileID: 409590977} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &409590976 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 409590975} + 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: 33825546} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!23 &409590977 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 409590975} + 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 &409590978 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 409590975} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &411383572 GameObject: m_ObjectHideFlags: 0 @@ -1304,8 +1744,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 423869583} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.7, z: 0} - m_LocalScale: {x: 1.78, y: 1.78, z: 1.78} + m_LocalPosition: {x: 0, y: 0.876, z: 0} + m_LocalScale: {x: 2.2408729, y: 2.2408736, z: 2.2408736} m_Children: [] m_Father: {fileID: 1933714481} m_RootOrder: 0 @@ -1941,6 +2381,77 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 565906440} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &575691238 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 575691239} + - component: {fileID: 575691241} + - component: {fileID: 575691240} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &575691239 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575691238} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_Children: [] + m_Father: {fileID: 1008043395} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &575691240 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575691238} + 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 &575691241 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575691238} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &617692218 Prefab: m_ObjectHideFlags: 0 @@ -2021,6 +2532,161 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &663412325 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 663412326} + - component: {fileID: 663412328} + - component: {fileID: 663412327} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &663412326 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 663412325} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0.172, y: 1.754, z: 0} + m_LocalScale: {x: 1.8760327, y: 1.8760332, z: 1.8760332} + m_Children: [] + m_Father: {fileID: 234989374} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!23 &663412327 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 663412325} + 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 &663412328 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 663412325} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &681228290 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 681228291} + - component: {fileID: 681228294} + - component: {fileID: 681228293} + - component: {fileID: 681228292} + m_Layer: 8 + m_Name: Olaf_CC065053 (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &681228291 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 681228290} + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: -3.99, y: 0, z: -0.928} + m_LocalScale: {x: 0.8917304, y: 0.89172995, z: 0.8917304} + m_Children: [] + m_Father: {fileID: 1247992794} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!114 &681228292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 681228290} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 0 +--- !u!23 &681228293 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 681228290} + 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 &681228294 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 681228290} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &712882415 GameObject: m_ObjectHideFlags: 0 @@ -2758,7 +3424,7 @@ Transform: - {fileID: 952607034} - {fileID: 260126568} m_Father: {fileID: 338663765} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &917676531 MonoBehaviour: @@ -2776,6 +3442,78 @@ MonoBehaviour: length: 5 height: 3 isAnimated: 1 +--- !u!1 &947900026 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 947900027} + - component: {fileID: 947900028} + m_Layer: 8 + m_Name: Cloud-1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &947900027 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 947900026} + 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: 1164756622} + - {fileID: 1719420170} + m_Father: {fileID: 199010598} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &947900028 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 947900026} + 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: 00000000 + specificPositions: [] + roaming: 0.08 + fakeButton: {fileID: 0} + isStandbyLoop: 1 + standbyClip: {fileID: 11400000, guid: 9e519da1c7293b645b3c2bce2455acf6, type: 2} + triggerClips: + - {fileID: 11400000, guid: e6c4f6a38e1dfe04eaf0bb12757a7067, type: 2} + 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 &952607033 GameObject: m_ObjectHideFlags: 0 @@ -2905,6 +3643,78 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1000268178} +--- !u!1 &1008043394 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1008043395} + - component: {fileID: 1008043396} + m_Layer: 8 + m_Name: Elsa_Effect_A-1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1008043395 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1008043394} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.064, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1783570513} + - {fileID: 575691239} + m_Father: {fileID: 199010598} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1008043396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1008043394} + 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: 01000000 + specificPositions: [] + roaming: 0 + fakeButton: {fileID: 0} + isStandbyLoop: 1 + standbyClip: {fileID: 11400000, guid: c4b4ef67857577d4fb6e9761b359839a, type: 2} + triggerClips: + - {fileID: 11400000, guid: 9460e88d21c95ab4db234d30c9c7bec0, type: 2} + 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 &1035960133 GameObject: m_ObjectHideFlags: 0 @@ -2972,8 +3782,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1061158671} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.861, z: 0} - m_LocalScale: {x: 2.05, y: 2.05, z: 2.05} + m_LocalPosition: {x: 0, y: 1.116, z: 0} + m_LocalScale: {x: 2.865287, y: 2.8652864, z: 2.8652864} m_Children: [] m_Father: {fileID: 1690794385} m_RootOrder: 0 @@ -3084,6 +3894,77 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1164756621 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1164756622} + - component: {fileID: 1164756624} + - component: {fileID: 1164756623} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1164756622 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1164756621} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.172, y: 1.754, z: 0} + m_LocalScale: {x: 1.8760327, y: 1.8760332, z: 1.8760332} + m_Children: [] + m_Father: {fileID: 947900027} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1164756623 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1164756621} + 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 &1164756624 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1164756621} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1167120022 GameObject: m_ObjectHideFlags: 0 @@ -3152,8 +4033,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1191975162} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.173, y: 0.44500005, z: 2.49} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalPosition: {x: -3.57, y: 0, z: 2.49} + m_LocalScale: {x: 0.891734, y: 0.891734, z: 0.891734} m_Children: [] m_Father: {fileID: 1247992794} m_RootOrder: 0 @@ -3260,6 +4141,12 @@ MonoBehaviour: - 20180514_Frozen_SE_MovingEFX_5.aif - 20180514_Frozen_SE_MovingEFX_6.aif volumeScale: 1 + onPlayFinished: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + info: --- !u!1 &1212194686 GameObject: m_ObjectHideFlags: 0 @@ -3303,6 +4190,12 @@ MonoBehaviour: folder: FrozenMaterial\sound\sfx filenames: [] volumeScale: 1 + onPlayFinished: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + info: --- !u!1 &1216863871 GameObject: m_ObjectHideFlags: 0 @@ -3327,13 +4220,13 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1216863871} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.32, y: 0, z: 2.49} + m_LocalPosition: {x: 1.318, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1329758487} - {fileID: 768391777} m_Father: {fileID: 199010598} - m_RootOrder: 8 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1216863874 MonoBehaviour: @@ -3388,7 +4281,7 @@ GameObject: - component: {fileID: 1225287932} - component: {fileID: 1225287935} m_Layer: 8 - m_Name: Elsa_Effect_B + m_Name: Elsa_Effect_B-0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3407,7 +4300,7 @@ Transform: - {fileID: 2008324329} - {fileID: 1674052467} m_Father: {fileID: 199010598} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1225287935 MonoBehaviour: @@ -3424,7 +4317,7 @@ MonoBehaviour: videoStopTime: 0.5 disappearTime: 0.5 area: 0 - appearAreas: 0000000001000000 + appearAreas: 00000000 specificPositions: [] roaming: 0 fakeButton: {fileID: 0} @@ -3545,6 +4438,8 @@ Transform: - {fileID: 1191975163} - {fileID: 40068779} - {fileID: 1718259913} + - {fileID: 681228291} + - {fileID: 66098175} m_Father: {fileID: 199010598} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3721,8 +4616,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1329758486} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.8, z: 0} - m_LocalScale: {x: 3.67, y: 3.67, z: 3.67} + m_LocalPosition: {x: 0, y: 2.124, z: 0} + m_LocalScale: {x: 4.523005, y: 4.5230064, z: 4.5230064} m_Children: [] m_Father: {fileID: 1216863872} m_RootOrder: 0 @@ -3811,6 +4706,12 @@ MonoBehaviour: folder: FrozenMaterial\sound\sfx filenames: [] volumeScale: 0.5 + onPlayFinished: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + info: --- !u!1 &1355871871 GameObject: m_ObjectHideFlags: 0 @@ -3835,7 +4736,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1355871871} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalPosition: {x: 0, y: 0.8, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] m_Father: {fileID: 1906326617} @@ -3912,6 +4813,12 @@ MonoBehaviour: folder: FrozenMaterial\sound\sfx filenames: [] volumeScale: 1 + onPlayFinished: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + info: --- !u!4 &1373766508 Transform: m_ObjectHideFlags: 0 @@ -3995,7 +4902,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 2019943191} + m_Mesh: {fileID: 93797640} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -4050,31 +4957,80 @@ GameObject: - component: {fileID: 1443956513} - component: {fileID: 1443956514} m_Layer: 0 - m_Name: 20180514_Frozen_SE_Character_SnowBall_Only.aif + m_Name: 20180514_Frozen_SE_Character_SnowBall_Only.aif + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1443956513 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1443956512} + 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: 1533221622} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1443956514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1443956512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26d6a1cf0552ab1458d813e2e57089f8, type: 3} + m_Name: + m_EditorClassIdentifier: + folder: FrozenMaterial\sound\sfx\20180514_Frozen_SFX_Character_Stem + filenames: [] + volumeScale: 1 + onPlayFinished: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + info: +--- !u!1 &1447401797 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1447401798} + - component: {fileID: 1447401799} + m_Layer: 0 + m_Name: 20180514_Frozen_SE_Character_Olaf.aif m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1443956513 +--- !u!4 &1447401798 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1443956512} + m_GameObject: {fileID: 1447401797} 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: 1533221622} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1443956514 +--- !u!114 &1447401799 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1443956512} + m_GameObject: {fileID: 1447401797} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 26d6a1cf0552ab1458d813e2e57089f8, type: 3} @@ -4083,49 +5039,55 @@ MonoBehaviour: folder: FrozenMaterial\sound\sfx\20180514_Frozen_SFX_Character_Stem filenames: [] volumeScale: 1 ---- !u!1 &1447401797 + onPlayFinished: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + info: +--- !u!1 &1448496800 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1447401798} - - component: {fileID: 1447401799} + - component: {fileID: 1448496801} + - component: {fileID: 1448496802} m_Layer: 0 - m_Name: 20180514_Frozen_SE_Character_Olaf.aif + m_Name: Ruler m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1447401798 +--- !u!4 &1448496801 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1447401797} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1448496800} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.2, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1533221622} - m_RootOrder: 1 + m_Father: {fileID: 338663765} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1447401799 +--- !u!114 &1448496802 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1447401797} + m_GameObject: {fileID: 1448496800} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 26d6a1cf0552ab1458d813e2e57089f8, type: 3} + m_Script: {fileID: 11500000, guid: 27e1128700aaadd4fae0b90f94e59b3f, type: 3} m_Name: m_EditorClassIdentifier: - folder: FrozenMaterial\sound\sfx\20180514_Frozen_SFX_Character_Stem - filenames: [] - volumeScale: 1 + width: 8 + length: 5 + height: 0.65 --- !u!1 &1451842896 GameObject: m_ObjectHideFlags: 0 @@ -4246,8 +5208,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1561705233} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.45, z: 0} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalPosition: {x: 0, y: 0.559, z: 0} + m_LocalScale: {x: 0.891734, y: 0.891734, z: 0.891734} m_Children: [] m_Father: {fileID: 1906326617} m_RootOrder: 0 @@ -4407,6 +5369,94 @@ MonoBehaviour: folder: FrozenMaterial\sound\bgm filenames: [] volumeScale: 1 + onPlayFinished: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2084936103} + m_MethodName: GoStandby + 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 + info: +--- !u!1 &1686473286 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1686473287} + - component: {fileID: 1686473289} + - component: {fileID: 1686473288} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1686473287 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1686473286} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_Children: [] + m_Father: {fileID: 33825546} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1686473288 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1686473286} + 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 &1686473289 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1686473286} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1690794384 GameObject: m_ObjectHideFlags: 0 @@ -4431,7 +5481,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1690794384} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.955, y: 0, z: 2.49} + m_LocalPosition: {x: 2.862, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1061158672} @@ -4486,62 +5536,204 @@ 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 &1718259912 + 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 &1718259912 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1718259913} + - component: {fileID: 1718259916} + - component: {fileID: 1718259915} + - component: {fileID: 1718259914} + m_Layer: 8 + m_Name: Olaf_CC065053 (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1718259913 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1718259912} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -3.99, y: 0, z: 1.03} + m_LocalScale: {x: 0.891734, y: 0.891734, z: 0.891734} + m_Children: [] + m_Father: {fileID: 1247992794} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!114 &1718259914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1718259912} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 0 +--- !u!23 &1718259915 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1718259912} + 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 &1718259916 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1718259912} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1719420169 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1719420170} + - component: {fileID: 1719420172} + - component: {fileID: 1719420171} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1719420170 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1719420169} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_Children: [] + m_Father: {fileID: 947900027} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1719420171 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1719420169} + 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 &1719420172 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1719420169} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1722222726 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1718259913} - - component: {fileID: 1718259916} - - component: {fileID: 1718259915} - - component: {fileID: 1718259914} + - component: {fileID: 1722222727} + - component: {fileID: 1722222729} + - component: {fileID: 1722222728} m_Layer: 8 - m_Name: Olaf_CC065053 (3) + m_Name: standby m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1718259913 +--- !u!4 &1722222727 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1718259912} - m_LocalRotation: {x: -0, y: -0.7071068, z: 0, w: -0.7071068} - m_LocalPosition: {x: 3.99, y: 0.44900006, z: -1.14} - m_LocalScale: {x: 0.7500005, y: 0.75, z: 0.7500005} + m_GameObject: {fileID: 1722222726} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] - m_Father: {fileID: 1247992794} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: -270, z: 0} ---- !u!114 &1718259914 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1718259912} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 0 ---- !u!23 &1718259915 + m_Father: {fileID: 234989374} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1722222728 MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1718259912} + m_GameObject: {fileID: 1722222726} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -4550,7 +5742,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_Materials: - - {fileID: 2100000, guid: 8ba933f3f4401b34ead3e5f188561901, type: 2} + - {fileID: 2100000, guid: 482d068533c073147b880ef1a3cbbbdc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4570,12 +5762,12 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &1718259916 +--- !u!33 &1722222729 MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1718259912} + m_GameObject: {fileID: 1722222726} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1765914293 GameObject: @@ -4752,6 +5944,77 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1774693141} +--- !u!1 &1783570512 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1783570513} + - component: {fileID: 1783570515} + - component: {fileID: 1783570514} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1783570513 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1783570512} + 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: 1008043395} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!23 &1783570514 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1783570512} + 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 &1783570515 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1783570512} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1817143146 GameObject: m_ObjectHideFlags: 0 @@ -5028,8 +6291,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1858061292} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.861, z: 0} - m_LocalScale: {x: 2.05, y: 2.05, z: 2.05} + m_LocalPosition: {x: 0, y: 1.116, z: 0} + m_LocalScale: {x: 2.865287, y: 2.8652864, z: 2.8652864} m_Children: [] m_Father: {fileID: 1690794385} m_RootOrder: 1 @@ -5172,7 +6435,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 199010598} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1906326616 GameObject: @@ -5197,7 +6460,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1906326616} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.17, y: 0, z: 2.49} + m_LocalPosition: {x: -0.957, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1561705234} @@ -5222,8 +6485,11 @@ MonoBehaviour: area: 0 appearAreas: specificPositions: - - {fileID: 40068780} - {fileID: 1191975164} + - {fileID: 40068780} + - {fileID: 1718259914} + - {fileID: 681228292} + - {fileID: 66098176} roaming: 0 fakeButton: {fileID: 0} isStandbyLoop: 1 @@ -5325,7 +6591,7 @@ GameObject: - component: {fileID: 1925824386} - component: {fileID: 1925824387} m_Layer: 0 - m_Name: 20180514_Frozen_BGM_Day.aif + m_Name: 20180523_Frozen_Day_Fix1.aif m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5358,6 +6624,23 @@ MonoBehaviour: folder: FrozenMaterial\sound\bgm filenames: [] volumeScale: 1 + onPlayFinished: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2084936103} + m_MethodName: GoNight + 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 + info: --- !u!1 &1930102124 GameObject: m_ObjectHideFlags: 0 @@ -5412,7 +6695,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1933714480} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.79, y: 0, z: 2.49} + m_LocalPosition: {x: -2.562, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 423869584} @@ -5498,13 +6781,13 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1973785471} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.075, y: 0, z: 2.49} + m_LocalPosition: {x: -0.301, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 351311319} - {fileID: 47501850} m_Father: {fileID: 199010598} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1973785474 MonoBehaviour: @@ -5570,7 +6853,7 @@ GameObject: - component: {fileID: 1984882816} - component: {fileID: 1984882819} m_Layer: 8 - m_Name: Elsa_Effect_A + m_Name: Elsa_Effect_A-0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5589,7 +6872,7 @@ Transform: - {fileID: 565906441} - {fileID: 436028453} m_Father: {fileID: 199010598} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1984882819 MonoBehaviour: @@ -5606,7 +6889,7 @@ MonoBehaviour: videoStopTime: 0.5 disappearTime: 0.5 area: 0 - appearAreas: 0000000001000000 + appearAreas: 00000000 specificPositions: [] roaming: 0 fakeButton: {fileID: 0} @@ -5703,136 +6986,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2008324328} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!43 &2019943191 -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 &2024329733 GameObject: m_ObjectHideFlags: 0 @@ -5976,12 +7129,6 @@ MonoBehaviour: nightKinectAmount: 30 particleViewer: {fileID: 1035960135} dayParticleRate: 0.1 - dayCharacters: - - {fileID: 459917737} - nightCharacters: - - {fileID: 1216863874} - - {fileID: 1225287935} - - {fileID: 1984882819} onSceneStandby: m_PersistentCalls: m_Calls: @@ -6101,8 +7248,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2086317000} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.7, z: 0} - m_LocalScale: {x: 1.78, y: 1.78, z: 1.78} + m_LocalPosition: {x: 0, y: 0.876, z: 0} + m_LocalScale: {x: 2.2408729, y: 2.2408736, z: 2.2408736} m_Children: [] m_Father: {fileID: 1933714481} m_RootOrder: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat index d4cdceb..9f8f3b3 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat @@ -81,7 +81,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Size: 0.019999985 + - _Size: 0.010056514 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 - _SoftParticlesFarFadeDistance: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat index acc56b1..ab10d50 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat @@ -70,7 +70,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rate: 0 + - _Rate: 1 - _SmoothnessTextureChannel: 0 - _SpaceRate: 0 - _SpecularHighlights: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs index d6b9e9a..796ed44 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs @@ -61,7 +61,7 @@ namespace UltraCombos.Frozen Coroutine flow = null; bool is_alive = false; - const float alive_threshold = 1.0f / 255.0f; + const float alive_threshold = 0.5f / 255.0f; float alive_value = 0.0f; [SerializeField, Header("Debug")] @@ -277,6 +277,11 @@ namespace UltraCombos.Frozen yield return new WaitForSeconds(disappearTime); } + while (renderers[(int)Status.TRIGGER].material.color.a > 0.5f / 255.0f) + { + yield return null; + } + flow = null; yield return null; } diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/Ruler.cs b/Unity_2018_Frozen/Assets/Frozen/Script/Ruler.cs new file mode 100644 index 0000000..393c92a --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Script/Ruler.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace UltraCombos.Frozen +{ + public class Ruler : MonoBehaviour + { + public float width = 8.0f; + public float length = 5.0f; + public float height = 1.5f; + + private void OnDrawGizmos() + { + var mat = Gizmos.matrix; + + Gizmos.matrix = transform.localToWorldMatrix; + Vector3 size = new Vector3(width, height, length); + Vector3 center = new Vector3(0, height * 0.5f, 0); + Gizmos.DrawWireCube(center, size); + + Gizmos.matrix = mat; + } + } +} + + diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/Ruler.cs.meta b/Unity_2018_Frozen/Assets/Frozen/Script/Ruler.cs.meta new file mode 100644 index 0000000..d61f106 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Script/Ruler.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 27e1128700aaadd4fae0b90f94e59b3f +timeCreated: 1527144499 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs index 8805c02..e1e4553 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs @@ -46,13 +46,6 @@ namespace UltraCombos.Frozen float dayParticleRate = 1.0f; List characters; - - [SerializeField] - List dayCharacters = new List(); - - [SerializeField] - List nightCharacters = new List(); - float target_rate = 0.0f; @@ -88,8 +81,7 @@ namespace UltraCombos.Frozen target_rate = 0.0f; if (Input.GetKeyDown(KeyCode.PageDown)) { - state = State.Day; - onSceneDay.Invoke(); + GoDay(); } } else if (state == State.Day) @@ -97,13 +89,11 @@ namespace UltraCombos.Frozen target_rate = 0.0f; if (Input.GetKeyDown(KeyCode.PageUp)) { - state = State.Standby; - onSceneStandby.Invoke(); + GoStandby(); } else if (Input.GetKeyDown(KeyCode.PageDown)) { - state = State.Night; - onSceneNight.Invoke(); + GoNight(); } } else if (state == State.Night) @@ -111,13 +101,11 @@ namespace UltraCombos.Frozen target_rate = 1.0f; if (Input.GetKeyDown(KeyCode.PageUp)) { - state = State.Standby; - onSceneStandby.Invoke(); + GoStandby(); } else if (Input.GetKeyDown(KeyCode.PageDown)) { - state = State.Day; - onSceneDay.Invoke(); + GoStandby(); } } @@ -133,23 +121,31 @@ namespace UltraCombos.Frozen kinect.kinectAmount = Mathf.Lerp(1.0f, nightKinectAmount, rate); particleViewer.VertexCount = (int)(Mathf.Lerp(dayParticleRate, 1.0f, rate) * particleViewer.buffer.count); -#if false - foreach (var chr in dayCharacters) - { - chr.gameObject.SetActive(rate < 0.5); - } - - foreach (var chr in nightCharacters) - { - chr.gameObject.SetActive(rate > 0.5); - } -#else foreach (var chr in characters) { chr.Active = chr.appearSataes.Contains(state); } -#endif } + + public void GoStandby() + { + state = State.Standby; + onSceneStandby.Invoke(); + } + + public void GoDay() + { + state = State.Day; + onSceneDay.Invoke(); + } + + public void GoNight() + { + state = State.Night; + onSceneNight.Invoke(); + } + + } } diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SoundLoader.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SoundLoader.cs index c9838e7..9c23d3e 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SoundLoader.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SoundLoader.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Events; using UnityEngine.Networking; namespace UltraCombos @@ -22,6 +23,11 @@ namespace UltraCombos float target_volume = 1.0f; + public UnityEvent onPlayFinished = new UnityEvent(); + + [Header("Debug")] + public string info; + private void Start() { if (filenames.Count == 0) @@ -71,6 +77,16 @@ namespace UltraCombos private void Update() { source.volume = Mathf.Lerp(source.volume, target_volume * volumeScale, Time.deltaTime); + + if (source.isPlaying && target_volume > 0.5f && source.clip != null) + { + info = $"{source.time:F1}/{source.clip.length:F1}"; + if (source.clip.length - source.time < 1.0f) + { + onPlayFinished.Invoke(); + info = "play finished"; + } + } } public void PlayOneShot() diff --git a/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitTexture.shader b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitTexture.shader new file mode 100644 index 0000000..6cec0d0 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitTexture.shader @@ -0,0 +1,62 @@ +Shader "UltraCombos/Frozen/Unlit/Texture" +{ + Properties + { + _MainTex ("Base (RGB) Trans (A)", 2D) = "white" {} + _Color("Color",Color) = (1,1,1,1) + [Toggle] _isGamma("is Gamma", Float) = 0 + } + SubShader + { + //Tags { "RenderType"="Opaque" } + Tags{ "Queue" = "Transparent" "RenderType" = "Transparent" "IgnoreProjector" = "True" } + LOD 100 + ZWrite Off + Cull off + Blend SrcAlpha OneMinusSrcAlpha + //Blend One OneMinusSrcAlpha + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + float4 _Color; + float _Rate; + float _isGamma; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + fixed4 frag_color = tex2D(_MainTex, i.uv); + frag_color.rgb = lerp(frag_color.rgb, GammaToLinearSpace(frag_color.rgb), _isGamma); + return frag_color * _Color; + } + ENDCG + } + } +} diff --git a/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitTexture.shader.meta b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitTexture.shader.meta new file mode 100644 index 0000000..90bc58c --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitTexture.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 317e6889645762b4da7eb5dad5c3b8c4 +timeCreated: 1525078203 +licenseType: Free +ShaderImporter: + externalObjects: {} + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png index d656af7..a20291a 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f0666c1c66f75d978e56b7eadaddde39f1bc3a5a7f08e307539296e55547324 -size 1037417 +oid sha256:53d64c7c8fe811e083c40cec9ac84dded8460151df583b86a0127ab9ac2eddcd +size 321987 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png index 838f673..4a171ee 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:ef44675520992d7f79105d3abad601a9807205bb9a07337c9ef4c5299e72fe7f -size 817464 +oid sha256:e90ddd6acf38a4835fbb853c37f89bb030c43a1e8e05498f6fc6da73cda03b13 +size 285060 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.mat index 01875fd..da2b7be 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.mat @@ -7,7 +7,7 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Cloud_Snow - m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} + m_Shader: {fileID: 4800000, guid: 317e6889645762b4da7eb5dad5c3b8c4, type: 3} m_ShaderKeywords: _ALPHATEST_ON m_LightmapFlags: 0 m_EnableInstancingVariants: 0 @@ -88,6 +88,7 @@ Material: - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 + - _isGamma: 0 m_Colors: - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1}