From 644ea8406eac2ed9db3fd103c435cbde9d89c402 Mon Sep 17 00:00:00 2001 From: uc deploy Date: Mon, 2 Dec 2019 00:27:02 +0800 Subject: [PATCH] [IceSlide] add hit collider & hit play animation --- .../Frozen/Animator/Snowflake.controller | 219 ++++- .../Frozen/Animator/SnowflakeLogo.controller | 241 ++++- .../Assets/Frozen/DsAssets/BG.asset | 2 +- .../Assets/Frozen/DsAssets/DisnyLogo.anim | 2 +- .../Assets/Frozen/DsAssets/DisnyLogo.asset | 2 +- .../Assets/Frozen/DsAssets/Fade.anim | 368 ++++++++ .../Assets/Frozen/DsAssets/Fade.anim.meta | 8 + .../Frozen/DsAssets/Snowflake_Shatter.asset | 2 +- .../Frozen/DsAssets/Snowflake_Spawn.asset | 2 +- .../Assets/Frozen/DsAssets/none.anim | 116 +++ .../Assets/Frozen/DsAssets/none.anim.meta | 8 + .../Assets/Frozen/Prefab.meta | 8 + .../Assets/Frozen/Prefab/Pointer.prefab | 74 ++ .../Assets/Frozen/Prefab/Pointer.prefab.meta | 7 + .../RenderTexture/SceneRender.renderTexture | 2 +- .../Assets/{ => Scenes}/Main_IceSlide.unity | 890 +++++++++++++++--- .../{ => Scenes}/Main_IceSlide.unity.meta | 0 .../Assets/Script/FlakeCollider.cs | 27 + .../Assets/Script/FlakeCollider.cs.meta | 11 + .../Assets/Script/SnowFlake.cs | 64 ++ .../Assets/Script/SnowFlake.cs.meta | 11 + .../Assets/Script/SnowFlakeBehaviour.cs | 68 ++ .../Assets/Script/SnowFlakeBehaviour.cs.meta | 11 + .../Assets/Script/SnowFlakeLogo.cs | 66 ++ .../Assets/Script/SnowFlakeLogo.cs.meta | 11 + .../19050-04-IceSlide/Packages/manifest.json | 12 +- .../ProjectSettings/EditorBuildSettings.asset | 5 +- .../ProjectSettings/GraphicsSettings.asset | 3 + .../ProjectSettings/ProjectSettings.asset | 8 +- .../UnityConnectSettings.asset | 2 +- .../19050-04-IceSlide/settings-core.json | 6 + .../19050-04-IceSlide/settings-default.json | 17 + 32 files changed, 2111 insertions(+), 162 deletions(-) create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Fade.anim create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Fade.anim.meta create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/none.anim create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/none.anim.meta create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab.meta create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab/Pointer.prefab create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab/Pointer.prefab.meta rename 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/{ => Scenes}/Main_IceSlide.unity (65%) rename 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/{ => Scenes}/Main_IceSlide.unity.meta (100%) create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/FlakeCollider.cs create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/FlakeCollider.cs.meta create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlake.cs create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlake.cs.meta create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeBehaviour.cs create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeBehaviour.cs.meta create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeLogo.cs create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeLogo.cs.meta create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/settings-core.json create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/settings-default.json diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Animator/Snowflake.controller b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Animator/Snowflake.controller index 80b8f4f..6c820d2 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Animator/Snowflake.controller +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Animator/Snowflake.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6987617158148279263 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-5879950363583209725 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -7,7 +33,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Trigger + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -5204081279454011557} m_Solo: 0 @@ -16,8 +45,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -33,7 +62,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 4505030418162680149} + - {fileID: 5041038100452909468} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -76,6 +105,42 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-3600396373806442271 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5204081279454011557} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1109 &-201566521510837886 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5204081279454011557} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -84,7 +149,25 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Snowflake serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Trigger + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Reset + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Play + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -109,28 +192,64 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -3980762192105778586} - m_Position: {x: 170, y: 260, z: 0} + m_Position: {x: 170, y: 210, z: 0} - serializedVersion: 1 m_State: {fileID: -5204081279454011557} - m_Position: {x: 170, y: 360, z: 0} + m_Position: {x: 340, y: 350, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3987350832769993461} + m_Position: {x: 370, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8816863864533697857} + m_Position: {x: 570, y: 220, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} + m_AnyStatePosition: {x: 350, y: 40, z: 0} + m_EntryPosition: {x: -20, y: 150, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -3980762192105778586} ---- !u!1101 &4505030418162680149 + m_DefaultState: {fileID: 3987350832769993461} +--- !u!1102 &3987350832769993461 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: None + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4249131332736028388} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &4249131332736028388 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Play + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -3980762192105778586} m_Solo: 0 @@ -139,9 +258,83 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 1 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5041038100452909468 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8816863864533697857} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6603467614905665573 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Reset + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3987350832769993461} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &8816863864533697857 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: End + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6603467614905665573} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Animator/SnowflakeLogo.controller b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Animator/SnowflakeLogo.controller index bfd388b..02031cc 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Animator/SnowflakeLogo.controller +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Animator/SnowflakeLogo.controller @@ -16,12 +16,103 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 1 + m_ExitTime: 0 m_HasExitTime: 1 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-6705035363604078553 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Reset + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6037234620738982063} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6550312911288728725 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Play + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3980762192105778586} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-6037234620738982063 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: None + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6550312911288728725} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 3a75f2e41ef460a4bbe125f475189c6f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1109 &-5821368704970203615 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6037234620738982063} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 --- !u!1102 &-5204081279454011557 AnimatorState: serializedVersion: 5 @@ -49,6 +140,33 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-4588146847235415795 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: End + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6705035363604078553} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 3a75f2e41ef460a4bbe125f475189c6f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-3980762192105778586 AnimatorState: serializedVersion: 5 @@ -76,6 +194,58 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-2464922853304049875 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Fade + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8210003385315906908} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 3132721c7f14cd34b9ea6bbac067753d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-763758129669139094 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Fade + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2464922853304049875} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -84,7 +254,31 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: SnowflakeLogo serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Trigger + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Reset + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Play + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Fade + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -105,7 +299,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Trigger + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -5204081279454011557} m_Solo: 0 @@ -114,9 +311,9 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 @@ -137,18 +334,28 @@ AnimatorStateMachine: m_Position: {x: 220, y: 470, z: 0} - serializedVersion: 1 m_State: {fileID: 8659196853530348169} - m_Position: {x: 610, y: 280, z: 0} + m_Position: {x: 440, y: 380, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6037234620738982063} + m_Position: {x: 390, y: 90, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4588146847235415795} + m_Position: {x: 580, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2464922853304049875} + m_Position: {x: 540, y: 260, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] - m_EntryTransitions: [] + m_EntryTransitions: + - {fileID: -5821368704970203615} m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} + m_AnyStatePosition: {x: 390, y: -30, z: 0} + m_EntryPosition: {x: 40, y: 40, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -3980762192105778586} ---- !u!1101 &8184535706000821265 + m_DefaultState: {fileID: -6037234620738982063} +--- !u!1101 &8210003385315906908 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -157,16 +364,16 @@ AnimatorStateTransition: m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -3980762192105778586} + m_DstState: {fileID: -4588146847235415795} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 1 + m_ExitTime: 0 m_HasExitTime: 1 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 @@ -181,7 +388,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 8184535706000821265} + - {fileID: -763758129669139094} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset index 71eb2d0..16dc05f 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: BG m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ..\..\Build-19050-Frozen2-04-IceSlide\slide_bg_loop.avi + m_VideoPath: ..\..\..\..\_Deploy_PC\04_IceSlide\UnityBuild-19050-04_IceSlide\Material\slide_bg_loop.avi animationClip: {fileID: 0} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/DisnyLogo.anim b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/DisnyLogo.anim index 505355c..108e2fe 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/DisnyLogo.anim +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/DisnyLogo.anim @@ -54,7 +54,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/DisnyLogo.asset b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/DisnyLogo.asset index 7c23537..2420fbb 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/DisnyLogo.asset +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/DisnyLogo.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: DisnyLogo m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ..\..\Build-19050-Frozen2-04-IceSlide\SHD_logo_reveal.avi + m_VideoPath: ..\..\..\..\_Deploy_PC\04_IceSlide\UnityBuild-19050-04_IceSlide\Material\SHD_logo_reveal.avi animationClip: {fileID: 7400000, guid: 91be761ac10551049a286e73f4589914, type: 2} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Fade.anim b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Fade.anim new file mode 100644 index 0000000..964272f --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Fade.anim @@ -0,0 +1,368 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Fade + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3305885265 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2526845255 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Fade.anim.meta b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Fade.anim.meta new file mode 100644 index 0000000..81df6f2 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Fade.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3132721c7f14cd34b9ea6bbac067753d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.asset b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.asset index caced1a..bf81dce 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.asset +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: Snowflake_Shatter m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ..\..\Build-19050-Frozen2-04-IceSlide\snowflake3_shatter.avi + m_VideoPath: ..\..\..\..\_Deploy_PC\04_IceSlide\UnityBuild-19050-04_IceSlide\Material\snowflake3_shatter.avi animationClip: {fileID: 0} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset index f8aea07..a751b61 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: Snowflake_Spawn m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ..\..\Build-19050-Frozen2-04-IceSlide\snowflake3_spawn.avi + m_VideoPath: ..\..\..\..\_Deploy_PC\04_IceSlide\UnityBuild-19050-04_IceSlide\Material\snowflake3_spawn.avi animationClip: {fileID: 0} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/none.anim b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/none.anim new file mode 100644 index 0000000..2ba3750 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/none.anim @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: none + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 3305885265 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 114 + script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/none.anim.meta b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/none.anim.meta new file mode 100644 index 0000000..acc5a78 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/none.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a75f2e41ef460a4bbe125f475189c6f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab.meta b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab.meta new file mode 100644 index 0000000..2657832 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 72508506fe647c142b5c976780cfdb18 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab/Pointer.prefab b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab/Pointer.prefab new file mode 100644 index 0000000..0c7962f --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab/Pointer.prefab @@ -0,0 +1,74 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6242263673875986504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6242263673875986511} + - component: {fileID: 6242263673875986509} + - component: {fileID: 6242263673875986510} + m_Layer: 5 + m_Name: Pointer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6242263673875986511 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6242263673875986504} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6242263673875986509 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6242263673875986504} + m_CullTransparentMesh: 0 +--- !u!114 &6242263673875986510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6242263673875986504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Texture: {fileID: 10912, guid: 0000000000000000f000000000000000, type: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab/Pointer.prefab.meta b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab/Pointer.prefab.meta new file mode 100644 index 0000000..3bf0510 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/Prefab/Pointer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ca976de85e445764dacc83a380ccab4f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/RenderTexture/SceneRender.renderTexture b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/RenderTexture/SceneRender.renderTexture index 2f1d314..4ca3faa 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/RenderTexture/SceneRender.renderTexture +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/RenderTexture/SceneRender.renderTexture @@ -14,7 +14,7 @@ RenderTexture: m_DownscaleFallback: 0 serializedVersion: 3 m_Width: 1920 - m_Height: 866 + m_Height: 886 m_AntiAliasing: 1 m_DepthFormat: 2 m_ColorFormat: 8 diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Main_IceSlide.unity b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlide.unity similarity index 65% rename from 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Main_IceSlide.unity rename to 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlide.unity index 143076f..39eb127 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Main_IceSlide.unity +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlide.unity @@ -120,6 +120,98 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &44682486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 44682487} + - component: {fileID: 44682490} + - component: {fileID: 44682489} + - component: {fileID: 44682488} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &44682487 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44682486} + 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: 748540200} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &44682488 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44682486} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ba98a688e35af7140b32c782ae1c9ad4, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &44682489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44682486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &44682490 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44682486} + m_CullTransparentMesh: 0 --- !u!1 &408817923 GameObject: m_ObjectHideFlags: 0 @@ -168,46 +260,6 @@ MonoBehaviour: PlayOnStart: 0 Looping: 0 AudioVolume: 1 ---- !u!28 &417982949 -Texture2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 2 - m_Width: 2 - m_Height: 2 - m_CompleteImageSize: 16 - m_TextureFormat: 5 - m_MipCount: 1 - m_IsReadable: 1 - m_StreamingMipmaps: 0 - m_StreamingMipmapsPriority: 0 - m_AlphaIsTransparency: 0 - m_ImageCount: 1 - m_TextureDimension: 2 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 0 - m_WrapV: 0 - m_WrapW: 0 - m_LightmapFormat: 0 - m_ColorSpace: 0 - image data: 16 - _typelessdata: 00000000000000000000000000000000 - m_StreamData: - offset: 0 - size: 0 - path: --- !u!1 &629481240 GameObject: m_ObjectHideFlags: 0 @@ -219,11 +271,12 @@ GameObject: - component: {fileID: 629481241} - component: {fileID: 629481243} - component: {fileID: 629481242} + - component: {fileID: 629481247} - component: {fileID: 629481245} - component: {fileID: 629481244} - component: {fileID: 629481246} m_Layer: 5 - m_Name: Snow + m_Name: SnowA m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -236,14 +289,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 629481240} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1934643411} - {fileID: 408817924} - m_Father: {fileID: 748540200} - m_RootOrder: 0 + m_Father: {fileID: 1443463233} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -264,13 +317,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 1235378534} + m_Texture: {fileID: 2084396464} m_UVRect: serializedVersion: 2 x: 0 @@ -342,6 +395,20 @@ MonoBehaviour: materials: [] attributeName: targetObject: {fileID: 629481240} +--- !u!114 &629481247 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629481240} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e1150dbb7b855047a150f003b073782, type: 3} + m_Name: + m_EditorClassIdentifier: + _animator: {fileID: 0} + _snowFlakeBehaviour: {fileID: 0} --- !u!1 &653645955 GameObject: m_ObjectHideFlags: 0 @@ -353,7 +420,6 @@ GameObject: - component: {fileID: 653645956} - component: {fileID: 653645959} - component: {fileID: 653645958} - - component: {fileID: 653645957} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -375,6 +441,7 @@ RectTransform: - {fileID: 2063636335} - {fileID: 1933408803} - {fileID: 1608519591} + - {fileID: 1708771037} m_Father: {fileID: 1482923423} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -383,23 +450,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &653645957 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 653645955} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!114 &653645958 MonoBehaviour: m_ObjectHideFlags: 0 @@ -564,8 +614,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 629481241} - - {fileID: 1320596369} + - {fileID: 1443463233} + - {fileID: 44682487} m_Father: {fileID: 963194228} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -634,6 +684,12 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!224 &928434860 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + m_PrefabInstance: {fileID: 6242263674701296355} + m_PrefabAsset: {fileID: 0} --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -773,6 +829,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: customRoi.height + value: 866 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} --- !u!1 &1087454110 @@ -823,46 +884,124 @@ MonoBehaviour: PlayOnStart: 0 Looping: 0 AudioVolume: 1 ---- !u!28 &1235378534 -Texture2D: +--- !u!1001 &1204356668 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 serializedVersion: 2 - m_Width: 2 - m_Height: 2 - m_CompleteImageSize: 16 - m_TextureFormat: 5 - m_MipCount: 1 - m_IsReadable: 1 - m_StreamingMipmaps: 0 - m_StreamingMipmapsPriority: 0 - m_AlphaIsTransparency: 0 - m_ImageCount: 1 - m_TextureDimension: 2 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 0 - m_WrapV: 0 - m_WrapW: 0 - m_LightmapFormat: 0 - m_ColorSpace: 0 - image data: 16 - _typelessdata: 00000000000000000000000000000000 - m_StreamData: - offset: 0 - size: 0 - path: + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1346705160736784, guid: 3b6314b889169c947a22038386ef4cb6, type: 3} + propertyPath: m_Name + value: AutoUIManager + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224152212506828798, guid: 3b6314b889169c947a22038386ef4cb6, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3b6314b889169c947a22038386ef4cb6, type: 3} --- !u!1 &1320596368 GameObject: m_ObjectHideFlags: 0 @@ -873,6 +1012,7 @@ GameObject: m_Component: - component: {fileID: 1320596369} - component: {fileID: 1320596374} + - component: {fileID: 1320596375} - component: {fileID: 1320596373} - component: {fileID: 1320596372} - component: {fileID: 1320596371} @@ -898,12 +1038,12 @@ RectTransform: - {fileID: 1087454111} - {fileID: 1880360066} - {fileID: 2008585841} - m_Father: {fileID: 748540200} - m_RootOrder: 1 + m_Father: {fileID: 1443463233} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -960, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1920, y: 888} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1320596370 @@ -978,13 +1118,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 417982949} + m_Texture: {fileID: 1549927504} m_UVRect: serializedVersion: 2 x: 0 @@ -999,16 +1139,244 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1320596368} m_CullTransparentMesh: 0 ---- !u!1 &1482923420 -GameObject: +--- !u!114 &1320596375 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: + m_GameObject: {fileID: 1320596368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e9567fb93286af408ec16a4175c3b66, type: 3} + m_Name: + m_EditorClassIdentifier: + _animator: {fileID: 0} + _snowFlakeBehaviour: {fileID: 0} + AppearTime: 2 + _appearTimer: 0 +--- !u!1 &1443463232 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1443463233} + - component: {fileID: 1443463235} + - component: {fileID: 1443463234} + m_Layer: 5 + m_Name: Flake + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1443463233 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1443463232} + 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: 1320596369} + - {fileID: 629481241} + - {fileID: 1466344660} + m_Father: {fileID: 748540200} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1443463234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1443463232} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 425ac01a4a7664a4086221c285060209, type: 3} + m_Name: + m_EditorClassIdentifier: + img: {fileID: 0} + MouseOnly: 0 + PointerEnter: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1443463235} + m_MethodName: Trigger + 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: TouchArea+OnPointerEnterEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + PointerDown: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TouchArea+OnPointerDownEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + PointerDrag: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TouchArea+OnPointerDragEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + RayHit: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TouchArea+OnRayHitEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + RayNoHit: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TouchArea+OnRayNoHitEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + PointerUp: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TouchArea+OnPointerUpEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + PointerClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TouchArea+OnPointerClickEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + PointerExit: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TouchArea+OnPointerExitEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null +--- !u!114 &1443463235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1443463232} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4069331576d416a4b83b9e447b41614e, type: 3} + m_Name: + m_EditorClassIdentifier: + Position: {x: 0, y: 0} + DisappearTime: 5 + DisappearTimeRandomRange: 2 + SnowFlakes: + - {fileID: 1320596375} + - {fileID: 629481247} + _currentFlake: {fileID: 0} +--- !u!1 &1466344659 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1466344660} + - component: {fileID: 1466344662} + - component: {fileID: 1466344663} + - component: {fileID: 1466344661} + m_Layer: 5 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1466344660 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1466344659} + 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: 1443463233} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 460, y: 0} + m_SizeDelta: {x: 400, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1466344661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1466344659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1466344662 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1466344659} + m_CullTransparentMesh: 0 +--- !u!114 &1466344663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1466344659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3095b15d84c61124a8428d9c9be983a6, type: 3} + m_Name: + m_EditorClassIdentifier: + Position: {x: 460, y: 0} + Size: {x: 400, y: 400} +--- !u!1 &1482923420 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: - component: {fileID: 1482923423} - component: {fileID: 1482923422} + - component: {fileID: 1482923421} m_Layer: 0 m_Name: SpoutCamera m_TagString: Untagged @@ -1016,6 +1384,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &1482923421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482923420} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45099d624c1e6c14e9514f4e5ea1ed9c, type: 3} + m_Name: + m_EditorClassIdentifier: + _clearAlpha: 1 --- !u!20 &1482923422 Camera: m_ObjectHideFlags: 0 @@ -1074,6 +1455,46 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!28 &1549927504 +Texture2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 2 + m_Width: 2 + m_Height: 2 + m_CompleteImageSize: 16 + m_TextureFormat: 5 + m_MipCount: 1 + m_IsReadable: 1 + m_StreamingMipmaps: 0 + m_StreamingMipmapsPriority: 0 + m_AlphaIsTransparency: 0 + m_ImageCount: 1 + m_TextureDimension: 2 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 + m_LightmapFormat: 0 + m_ColorSpace: 0 + image data: 16 + _typelessdata: 00000000000000000000000000000000 + m_StreamData: + offset: 0 + size: 0 + path: --- !u!1 &1608519590 GameObject: m_ObjectHideFlags: 0 @@ -1181,6 +1602,81 @@ MonoBehaviour: PlayOnStart: 1 Looping: 1 AudioVolume: 1 +--- !u!1 &1708771036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1708771037} + - component: {fileID: 1708771039} + - component: {fileID: 1708771040} + - component: {fileID: 1708771038} + m_Layer: 5 + m_Name: Pointer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1708771037 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1708771036} + 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: 928434860} + m_Father: {fileID: 653645956} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1708771038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1708771036} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 138af418b9d93eb4e87681c81d4e6d56, type: 3} + m_Name: + m_EditorClassIdentifier: + PointPrefab: {fileID: 6242263673875986504, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + camera: {fileID: 1482923422} + Visible: 1 +--- !u!222 &1708771039 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1708771036} + m_CullTransparentMesh: 0 +--- !u!225 &1708771040 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1708771036} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1880360065 GameObject: m_ObjectHideFlags: 0 @@ -1264,7 +1760,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1920, y: 866} + m_SizeDelta: {x: 1920, y: 886} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1933408804 MonoBehaviour: @@ -1395,7 +1891,7 @@ MonoBehaviour: VideoAsset: {fileID: 11400000, guid: 0b780110d61e15b408a1a28f31cee71e, type: 2} LoadOnAwake: 1 PlayOnStart: 0 - Looping: 1 + Looping: 0 AudioVolume: 1 --- !u!1 &2063636334 GameObject: @@ -1469,3 +1965,167 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2063636334} m_CullTransparentMesh: 0 +--- !u!28 &2084396464 +Texture2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 2 + m_Width: 2 + m_Height: 2 + m_CompleteImageSize: 16 + m_TextureFormat: 5 + m_MipCount: 1 + m_IsReadable: 1 + m_StreamingMipmaps: 0 + m_StreamingMipmapsPriority: 0 + m_AlphaIsTransparency: 0 + m_ImageCount: 1 + m_TextureDimension: 2 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 + m_LightmapFormat: 0 + m_ColorSpace: 0 + image data: 16 + _typelessdata: 00000000000000000000000000000000 + m_StreamData: + offset: 0 + size: 0 + path: +--- !u!1001 &6242263674701296355 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1708771037} + m_Modifications: + - target: {fileID: 6242263673875986504, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_Name + value: RawImage + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986504, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6242263673875986511, guid: ca976de85e445764dacc83a380ccab4f, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ca976de85e445764dacc83a380ccab4f, type: 3} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Main_IceSlide.unity.meta b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlide.unity.meta similarity index 100% rename from 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Main_IceSlide.unity.meta rename to 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlide.unity.meta diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/FlakeCollider.cs b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/FlakeCollider.cs new file mode 100644 index 0000000..59f6437 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/FlakeCollider.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(RectTransform))] +public class FlakeCollider : MonoBehaviour +{ + [AutoUI] + public Vector2 Position = new Vector2(460,0); + [AutoUI] + public Vector2 Size = new Vector2(400,400); + + private RectTransform rectTransform; + + // Start is called before the first frame update + void Start() + { + rectTransform = GetComponent(); + } + + // Update is called once per frame + void Update() + { + rectTransform.anchoredPosition = Position; + rectTransform.sizeDelta = Size; + } +} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/FlakeCollider.cs.meta b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/FlakeCollider.cs.meta new file mode 100644 index 0000000..2596651 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/FlakeCollider.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3095b15d84c61124a8428d9c9be983a6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlake.cs b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlake.cs new file mode 100644 index 0000000..d50f4f5 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlake.cs @@ -0,0 +1,64 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SnowFlake : MonoBehaviour +{ + + [SerializeField] protected Animator _animator; + public SnowFlakeBehaviour _snowFlakeBehaviour; + protected const string End = "End"; + + public bool IsPlay { get; private set; } + + protected void Awake() + { + _animator = GetComponent(); + } + + + // Update is called once per frame + protected void Update() + { + + if(IsPlay) + { + CheckPlayEnd(); + } + + } + + public virtual void CheckPlayEnd() + { + if (_animator.GetCurrentAnimatorStateInfo(0).IsName(End)) + { + Reset(); + } + } + + + + public virtual void Play() + { + _animator.SetTrigger("Play"); + _animator.SetBool("Play",true); + IsPlay = true; + } + + public virtual void Trigger() + { + if (_animator.GetCurrentAnimatorStateInfo(0).normalizedTime < 1) + return; + _animator.SetBool("Play", false); + _animator.SetTrigger("Trigger"); + } + + public virtual void Reset() + { + _animator.SetBool("Play", false); + _animator.SetTrigger("Reset"); + _snowFlakeBehaviour.ResetFlake(); + IsPlay = false; + } + +} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlake.cs.meta b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlake.cs.meta new file mode 100644 index 0000000..c53d1da --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlake.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6e1150dbb7b855047a150f003b073782 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeBehaviour.cs b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeBehaviour.cs new file mode 100644 index 0000000..840cc26 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeBehaviour.cs @@ -0,0 +1,68 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SnowFlakeBehaviour : MonoBehaviour +{ + + [AutoUI] + public Vector2 Position; + + [AutoUI] + public float DisappearTime = 5; + + [AutoUI] + public float DisappearTimeRandomRange = 2; + + public SnowFlake[] SnowFlakes; + + [SerializeField] private SnowFlake _currentFlake; + + // Start is called before the first frame update + void Start() + { + foreach(var flake in SnowFlakes) + { + flake._snowFlakeBehaviour = this; + } + Play(); + } + + // Update is called once per frame + void Update() + { + + } + + IEnumerator WaitToPlay() + { + + float waitTime = DisappearTime + Random.Range(-DisappearTimeRandomRange, DisappearTimeRandomRange) / 2.0f; + + waitTime = Mathf.Max(0, waitTime); + + Debug.Log(waitTime); + + yield return new WaitForSeconds(waitTime); + + Play(); + } + + public void Play() + { + _currentFlake = SnowFlakes[Random.Range(0, SnowFlakes.Length)]; + Debug.Log(_currentFlake.gameObject.name); + _currentFlake.Play(); + } + + public void Trigger() + { + _currentFlake.Trigger(); + } + + public void ResetFlake() + { + StartCoroutine(WaitToPlay()); + } + +} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeBehaviour.cs.meta b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeBehaviour.cs.meta new file mode 100644 index 0000000..20372e2 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeBehaviour.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4069331576d416a4b83b9e447b41614e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeLogo.cs b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeLogo.cs new file mode 100644 index 0000000..7cd985f --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeLogo.cs @@ -0,0 +1,66 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class SnowFlakeLogo : SnowFlake +{ + + [AutoUI] public float AppearTime = 3; + [SerializeField] private float _appearTimer; + + public const string DisnyLogo = "DisnyLogo"; + private RawImage _image; + + // Start is called before the first frame update + new void Awake() + { + base.Awake(); + _image = GetComponent(); + } + + // Update is called once per frame + new void Update() + { + base.Update(); + if (IsPlay) + CheckLogoTime(); + } + + void CheckLogoTime() + { + + var infoState = _animator.GetCurrentAnimatorStateInfo(0); + + if (infoState.normalizedTime < 1) + return; + + if(infoState.IsName(DisnyLogo)) + { + _appearTimer -= Time.deltaTime; + if(_appearTimer < 0) + { + _animator.SetTrigger("Fade"); + } + } + } + + public override void CheckPlayEnd() + { + if (_animator.GetCurrentAnimatorStateInfo(0).IsName(End)) + { + _image.enabled = false; + Reset(); + } + } + + + public override void Play() + { + base.Play(); + _appearTimer = AppearTime; + _image.color = Color.white; + _image.enabled = true; + } + +} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeLogo.cs.meta b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeLogo.cs.meta new file mode 100644 index 0000000..cb0d89d --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeLogo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5e9567fb93286af408ec16a4175c3b66 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Packages/manifest.json b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Packages/manifest.json index da14ea8..9c3991f 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Packages/manifest.json +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Packages/manifest.json @@ -1,9 +1,11 @@ { "dependencies": { - "com.ultracombos.movie-player": "file:C:/Users/user/Desktop/Develop-19050-Frozen2/_Package/com.ultracombos.movie-player", - "com.ultracombos.osc": "file:C:/Users/user/Desktop/Develop-19050-Frozen2/_Package/com.ultracombos.osc", - "com.ultracombos.tuio": "file:C:/Users/user/Desktop/Develop-19050-Frozen2/_Package/com.ultracombos.tuio", - "com.ultracombos.utility": "file:C:/Users/user/Desktop/Develop-19050-Frozen2/_Package/com.ultracombos.utility", + "com.newtonsoft.json": "file:/../../../../../_Package/com.newtonsoft.json", + "com.ultracombos.movie-player": "file:/../../../../../_Package/com.ultracombos.movie-player", + "com.ultracombos.osc": "file:/../../../../../_Package/com.ultracombos.osc", + "com.ultracombos.tuio": "file:/../../../../../_Package/com.ultracombos.tuio", + "com.ultracombos.ultra-control": "file:/../../../../../_Package/com.ultracombos.ultra-control", + "com.ultracombos.utility": "file:/../../../../../_Package/com.ultracombos.utility", "com.unity.ads": "2.0.8", "com.unity.analytics": "3.3.2", "com.unity.collab-proxy": "1.2.16", @@ -11,7 +13,7 @@ "com.unity.purchasing": "2.0.6", "com.unity.textmeshpro": "2.0.0", "com.unity.timeline": "1.0.0", - "jp.keijiro.klak.spout": "file:C:/Users/user/Desktop/Develop-19050-Frozen2/_Package/KlakSpout", + "jp.keijiro.klak.spout": "file:/../../../../../_Package/KlakSpout", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/EditorBuildSettings.asset b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/EditorBuildSettings.asset index 0147887..9f1960b 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/EditorBuildSettings.asset +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,8 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/Main_IceSlide.unity + guid: f057706f915f55841a75d9d17a77a4da m_configObjects: {} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/GraphicsSettings.asset b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/GraphicsSettings.asset index 74d7b53..f3874f6 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/GraphicsSettings.asset +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/GraphicsSettings.asset @@ -35,6 +35,9 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/ProjectSettings.asset b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/ProjectSettings.asset index 29c25f7..a456fce 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/ProjectSettings.asset +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany - productName: New Unity Project + productName: 19050-04-IceSlide defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -42,8 +42,8 @@ PlayerSettings: m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1024 - defaultScreenHeight: 768 + defaultScreenWidth: 1920 + defaultScreenHeight: 866 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 @@ -92,7 +92,7 @@ PlayerSettings: visibleInBackground: 1 allowFullscreenSwitch: 1 graphicsJobMode: 0 - fullscreenMode: 1 + fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/UnityConnectSettings.asset b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/UnityConnectSettings.asset index fa0b146..c3ae9a0 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/UnityConnectSettings.asset +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/settings-core.json b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/settings-core.json new file mode 100644 index 0000000..757bec4 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/settings-core.json @@ -0,0 +1,6 @@ +{ + "presets": [ + "default" + ], + "value": 0 +} \ No newline at end of file diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/settings-default.json b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/settings-default.json new file mode 100644 index 0000000..f3bd771 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/settings-default.json @@ -0,0 +1,17 @@ +{ + "SceneCamera/Canvas/Flake/Position": [ + 0.0, + 0.0 + ], + "SceneCamera/Canvas/Flake/DisappearTime": 5.0, + "SceneCamera/Canvas/Flake/DisappearTimeRandomRange": 2.0, + "SceneCamera/Canvas/Flake/SnowLogo/AppearTime": 5.0, + "SceneCamera/Canvas/Flake/Collider/Position": [ + 460.0, + 0.0 + ], + "SceneCamera/Canvas/Flake/Collider/Size": [ + 400.0, + 400.0 + ] +} \ No newline at end of file