[IcdeSlide] fixed animator lock image & move fade in code

6 years ago · 05a09087d4
parent 86198dac0d
commit 05a09087d4
6 changed files with 139 additions and 169 deletions
--- 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
@ -93,7 +93,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 3a75f2e41ef460a4bbe125f475189c6f, type: 2}
+  m_Motion: {fileID: 0}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
@ -161,7 +161,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 3a75f2e41ef460a4bbe125f475189c6f, type: 2}
+  m_Motion: {fileID: 0}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
@ -194,58 +194,6 @@ 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
@ -317,6 +265,31 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1101 &1690862369091875435
+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: -4588146847235415795}
+  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!1107 &2106951520893035423
 AnimatorStateMachine:
  serializedVersion: 5
@ -341,9 +314,6 @@ AnimatorStateMachine:
  - 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:
@ -355,28 +325,6 @@ AnimatorStateMachine:
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: -6037234620738982063}
--- !u!1101 &8210003385315906908
-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: -4588146847235415795}
-  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!1102 &8659196853530348169
 AnimatorState:
  serializedVersion: 5
@ -388,7 +336,7 @@ AnimatorState:
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
-  - {fileID: -763758129669139094}
+  - {fileID: 1690862369091875435}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
--- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim
+++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim
--- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim.meta
+++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim.meta
--- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlide.unity
+++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlide.unity
@ -323,7 +323,7 @@ MonoBehaviour:
      m_Calls: []
    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Texture: {fileID: 2084396464}
+  m_Texture: {fileID: 1161812158}
  m_UVRect:
    serializedVersion: 2
    x: 0
@ -836,6 +836,46 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3}
+--- !u!28 &1027624368
+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 &1087454110
 GameObject:
  m_ObjectHideFlags: 0
@ -884,6 +924,46 @@ MonoBehaviour:
  PlayOnStart: 0
  Looping: 0
  AudioVolume: 1
+--- !u!28 &1161812158
+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 &1204356668
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1012,8 +1092,8 @@ GameObject:
  m_Component:
  - component: {fileID: 1320596369}
  - component: {fileID: 1320596374}
-  - component: {fileID: 1320596375}
  - component: {fileID: 1320596373}
+  - component: {fileID: 1320596375}
  - component: {fileID: 1320596372}
  - component: {fileID: 1320596371}
  - component: {fileID: 1320596370}
@ -1118,13 +1198,13 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 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: 1549927504}
+  m_Texture: {fileID: 1027624368}
  m_UVRect:
    serializedVersion: 2
    x: 0
@ -1455,46 +1535,6 @@ 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
@ -1965,46 +2005,6 @@ 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
--- 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
@ -38,9 +38,9 @@ public class SnowFlakeLogo : SnowFlake
        if(infoState.IsName(DisnyLogo))
        {
            _appearTimer -= Time.deltaTime;
-            if(_appearTimer < 0)
+            if(_appearTimer < 0 && FadeOut == null && _image.color.a == 1)
            {
-                _animator.SetTrigger("Fade");
+                FadeOut = StartCoroutine(Fade(0));
            }
        }
    }
@ -49,7 +49,6 @@ public class SnowFlakeLogo : SnowFlake
    {
        if (_animator.GetCurrentAnimatorStateInfo(0).IsName(End))
        {
-            _image.enabled = false;
            Reset();
        }
    }
@ -59,8 +58,31 @@ public class SnowFlakeLogo : SnowFlake
    {
        base.Play();
        _appearTimer = AppearTime;
-        _image.color = Color.white;
+        StartCoroutine(Fade(1));
+        //_image.color = Color.white;
        _image.enabled = true;
    }

+    Coroutine FadeOut;
+
+    IEnumerator Fade(float target)
+    {
+        float value = _image.color.a;
+        Color color = _image.color;
+        while(value != target)
+        {
+            value += target > value ? Time.deltaTime: -Time.deltaTime;
+            value = Mathf.Clamp(value, 0, 1);
+            color.a = value;
+            _image.color = color;
+            yield return null;
+        }
+        if (target == 0)
+        {
+            _image.texture = null;
+            FadeOut = null;
+            _animator.SetTrigger("Fade");
+        }
+    }
+
 }
--- 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
@ -5,7 +5,7 @@
  ],
  "SceneCamera/Canvas/Flake/DisappearTime": 5.0,
  "SceneCamera/Canvas/Flake/DisappearTimeRandomRange": 2.0,
-  "SceneCamera/Canvas/Flake/SnowLogo/AppearTime": 5.0,
+  "SceneCamera/Canvas/Flake/SnowLogo/AppearTime": 1.0,
  "SceneCamera/Canvas/Flake/Collider/Position": [
    460.0,
    0.0