Skip to content

Commit f2b0d06

Browse files
committed
added in/out transitions for quit button
1 parent afd670d commit f2b0d06

15 files changed

Lines changed: 280 additions & 10 deletions

Assets/UIManager/Example/UI/Fancy/Main/Panels/Intro.asset

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,19 @@ MonoBehaviour:
2121
m_Calls: []
2222
onPanelTransitionedIn:
2323
m_PersistentCalls:
24-
m_Calls: []
24+
m_Calls:
25+
- m_Target: {fileID: 11400000, guid: c4c5b667ab5d3ed40a9067b986412b48, type: 2}
26+
m_TargetAssemblyTypeName: Rellac.UI.UIManager, Assembly-CSharp
27+
m_MethodName: Clear
28+
m_Mode: 1
29+
m_Arguments:
30+
m_ObjectArgument: {fileID: 0}
31+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
32+
m_IntArgument: 0
33+
m_FloatArgument: 0
34+
m_StringArgument:
35+
m_BoolArgument: 0
36+
m_CallState: 2
2537
onPanelTransitionOutStarted:
2638
m_PersistentCalls:
2739
m_Calls: []
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: b7151bd5aa65050498da035e89a1fd2c, type: 3}
13+
m_Name: Button
14+
m_EditorClassIdentifier:
15+
panelPrefab: {fileID: 7310082749242407402, guid: cd4058c37b71a584192c934b5d251a05, type: 3}
16+
transition: {fileID: 11400000, guid: 4f0ed94abf0fa9d42a3dbd467e37090f, type: 2}
17+
animationSpeed: 0.5
18+
blockPassOver: 0
19+
onPanelInstantiated:
20+
m_PersistentCalls:
21+
m_Calls: []
22+
onPanelTransitionedIn:
23+
m_PersistentCalls:
24+
m_Calls: []
25+
onPanelTransitionOutStarted:
26+
m_PersistentCalls:
27+
m_Calls: []
28+
onPanelTransitionedOut:
29+
m_PersistentCalls:
30+
m_Calls: []

Assets/UIManager/Example/UI/Fancy/Quit/Panels/Button.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/UIManager/Example/UI/Fancy/Quit/Panels/Out.asset renamed to Assets/UIManager/Example/UI/Fancy/Quit/Panels/Out-ToButton.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: b7151bd5aa65050498da035e89a1fd2c, type: 3}
13-
m_Name: Out
13+
m_Name: Out-ToButton
1414
m_EditorClassIdentifier:
1515
panelPrefab: {fileID: 7310082749242407402, guid: 644446588dcf4544d9f7788eff295776, type: 3}
1616
transition: {fileID: 11400000, guid: b0082def2e867b440918de7f597107ad, type: 2}
17-
animationSpeed: 1
17+
animationSpeed: 0.5
1818
blockPassOver: 0
1919
onPanelInstantiated:
2020
m_PersistentCalls:

Assets/UIManager/Example/UI/Fancy/Quit/Panels/Out.asset.meta renamed to Assets/UIManager/Example/UI/Fancy/Quit/Panels/Out-ToButton.asset.meta

File renamed without changes.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: b7151bd5aa65050498da035e89a1fd2c, type: 3}
13+
m_Name: Out-ToVisible
14+
m_EditorClassIdentifier:
15+
panelPrefab: {fileID: 7310082749242407402, guid: f4693b3b88a9c1844b5dd2cc65d39ef8, type: 3}
16+
transition: {fileID: 11400000, guid: b0082def2e867b440918de7f597107ad, type: 2}
17+
animationSpeed: 1
18+
blockPassOver: 1
19+
onPanelInstantiated:
20+
m_PersistentCalls:
21+
m_Calls: []
22+
onPanelTransitionedIn:
23+
m_PersistentCalls:
24+
m_Calls: []
25+
onPanelTransitionOutStarted:
26+
m_PersistentCalls:
27+
m_Calls: []
28+
onPanelTransitionedOut:
29+
m_PersistentCalls:
30+
m_Calls: []

Assets/UIManager/Example/UI/Fancy/Quit/Panels/Out-ToVisible.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/UIManager/Example/UI/Fancy/Quit/Panels/Visible.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
panelPrefab: {fileID: 279350631335870203, guid: 736d3a77cbb037843aa575e33dbfc184, type: 3}
1616
transition: {fileID: 11400000, guid: 4f0ed94abf0fa9d42a3dbd467e37090f, type: 2}
17-
animationSpeed: 1
17+
animationSpeed: 0.5
1818
blockPassOver: 1
1919
onPanelInstantiated:
2020
m_PersistentCalls:

Assets/UIManager/Example/UI/Fancy/Quit/Prefabs/Out.prefab renamed to Assets/UIManager/Example/UI/Fancy/Quit/Prefabs/Button.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ MonoBehaviour:
204204
m_MethodName: SetPanel
205205
m_Mode: 2
206206
m_Arguments:
207-
m_ObjectArgument: {fileID: 11400000, guid: 7c12d4628ef5e9640a8a924cfae49cc8, type: 2}
207+
m_ObjectArgument: {fileID: 11400000, guid: 8cca14e8dbc77fa449eb069633604d9e, type: 2}
208208
m_ObjectArgumentAssemblyTypeName: Rellac.UI.UIPanel, Assembly-CSharp
209209
m_IntArgument: 0
210210
m_FloatArgument: 0
@@ -223,7 +223,7 @@ GameObject:
223223
- component: {fileID: 2313769001527412709}
224224
- component: {fileID: 4297686348619348326}
225225
m_Layer: 5
226-
m_Name: Out
226+
m_Name: Button
227227
m_TagString: Untagged
228228
m_Icon: {fileID: 0}
229229
m_NavMeshLayer: 0

Assets/UIManager/Example/UI/Fancy/Quit/Prefabs/Button.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)