net.dreditor.freetimesurfacing 0.1.6 → 0.1.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.attestation.p7m +0 -0
- package/DREditor.FreeTimeSurfacing.asmdef +26 -26
- package/DREditor.FreeTimeSurfacing.asmdef.meta +7 -7
- package/FTEGameSceneSurface.cs +47 -47
- package/FTEGameSceneSurface.cs.meta +11 -11
- package/FTEPurchaseCompleteHandler.cs +63 -63
- package/FTEPurchaseCompleteHandler.cs.meta +11 -11
- package/FTESurfaceComponent.cs +9 -9
- package/FTESurfaceComponent.cs.meta +1 -1
- package/FTESurfaceManager.cs +48 -48
- package/FTESurfaceManager.cs.meta +1 -1
- package/FTESurfaceSelectionListener.cs +44 -44
- package/FTESurfaceSelectionListener.cs.meta +1 -1
- package/FTESurfaceUpdatableVisibility.cs +63 -63
- package/FTESurfaceUpdatableVisibility.cs.meta +1 -1
- package/IFTESurfaceManager.cs +29 -29
- package/IFTESurfaceManager.cs.meta +1 -1
- package/InitializeFTESurfacingInput.cs +37 -37
- package/InitializeFTESurfacingInput.cs.meta +1 -1
- package/InitializeLoadingFTESurfacing.cs +197 -197
- package/InitializeLoadingFTESurfacing.cs.meta +11 -11
- package/LeaveFTESurfacing.cs +161 -161
- package/LeaveFTESurfacing.cs.meta +1 -1
- package/{Samples → Samples~}/DRE_FTEMinigames.unity +649 -649
- package/{Samples → Samples~}/DRE_FTEMinigames.unity.meta +7 -7
- package/{Samples → Samples~}/FTESurfaceInputAllowed.asset +21 -21
- package/{Samples → Samples~}/FTESurfaceInputAllowed.asset.meta +8 -8
- package/{Samples → Samples~}/FTE_Buffered_Selected_UI_Cacher.prefab +137 -137
- package/{Samples → Samples~}/FTE_Buffered_Selected_UI_Cacher.prefab.meta +7 -7
- package/{Samples → Samples~}/FTE_Controls_Callable_UI.prefab +51 -51
- package/{Samples → Samples~}/FTE_Controls_Callable_UI.prefab.meta +7 -7
- package/{Samples → Samples~}/FTE_Minigame_Surface_ETemplate.prefab +48 -48
- package/{Samples → Samples~}/FTE_Minigame_Surface_ETemplate.prefab.meta +7 -7
- package/{Samples → Samples~}/FTE_Surface_Canvas_Shell.prefab +253 -253
- package/{Samples → Samples~}/FTE_Surface_Canvas_Shell.prefab.meta +7 -7
- package/{Samples → Samples~}/FTE_Surface_Canvas_Template.prefab +333 -333
- package/{Samples → Samples~}/FTE_Surface_Canvas_Template.prefab.meta +7 -7
- package/{Samples → Samples~}/FTE_Surface_Manager_Shell.prefab +52 -52
- package/{Samples → Samples~}/FTE_Surface_Manager_Shell.prefab.meta +7 -7
- package/{Samples → Samples~}/FTE_Surface_Manager_Template.prefab +411 -411
- package/{Samples → Samples~}/FTE_Surface_Manager_Template.prefab.meta +7 -7
- package/{Samples → Samples~}/FTE_Surface_System_Shell.prefab +602 -602
- package/{Samples → Samples~}/FTE_Surface_System_Shell.prefab.meta +7 -7
- package/{Samples → Samples~}/FTE_Surface_System_Template.prefab +360 -360
- package/{Samples → Samples~}/FTE_Surface_System_Template.prefab.meta +7 -7
- package/{Samples → Samples~}/FTE_Tutorial_Callable_UI.prefab +51 -51
- package/{Samples → Samples~}/FTE_Tutorial_Callable_UI.prefab.meta +7 -7
- package/{Samples → Samples~}/Initialize_Loading_FTE_Surfacing.prefab +145 -145
- package/{Samples → Samples~}/Initialize_Loading_FTE_Surfacing.prefab.meta +7 -7
- package/{Samples → Samples~}/Layered_Focused_Carousel_Shell.prefab +169 -169
- package/{Samples → Samples~}/Layered_Focused_Carousel_Shell.prefab.meta +7 -7
- package/{Samples → Samples~}/Layered_Focused_Carousel_Template.prefab +856 -856
- package/{Samples → Samples~}/Layered_Focused_Carousel_Template.prefab.meta +7 -7
- package/{Samples → Samples~}/OnCantPurchase.asset +15 -15
- package/{Samples → Samples~}/OnCantPurchase.asset.meta +8 -8
- package/{Samples → Samples~}/OnPurchase.asset +15 -15
- package/{Samples → Samples~}/OnPurchase.asset.meta +8 -8
- package/{Samples → Samples~}/OnPurchaseCompleted.asset +15 -15
- package/{Samples → Samples~}/OnPurchaseCompleted.asset.meta +8 -8
- package/{Samples → Samples~}/PaidAmount.asset +21 -21
- package/{Samples → Samples~}/PaidAmount.asset.meta +8 -8
- package/{Samples → Samples~}/Shift_On_Updated_FTE_Surfaces.prefab +46 -46
- package/{Samples → Samples~}/Shift_On_Updated_FTE_Surfaces.prefab.meta +7 -7
- package/ShiftOnUpdatedFTESurfaces.cs +22 -22
- package/ShiftOnUpdatedFTESurfaces.cs.meta +1 -1
- package/SubmittableFTESurfaceCollection.cs +109 -109
- package/SubmittableFTESurfaceCollection.cs.meta +1 -1
- package/SubmittableFTESurfaceComponent.cs +35 -35
- package/SubmittableFTESurfaceComponent.cs.meta +1 -1
- package/package.json +50 -45
- package/package.json.meta +7 -7
- package/Samples.meta +0 -8
package/LeaveFTESurfacing.cs
CHANGED
|
@@ -1,162 +1,162 @@
|
|
|
1
|
-
//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
|
|
2
|
-
using DREditor.Audio;
|
|
3
|
-
using DREditor.EventObjects;
|
|
4
|
-
using DREditor.Fading;
|
|
5
|
-
using DREditor.RoomLoading;
|
|
6
|
-
using DREditor.Services;
|
|
7
|
-
using System.Collections;
|
|
8
|
-
using UnityEngine;
|
|
9
|
-
using UnityEngine.InputSystem;
|
|
10
|
-
using UnityEngine.SceneManagement;
|
|
11
|
-
using static UnityEngine.InputSystem.InputAction;
|
|
12
|
-
|
|
13
|
-
namespace DREditor.FreeTimeSurfacing
|
|
14
|
-
{
|
|
15
|
-
/// <summary>
|
|
16
|
-
///
|
|
17
|
-
/// </summary>
|
|
18
|
-
[ClassHeader(nameof(ControlledComponent) +
|
|
19
|
-
"\n\n")]
|
|
20
|
-
public class LeaveFTESurfacing : ControlledComponent
|
|
21
|
-
{
|
|
22
|
-
/// <summary>
|
|
23
|
-
///
|
|
24
|
-
/// </summary>
|
|
25
|
-
[Header("")]
|
|
26
|
-
[Divider]
|
|
27
|
-
[Tooltip("")]
|
|
28
|
-
[SerializeField] protected InputActionReference cancel = null;
|
|
29
|
-
|
|
30
|
-
/// <summary>
|
|
31
|
-
///
|
|
32
|
-
/// </summary>
|
|
33
|
-
[Tooltip("")]
|
|
34
|
-
[SerializeField] protected ScriptableObject leaveRoomOptions = null;
|
|
35
|
-
|
|
36
|
-
/// <summary>
|
|
37
|
-
///
|
|
38
|
-
/// </summary>
|
|
39
|
-
[Tooltip("")]
|
|
40
|
-
[SerializeField] protected string returnScene = "";
|
|
41
|
-
|
|
42
|
-
/// <summary>
|
|
43
|
-
///
|
|
44
|
-
/// </summary>
|
|
45
|
-
[Tooltip("")]
|
|
46
|
-
[SerializeField] protected float fadeOutDuration = 0.5f;
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
/// <summary>
|
|
50
|
-
///
|
|
51
|
-
/// </summary>
|
|
52
|
-
protected bool leaving = false;
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
/// <inheritdoc/>
|
|
56
|
-
protected override void Awake()
|
|
57
|
-
{
|
|
58
|
-
base.Awake();
|
|
59
|
-
|
|
60
|
-
StoreLastPlayedMusic();
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
/// <summary>
|
|
64
|
-
///
|
|
65
|
-
/// </summary>
|
|
66
|
-
protected virtual void StoreLastPlayedMusic()
|
|
67
|
-
{
|
|
68
|
-
if (!ServiceLocator.HasService<string>())
|
|
69
|
-
ServiceLocator.Register(ServiceLocator.GetService<MusicManagerBase>().GetLastPlayedMusic());
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
/// <inheritdoc/>
|
|
73
|
-
public override void ActivateControls() => cancel.action.started += Cancel;
|
|
74
|
-
|
|
75
|
-
/// <inheritdoc/>
|
|
76
|
-
public override void DeactivateControls() => cancel.action.started -= Cancel;
|
|
77
|
-
|
|
78
|
-
/// <summary>
|
|
79
|
-
///
|
|
80
|
-
/// </summary>
|
|
81
|
-
/// <param name="ctx"></param>
|
|
82
|
-
protected virtual void Cancel(CallbackContext ctx)
|
|
83
|
-
{
|
|
84
|
-
if (AlreadyLeaving())
|
|
85
|
-
return;
|
|
86
|
-
|
|
87
|
-
DisableInput();
|
|
88
|
-
|
|
89
|
-
StartCoroutine(LeaveRoutine());
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
/// <summary>
|
|
93
|
-
///
|
|
94
|
-
/// </summary>
|
|
95
|
-
/// <returns></returns>
|
|
96
|
-
protected virtual bool AlreadyLeaving()
|
|
97
|
-
{
|
|
98
|
-
bool result = leaving || string.IsNullOrEmpty(returnScene);
|
|
99
|
-
|
|
100
|
-
if (!result)
|
|
101
|
-
leaving = true;
|
|
102
|
-
|
|
103
|
-
return result;
|
|
104
|
-
}
|
|
105
|
-
|
|
106
|
-
/// <summary>
|
|
107
|
-
///
|
|
108
|
-
/// </summary>
|
|
109
|
-
protected virtual IEnumerator LeaveRoutine()
|
|
110
|
-
{
|
|
111
|
-
yield return FadeOutScreen();
|
|
112
|
-
|
|
113
|
-
LeaveFTESurface();
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
/// <summary>
|
|
117
|
-
///
|
|
118
|
-
/// </summary>
|
|
119
|
-
protected virtual IEnumerator FadeOutScreen()
|
|
120
|
-
{
|
|
121
|
-
if (ServiceLocator.HasService(out GlobalFade fader))
|
|
122
|
-
yield return fader.FadeToRoutine(fadeOutDuration, false, true);
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
/// <summary>
|
|
126
|
-
///
|
|
127
|
-
/// </summary>
|
|
128
|
-
protected virtual void LeaveFTESurface()
|
|
129
|
-
{
|
|
130
|
-
ServiceLocator.GetService<RoomChangerBase>().SetOptions(leaveRoomOptions);
|
|
131
|
-
|
|
132
|
-
SceneManager.sceneLoaded += ReturnMusic;
|
|
133
|
-
|
|
134
|
-
UnityEngine.Debug.LogWarning("Changing Scene");
|
|
135
|
-
|
|
136
|
-
SceneManager.LoadScene(returnScene);
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
/// <summary>
|
|
140
|
-
///
|
|
141
|
-
/// </summary>
|
|
142
|
-
/// <param name="scene"></param>
|
|
143
|
-
/// <param name="mode"></param>
|
|
144
|
-
protected virtual void ReturnMusic(Scene scene, LoadSceneMode mode)
|
|
145
|
-
{
|
|
146
|
-
SceneManager.sceneLoaded -= ReturnMusic;
|
|
147
|
-
|
|
148
|
-
RestoreStoredMusic();
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
/// <summary>
|
|
152
|
-
///
|
|
153
|
-
/// </summary>
|
|
154
|
-
protected virtual void RestoreStoredMusic()
|
|
155
|
-
{
|
|
156
|
-
if (ServiceLocator.HasService(out string storedMusic))
|
|
157
|
-
ServiceLocator.GetService<MusicManagerBase>().PlayMusic(storedMusic);
|
|
158
|
-
else
|
|
159
|
-
UnityEngine.Debug.LogWarning("ALERT: There was no music stored in the service registry!");
|
|
160
|
-
}
|
|
161
|
-
}
|
|
1
|
+
//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
|
|
2
|
+
using DREditor.Audio;
|
|
3
|
+
using DREditor.EventObjects;
|
|
4
|
+
using DREditor.Fading;
|
|
5
|
+
using DREditor.RoomLoading;
|
|
6
|
+
using DREditor.Services;
|
|
7
|
+
using System.Collections;
|
|
8
|
+
using UnityEngine;
|
|
9
|
+
using UnityEngine.InputSystem;
|
|
10
|
+
using UnityEngine.SceneManagement;
|
|
11
|
+
using static UnityEngine.InputSystem.InputAction;
|
|
12
|
+
|
|
13
|
+
namespace DREditor.FreeTimeSurfacing
|
|
14
|
+
{
|
|
15
|
+
/// <summary>
|
|
16
|
+
///
|
|
17
|
+
/// </summary>
|
|
18
|
+
[ClassHeader(nameof(ControlledComponent) +
|
|
19
|
+
"\n\n")]
|
|
20
|
+
public class LeaveFTESurfacing : ControlledComponent
|
|
21
|
+
{
|
|
22
|
+
/// <summary>
|
|
23
|
+
///
|
|
24
|
+
/// </summary>
|
|
25
|
+
[Header("")]
|
|
26
|
+
[Divider]
|
|
27
|
+
[Tooltip("")]
|
|
28
|
+
[SerializeField] protected InputActionReference cancel = null;
|
|
29
|
+
|
|
30
|
+
/// <summary>
|
|
31
|
+
///
|
|
32
|
+
/// </summary>
|
|
33
|
+
[Tooltip("")]
|
|
34
|
+
[SerializeField] protected ScriptableObject leaveRoomOptions = null;
|
|
35
|
+
|
|
36
|
+
/// <summary>
|
|
37
|
+
///
|
|
38
|
+
/// </summary>
|
|
39
|
+
[Tooltip("")]
|
|
40
|
+
[SerializeField] protected string returnScene = "";
|
|
41
|
+
|
|
42
|
+
/// <summary>
|
|
43
|
+
///
|
|
44
|
+
/// </summary>
|
|
45
|
+
[Tooltip("")]
|
|
46
|
+
[SerializeField] protected float fadeOutDuration = 0.5f;
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
/// <summary>
|
|
50
|
+
///
|
|
51
|
+
/// </summary>
|
|
52
|
+
protected bool leaving = false;
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
/// <inheritdoc/>
|
|
56
|
+
protected override void Awake()
|
|
57
|
+
{
|
|
58
|
+
base.Awake();
|
|
59
|
+
|
|
60
|
+
StoreLastPlayedMusic();
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/// <summary>
|
|
64
|
+
///
|
|
65
|
+
/// </summary>
|
|
66
|
+
protected virtual void StoreLastPlayedMusic()
|
|
67
|
+
{
|
|
68
|
+
if (!ServiceLocator.HasService<string>())
|
|
69
|
+
ServiceLocator.Register(ServiceLocator.GetService<MusicManagerBase>().GetLastPlayedMusic());
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/// <inheritdoc/>
|
|
73
|
+
public override void ActivateControls() => cancel.action.started += Cancel;
|
|
74
|
+
|
|
75
|
+
/// <inheritdoc/>
|
|
76
|
+
public override void DeactivateControls() => cancel.action.started -= Cancel;
|
|
77
|
+
|
|
78
|
+
/// <summary>
|
|
79
|
+
///
|
|
80
|
+
/// </summary>
|
|
81
|
+
/// <param name="ctx"></param>
|
|
82
|
+
protected virtual void Cancel(CallbackContext ctx)
|
|
83
|
+
{
|
|
84
|
+
if (AlreadyLeaving())
|
|
85
|
+
return;
|
|
86
|
+
|
|
87
|
+
DisableInput();
|
|
88
|
+
|
|
89
|
+
StartCoroutine(LeaveRoutine());
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/// <summary>
|
|
93
|
+
///
|
|
94
|
+
/// </summary>
|
|
95
|
+
/// <returns></returns>
|
|
96
|
+
protected virtual bool AlreadyLeaving()
|
|
97
|
+
{
|
|
98
|
+
bool result = leaving || string.IsNullOrEmpty(returnScene);
|
|
99
|
+
|
|
100
|
+
if (!result)
|
|
101
|
+
leaving = true;
|
|
102
|
+
|
|
103
|
+
return result;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
/// <summary>
|
|
107
|
+
///
|
|
108
|
+
/// </summary>
|
|
109
|
+
protected virtual IEnumerator LeaveRoutine()
|
|
110
|
+
{
|
|
111
|
+
yield return FadeOutScreen();
|
|
112
|
+
|
|
113
|
+
LeaveFTESurface();
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
/// <summary>
|
|
117
|
+
///
|
|
118
|
+
/// </summary>
|
|
119
|
+
protected virtual IEnumerator FadeOutScreen()
|
|
120
|
+
{
|
|
121
|
+
if (ServiceLocator.HasService(out GlobalFade fader))
|
|
122
|
+
yield return fader.FadeToRoutine(fadeOutDuration, false, true);
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
/// <summary>
|
|
126
|
+
///
|
|
127
|
+
/// </summary>
|
|
128
|
+
protected virtual void LeaveFTESurface()
|
|
129
|
+
{
|
|
130
|
+
ServiceLocator.GetService<RoomChangerBase>().SetOptions(leaveRoomOptions);
|
|
131
|
+
|
|
132
|
+
SceneManager.sceneLoaded += ReturnMusic;
|
|
133
|
+
|
|
134
|
+
UnityEngine.Debug.LogWarning("Changing Scene");
|
|
135
|
+
|
|
136
|
+
SceneManager.LoadScene(returnScene);
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
/// <summary>
|
|
140
|
+
///
|
|
141
|
+
/// </summary>
|
|
142
|
+
/// <param name="scene"></param>
|
|
143
|
+
/// <param name="mode"></param>
|
|
144
|
+
protected virtual void ReturnMusic(Scene scene, LoadSceneMode mode)
|
|
145
|
+
{
|
|
146
|
+
SceneManager.sceneLoaded -= ReturnMusic;
|
|
147
|
+
|
|
148
|
+
RestoreStoredMusic();
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/// <summary>
|
|
152
|
+
///
|
|
153
|
+
/// </summary>
|
|
154
|
+
protected virtual void RestoreStoredMusic()
|
|
155
|
+
{
|
|
156
|
+
if (ServiceLocator.HasService(out string storedMusic))
|
|
157
|
+
ServiceLocator.GetService<MusicManagerBase>().PlayMusic(storedMusic);
|
|
158
|
+
else
|
|
159
|
+
UnityEngine.Debug.LogWarning("ALERT: There was no music stored in the service registry!");
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
162
|
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
fileFormatVersion: 2
|
|
1
|
+
fileFormatVersion: 2
|
|
2
2
|
guid: 2479e06684280424e88a5826c60321cd
|