Skip to content

Commit 84ee7cb

Browse files
Rellac-RellacRellac-Rellac
committed
added UITransition object
1 parent 0bb14a8 commit 84ee7cb

44 files changed

Lines changed: 2074 additions & 42 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Assets/UIManager/Animations/Curtains_Horizontal.anim‎

Lines changed: 811 additions & 5 deletions
Large diffs are not rendered by default.

‎Assets/UIManager/Animations/Curtains_Vertical.anim‎

Lines changed: 811 additions & 5 deletions
Large diffs are not rendered by default.

‎Assets/UIManager/Animations/PanelAnim.controller‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,32 @@ AnimatorState:
2626
m_MirrorParameter:
2727
m_CycleOffsetParameter:
2828
m_TimeParameter:
29+
--- !u!1102 &-6153948566248028454
30+
AnimatorState:
31+
serializedVersion: 6
32+
m_ObjectHideFlags: 1
33+
m_CorrespondingSourceObject: {fileID: 0}
34+
m_PrefabInstance: {fileID: 0}
35+
m_PrefabAsset: {fileID: 0}
36+
m_Name: Curtains_Vertical
37+
m_Speed: 1
38+
m_CycleOffset: 0
39+
m_Transitions: []
40+
m_StateMachineBehaviours: []
41+
m_Position: {x: 50, y: 50, z: 0}
42+
m_IKOnFeet: 0
43+
m_WriteDefaultValues: 1
44+
m_Mirror: 0
45+
m_SpeedParameterActive: 0
46+
m_MirrorParameterActive: 0
47+
m_CycleOffsetParameterActive: 0
48+
m_TimeParameterActive: 0
49+
m_Motion: {fileID: 7400000, guid: 9d3635474a58b0b43aa4e3d8737d38d9, type: 2}
50+
m_Tag:
51+
m_SpeedParameter:
52+
m_MirrorParameter:
53+
m_CycleOffsetParameter:
54+
m_TimeParameter:
2955
--- !u!1102 &-4861007150716056545
3056
AnimatorState:
3157
serializedVersion: 6
@@ -88,6 +114,9 @@ AnimatorStateMachine:
88114
- serializedVersion: 1
89115
m_State: {fileID: 6755636070791676412}
90116
m_Position: {x: 480, y: 520, z: 0}
117+
- serializedVersion: 1
118+
m_State: {fileID: -6153948566248028454}
119+
m_Position: {x: 515, y: 585, z: 0}
91120
m_ChildStateMachines: []
92121
m_AnyStateTransitions: []
93122
m_EntryTransitions: []

‎Assets/UIManager/Example/ScriptableObjects/UI/Panels/Main/Fade.asset‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MonoBehaviour:
1313
m_Name: Fade
1414
m_EditorClassIdentifier:
1515
panelPrefab: {fileID: 2770682837383440702, guid: ce06df4de1743a243af94497093c4f34, type: 3}
16-
inAnimation: {fileID: 7400000, guid: d77a6ecb41cbf0b4099bcb0e7c4e4018, type: 2}
16+
transition: {fileID: 11400000, guid: d3b81e48f5c969e45804659053e70f49, type: 2}
1717
animationSpeed: 2
1818
blockPassOver: 0
1919
onPanelInstantiated:
@@ -22,6 +22,9 @@ MonoBehaviour:
2222
onPanelTransitionedIn:
2323
m_PersistentCalls:
2424
m_Calls: []
25+
onPanelTransitionOutStarted:
26+
m_PersistentCalls:
27+
m_Calls: []
2528
onPanelTransitionedOut:
2629
m_PersistentCalls:
2730
m_Calls: []

‎Assets/UIManager/Example/ScriptableObjects/UI/Panels/Main/Newspaper.asset‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MonoBehaviour:
1313
m_Name: Newspaper
1414
m_EditorClassIdentifier:
1515
panelPrefab: {fileID: 2770682837383440702, guid: ce06df4de1743a243af94497093c4f34, type: 3}
16-
inAnimation: {fileID: 7400000, guid: ec2703c344837744588f89c7bbcd558c, type: 2}
16+
transition: {fileID: 11400000, guid: 04a692a90418f064da5034a592736ec6, type: 2}
1717
animationSpeed: 0.5
1818
blockPassOver: 0
1919
onPanelInstantiated:
@@ -22,6 +22,9 @@ MonoBehaviour:
2222
onPanelTransitionedIn:
2323
m_PersistentCalls:
2424
m_Calls: []
25+
onPanelTransitionOutStarted:
26+
m_PersistentCalls:
27+
m_Calls: []
2528
onPanelTransitionedOut:
2629
m_PersistentCalls:
2730
m_Calls: []

