facetransition

2024-02-04 09:28:49 +01:00 · 2024-02-04 09:28:49 +01:00 · 49595cfc6e
parent 37a75b5c15
commit 49595cfc6e
3 changed files with 126 additions and 89 deletions
--- a/Assets/Prefabs/UI/UI.prefab
+++ b/Assets/Prefabs/UI/UI.prefab
@ -9,6 +9,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 3315624217225912576}
+  - component: {fileID: 4586330195874448812}
  m_Layer: 5
  m_Name: TimerUI
  m_TagString: Untagged
@ -36,6 +37,19 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4586330195874448812
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 203935764274243221}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0e0dc4c0bfe6da44682256676d1ccef6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  timerText: {fileID: 5558345568148303310}
 --- !u!1 &851408572817441430
 GameObject:
  m_ObjectHideFlags: 0
@ -1129,6 +1143,94 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6216580377014392011
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1294303342848261759}
+  - component: {fileID: 2160402623048284357}
+  - component: {fileID: 7320843173059553054}
+  - component: {fileID: 6190172744665135225}
+  m_Layer: 5
+  m_Name: FadeImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1294303342848261759
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6216580377014392011}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2603779566095873902}
+  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: 10000, y: 10000}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2160402623048284357
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6216580377014392011}
+  m_CullTransparentMesh: 1
+--- !u!114 &7320843173059553054
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6216580377014392011}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6190172744665135225
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6216580377014392011}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 55f8b539d824ad84cb0f7384c2525a2e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &6910246373966366672
 GameObject:
  m_ObjectHideFlags: 0
@ -1217,6 +1319,7 @@ GameObject:
  - component: {fileID: 3829147617141221472}
  - component: {fileID: 8067116145730438707}
  - component: {fileID: 1150396837806670114}
+  - component: {fileID: 7577166944879627524}
  m_Layer: 5
  m_Name: UI
  m_TagString: Untagged
@ -1239,6 +1342,7 @@ RectTransform:
  - {fileID: 5758936918037227603}
  - {fileID: 3315624217225912576}
  - {fileID: 1594701663256479489}
+  - {fileID: 1294303342848261759}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
@ -1309,6 +1413,18 @@ MonoBehaviour:
  m_BlockingMask:
    serializedVersion: 2
    m_Bits: 4294967295
+--- !u!114 &7577166944879627524
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7301411897347746173}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 94eb4529510a25d448334415d28e7fa4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7485285492053268969
 GameObject:
  m_ObjectHideFlags: 0
@ -1362,7 +1478,7 @@ MonoBehaviour:
  spawner: {fileID: 0}
  slider: {fileID: 6134467867004299163}
  waveText: {fileID: 5636459425788774448}
-  waveTextDisplayTime: 3
+  waveTextDisplayTime: 1
 --- !u!1 &7671763227494701576
 GameObject:
  m_ObjectHideFlags: 0
@ -1465,7 +1581,7 @@ RectTransform:
  m_GameObject: {fileID: 8343632487405850332}
  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_LocalScale: {x: 0.57061476, y: 0.57061476, z: 0.57061476}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 1594701663256479489}
@ -1735,7 +1851,7 @@ RectTransform:
  m_GameObject: {fileID: 8805328679230352364}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.9407643, y: 1.9407643, z: 1.9407643}
+  m_LocalScale: {x: 1.2, y: 1.2, z: 1.9407643}
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 5330981716967833427}
@ -1754,7 +1870,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 291.11456, y: 291.1147}
+  m_AnchoredPosition: {x: 194.86456, y: 195}
  m_SizeDelta: {x: 250, y: 250}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1107145590061588416
--- a/Assets/Scenes/GameScene.unity
+++ b/Assets/Scenes/GameScene.unity
@ -780,24 +780,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 4aabce12c1341ff488ee4dc806fd80e8, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!1 &872164353 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 203935764274243221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-  m_PrefabInstance: {fileID: 4158834148864819266}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &872164355
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 872164353}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0e0dc4c0bfe6da44682256676d1ccef6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  timerText: {fileID: 1785683341}
 --- !u!1 &941230147
 GameObject:
  m_ObjectHideFlags: 0
@ -3133,17 +3115,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1785683341 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5558345568148303310, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-  m_PrefabInstance: {fileID: 4158834148864819266}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1872712129
 GameObject:
  m_ObjectHideFlags: 0
@ -3276,10 +3247,6 @@ PrefabInstance:
      propertyPath: spawner
      value: 
      objectReference: {fileID: 5796191506433166634}
-    - target: {fileID: 1656765803503857110, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-      propertyPath: waveTextDisplayTime
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 2404937059918327841, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@ -3380,34 +3347,6 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 194.86456
-      objectReference: {fileID: 0}
-    - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 195
-      objectReference: {fileID: 0}
-    - target: {fileID: 6089114235279588614, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.57061476
-      objectReference: {fileID: 0}
-    - target: {fileID: 6089114235279588614, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.57061476
-      objectReference: {fileID: 0}
-    - target: {fileID: 6089114235279588614, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.57061476
-      objectReference: {fileID: 0}
    - target: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
      propertyPath: m_Name
      value: UI
@ -3415,31 +3354,8 @@ PrefabInstance:
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 4158834148864819268}
-    - targetCorrespondingSourceObject: {fileID: 203935764274243221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 872164355}
+    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
--- !u!1 &4158834148864819267 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
-  m_PrefabInstance: {fileID: 4158834148864819266}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &4158834148864819268
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4158834148864819267}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 94eb4529510a25d448334415d28e7fa4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &4910321061857220295
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/UI/Wait2SecondsToShow.cs
+++ b/Assets/Scripts/UI/Wait2SecondsToShow.cs
@ -11,6 +11,11 @@ public class Wait2SecondsToShow : MonoBehaviour
    private void Start()
    {
        canvas = GetComponent<Image>();
+        Invoke(nameof(StartFade), 2.8f);
+    }
+
+    void StartFade()
+    {
        StartCoroutine(FadeOut(2f));
    }