From 6dc49ed0df7d94212b36fea31797095e1def56aa Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Sat, 23 Dec 2023 23:27:55 +0000
Subject: [PATCH] Fixed scene load animation
---
Assets/Prefabs/LevelChanger.prefab | 2
TODOs | 1
Assets/Scenes/GameplayScene.unity | 4 ++
Assets/Scenes/MainMenu.unity | 4 ++
Assets/UI/Animations/scene_loading.anim | 69 ++++++++++++++++++++++++++++++++++
5 files changed, 79 insertions(+), 1 deletions(-)
diff --git a/Assets/Prefabs/LevelChanger.prefab b/Assets/Prefabs/LevelChanger.prefab
index f338308..7d9291f 100644
--- a/Assets/Prefabs/LevelChanger.prefab
+++ b/Assets/Prefabs/LevelChanger.prefab
@@ -234,7 +234,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &712703440348202741
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/GameplayScene.unity b/Assets/Scenes/GameplayScene.unity
index 91795ec..8a075c6 100644
--- a/Assets/Scenes/GameplayScene.unity
+++ b/Assets/Scenes/GameplayScene.unity
@@ -2102,6 +2102,10 @@
propertyPath: m_AdditionalShaderChannelsFlag
value: 25
objectReference: {fileID: 0}
+ - target: {fileID: 4321010892148685286, guid: 1727dce3407104540a6bf21deb2957a8, type: 3}
+ propertyPath: m_text
+ value: Loading...
+ objectReference: {fileID: 0}
- target: {fileID: 7044154378667287598, guid: 1727dce3407104540a6bf21deb2957a8, type: 3}
propertyPath: m_LocalPosition.x
value: 0
diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
index 261e429..9b42834 100644
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -1403,6 +1403,10 @@
propertyPath: m_Name
value: LevelChanger
objectReference: {fileID: 0}
+ - target: {fileID: 2880792788494883435, guid: 1727dce3407104540a6bf21deb2957a8, type: 3}
+ propertyPath: m_AdditionalShaderChannelsFlag
+ value: 25
+ objectReference: {fileID: 0}
- target: {fileID: 7044154378667287598, guid: 1727dce3407104540a6bf21deb2957a8, type: 3}
propertyPath: m_LocalPosition.x
value: 0
diff --git a/Assets/UI/Animations/scene_loading.anim b/Assets/UI/Animations/scene_loading.anim
index 7f6ca4d..a0ea8f1 100644
--- a/Assets/UI/Animations/scene_loading.anim
+++ b/Assets/UI/Animations/scene_loading.anim
@@ -77,6 +77,36 @@
classID: 114
script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
flags: 0
+ - serializedVersion: 2
+ 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
+ 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_IsActive
+ path: Canvas/LoadingScreen/GameLoadingText (TMP)
+ classID: 1
+ script: {fileID: 0}
+ flags: 16
m_PPtrCurves:
- serializedVersion: 2
curve:
@@ -113,6 +143,15 @@
attribute: 4185109675
script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
typeID: 114
+ customType: 0
+ isPPtrCurve: 0
+ isIntCurve: 0
+ isSerializeReferenceCurve: 0
+ - serializedVersion: 2
+ path: 4085774464
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
customType: 0
isPPtrCurve: 0
isIntCurve: 0
@@ -225,6 +264,36 @@
classID: 114
script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
flags: 0
+ - serializedVersion: 2
+ 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
+ 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_IsActive
+ path: Canvas/LoadingScreen/GameLoadingText (TMP)
+ classID: 1
+ script: {fileID: 0}
+ flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/TODOs b/TODOs
index 3e2b945..21b69bb 100644
--- a/TODOs
+++ b/TODOs
@@ -10,6 +10,7 @@
Encrypt Savefile
Overhaul scene fade in/out (kinda same as soundmanger)
Add loading bar during loading screen
+ Add "settings saved" to main menu
NEXT
--
Gitblit v1.9.3