‎Assets/UIManager/Example/ScriptableObjects/UI/Panels/Main/SlideDown.asset‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MonoBehaviour:
1313
m_Name: SlideDown
1414
m_EditorClassIdentifier:
1515
panelPrefab: {fileID: 2770682837383440702, guid: ce06df4de1743a243af94497093c4f34, type: 3}
16-
inAnimation: {fileID: 7400000, guid: a06bf54765b1c8b41860f892fea59ac9, type: 2}
16+
transition: {fileID: 11400000, guid: b0082def2e867b440918de7f597107ad, type: 2}
1717
animationSpeed: 1
1818
blockPassOver: 0
1919
onPanelInstantiated:
@@ -22,6 +22,9 @@ MonoBehaviour:
2222
onPanelTransitionedIn:
2323
m_PersistentCalls:
2424
m_Calls: []
25+
onPanelTransitionOutStarted:
26+
m_PersistentCalls:
27+
m_Calls: []
2528
onPanelTransitionedOut:
2629
m_PersistentCalls:
2730
m_Calls: []

‎Assets/UIManager/Example/ScriptableObjects/UI/Panels/Main/SlideLeft.asset‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MonoBehaviour:
1313
m_Name: SlideLeft
1414
m_EditorClassIdentifier:
1515
panelPrefab: {fileID: 2770682837383440702, guid: ce06df4de1743a243af94497093c4f34, type: 3}
16-
inAnimation: {fileID: 7400000, guid: 6060cae0cfddb03439305b067bbe5238, type: 2}
16+
transition: {fileID: 11400000, guid: 520efb67b726f384e9a42b26dd02ef39, type: 2}
1717
animationSpeed: 1
1818
blockPassOver: 0
1919
onPanelInstantiated:
@@ -22,6 +22,9 @@ MonoBehaviour:
2222
onPanelTransitionedIn:
2323
m_PersistentCalls:
2424
m_Calls: []
25+
onPanelTransitionOutStarted:
26+
m_PersistentCalls:
27+
m_Calls: []
2528
onPanelTransitionedOut:
2629
m_PersistentCalls:
2730
m_Calls: []

‎Assets/UIManager/Example/ScriptableObjects/UI/Panels/Main/SlideRight.asset‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MonoBehaviour:
1313
m_Name: SlideRight
1414
m_EditorClassIdentifier:
1515
panelPrefab: {fileID: 2770682837383440702, guid: ce06df4de1743a243af94497093c4f34, type: 3}
16-
inAnimation: {fileID: 7400000, guid: 2f31efadef4a6c24fb94573470e17a0e, type: 2}
16+
transition: {fileID: 11400000, guid: 84a3b7e5afb19ad498ce6e5b66357c7c, type: 2}
1717
animationSpeed: 1
1818
blockPassOver: 0
1919
onPanelInstantiated:
@@ -22,6 +22,9 @@ MonoBehaviour:
2222
onPanelTransitionedIn:
2323
m_PersistentCalls:
2424
m_Calls: []
25+
onPanelTransitionOutStarted:
26+
m_PersistentCalls:
27+
m_Calls: []
2528
onPanelTransitionedOut:
2629
m_PersistentCalls:
2730
m_Calls: []

‎Assets/UIManager/Example/ScriptableObjects/UI/Panels/Main/SlideUp.asset‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MonoBehaviour:
1313
m_Name: SlideUp
1414
m_EditorClassIdentifier:
1515
panelPrefab: {fileID: 2770682837383440702, guid: ce06df4de1743a243af94497093c4f34, type: 3}
16-
inAnimation: {fileID: 7400000, guid: 445e976379f1e694887c055847926073, type: 2}
16+
transition: {fileID: 11400000, guid: 4f0ed94abf0fa9d42a3dbd467e37090f, type: 2}
1717
animationSpeed: 1
1818
blockPassOver: 0
1919
onPanelInstantiated:
@@ -22,6 +22,9 @@ MonoBehaviour:
2222
onPanelTransitionedIn:
2323
m_PersistentCalls:
2424
m_Calls: []
25+
onPanelTransitionOutStarted:
26+
m_PersistentCalls:
27+
m_Calls: []
2528
onPanelTransitionedOut:
2629
m_PersistentCalls:
2730
m_Calls: []

‎Assets/UIManager/Example/ScriptableObjects/UI/Panels/PersistantUI/Blank.asset‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MonoBehaviour:
1313
m_Name: Blank
1414
m_EditorClassIdentifier:
1515
panelPrefab: {fileID: 8070701578967653149, guid: d6c9f540535341145b9af595aee8be71, type: 3}
16-
inAnimation: {fileID: 7400000, guid: a06bf54765b1c8b41860f892fea59ac9, type: 2}
16+
transition: {fileID: 11400000, guid: b0082def2e867b440918de7f597107ad, type: 2}
1717
animationSpeed: 1
1818
blockPassOver: 0
1919
onPanelInstantiated:
@@ -22,6 +22,9 @@ MonoBehaviour:
2222
onPanelTransitionedIn:
2323
m_PersistentCalls:
2424
m_Calls: []
25+
onPanelTransitionOutStarted:
26+
m_PersistentCalls:
27+
m_Calls: []
2528
onPanelTransitionedOut:
2629
m_PersistentCalls:
2730
m_Calls: []

0 commit comments

Comments
 (0)