Skip to content

Commit 751a608

Browse files
jcs090218jcs090218
committed
feat(appdata): Move game data to app data
1 parent 65434f1 commit 751a608

File tree

7 files changed

+47
-45
lines changed

7 files changed

+47
-45
lines changed

‎Assets/JCSUnity/Scripts/Managers/JCS_ApplicationManager.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ private void OnApplicationQuit()
104104
{
105105
APP_QUITTING = true;
106106

107-
var gs = JCS_GameSettings.instance;
108-
if (gs.SAVE_ON_EXIT_APP &&
109-
gs.SAVE_GAME_DATA_FUNC != null)
107+
var apps = JCS_ApplicationSettings.instance;
108+
109+
if (apps.SAVE_ON_EXIT_APP && apps.SAVE_APP_DATA_FUNC != null)
110110
{
111111
// save when exit app
112-
gs.SAVE_GAME_DATA_FUNC.Invoke();
112+
apps.SAVE_APP_DATA_FUNC.Invoke();
113113
}
114114
}
115115

‎Assets/JCSUnity/Scripts/Managers/JCS_SceneManager.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ public class JCS_SceneManager : JCS_Manager<JCS_SceneManager>
2727

2828
[Separator("Check Variables (JCS_SceneManager)")]
2929

30+
[Tooltip("Black screen object to be assigned by the system.")]
3031
[SerializeField]
3132
[ReadOnly]
3233
private JCS_BlackScreen mBlackScreen = null;
3334

35+
[Tooltip("Black slide screen object to be assigned by the system.")]
3436
[SerializeField]
3537
[ReadOnly]
3638
private JCS_BlackSlideScreen mBlackSlideScreen = null;
@@ -307,12 +309,12 @@ public void LoadScene(string sceneName, float fadeInTime, Color screenColor, boo
307309
// set the next scene name
308310
this.mNextSceneName = sceneName;
309311

310-
var gs = JCS_GameSettings.instance;
312+
var apps = JCS_ApplicationSettings.instance;
311313

312-
if (gs.SAVE_ON_SWITCH_SCENE && gs.SAVE_GAME_DATA_FUNC != null)
314+
if (apps.SAVE_ON_SWITCH_SCENE && apps.SAVE_APP_DATA_FUNC != null)
313315
{
314316
// do the saving.
315-
gs.SAVE_GAME_DATA_FUNC.Invoke();
317+
apps.SAVE_APP_DATA_FUNC.Invoke();
316318
}
317319

318320
// preload the scene

‎Assets/JCSUnity/Scripts/SaveLoad/JCS_AppData.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public abstract class JCS_AppData
2121
/// </summary>
2222
public static string SavePath()
2323
{
24-
var gs = JCS_GameSettings.instance;
25-
string path = JCS_Path.Combine(Application.persistentDataPath, gs.DATA_PATH);
24+
var apps = JCS_ApplicationSettings.instance;
25+
string path = JCS_Path.Combine(Application.persistentDataPath, apps.DATA_PATH);
2626
return path;
2727
}
2828
}

‎Assets/JCSUnity/Scripts/Settings/JCS_ApplicationSettings.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ public class JCS_ApplicationSettings : JCS_Settings<JCS_ApplicationSettings>
1818
{
1919
/* Variables */
2020

21+
public EmptyFunction SAVE_APP_DATA_FUNC = null;
22+
public EmptyFunction LOAD_APP_DATA_FUNC = null; // NOT USED
23+
2124
// Callback when application starts. This should only run once
2225
// per application is starts.
2326
public EmptyFunction onApplicationStarts = null;
@@ -37,6 +40,22 @@ public class JCS_ApplicationSettings : JCS_Settings<JCS_ApplicationSettings>
3740
[Range(30, 120)]
3841
public int FRAME_RATE = 120;
3942

43+
[Separator("Runtime Variables (JCS_ApplicationSettings)")]
44+
45+
[Header("- Save Load")]
46+
47+
[Tooltip("Data folder path.")]
48+
public string DATA_PATH = "/Data_jcs/";
49+
50+
[Tooltip("Data file extension.")]
51+
public string DATA_EXTENSION = ".jcs";
52+
53+
[Tooltip("Save when switching the scene.")]
54+
public bool SAVE_ON_SWITCH_SCENE = true;
55+
56+
[Tooltip("Save when app exit.")]
57+
public bool SAVE_ON_EXIT_APP = true;
58+
4059
/* Setter & Getter */
4160

4261
/* Functions */
@@ -72,6 +91,11 @@ protected override void TransferData(JCS_ApplicationSettings _old, JCS_Applicati
7291
_new.SET_FRAME_RATE = _old.SET_FRAME_RATE;
7392
_new.FRAME_RATE = _old.FRAME_RATE;
7493
_new.APPLICATION_STARTS = _old.APPLICATION_STARTS;
94+
95+
_new.DATA_PATH = _old.DATA_PATH;
96+
_new.DATA_EXTENSION = _old.DATA_EXTENSION;
97+
_new.SAVE_ON_EXIT_APP = _old.SAVE_ON_EXIT_APP;
98+
_new.SAVE_ON_SWITCH_SCENE = _old.SAVE_ON_SWITCH_SCENE;
7599
}
76100

77101
/// <summary>

‎Assets/JCSUnity/Scripts/Settings/JCS_GameSettings.cs‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ public class JCS_GameSettings : JCS_Settings<JCS_GameSettings>
1818
{
1919
/* Variables */
2020

21-
public EmptyFunction SAVE_GAME_DATA_FUNC = null;
22-
public EmptyFunction LOAD_GAME_DATA_FUNC = null; // NOT USED
23-
24-
public static JCS_XMLData GAME_DATA = null; // NOT USED
25-
2621
[Separator("Check Variables (JCS_GameSettings)")]
2722

2823
[SerializeField]
@@ -87,20 +82,6 @@ public class JCS_GameSettings : JCS_Settings<JCS_GameSettings>
8782
[Tooltip("Cache streaming assets' data path.")]
8883
public string STREAMING_CACHE_PATH = "/Data_jcs/Cache_StreamingAssets/";
8984

90-
[Header("- Save Load")]
91-
92-
[Tooltip("Data folder path.")]
93-
public string DATA_PATH = "/Data_jcs/";
94-
95-
[Tooltip("Data file extension.")]
96-
public string DATA_EXTENSION = ".jcs";
97-
98-
[Tooltip("Save when switching the scene.")]
99-
public bool SAVE_ON_SWITCH_SCENE = true;
100-
101-
[Tooltip("Save when app exit.")]
102-
public bool SAVE_ON_EXIT_APP = true;
103-
10485
[Header("- Screenshot")]
10586

10687
[Tooltip("Screenshot folder path.")]
@@ -186,11 +167,6 @@ protected override void TransferData(JCS_GameSettings _old, JCS_GameSettings _ne
186167
_new.STREAMING_BASE_URL = _old.STREAMING_BASE_URL;
187168
_new.STREAMING_CACHE_PATH = _old.STREAMING_CACHE_PATH;
188169

189-
_new.DATA_PATH = _old.DATA_PATH;
190-
_new.DATA_EXTENSION = _old.DATA_EXTENSION;
191-
_new.SAVE_ON_EXIT_APP = _old.SAVE_ON_EXIT_APP;
192-
_new.SAVE_ON_SWITCH_SCENE = _old.SAVE_ON_SWITCH_SCENE;
193-
194170
_new.SCREENSHOT_PATH = _old.SCREENSHOT_PATH;
195171
_new.SCREENSHOT_FILENAME = _old.SCREENSHOT_FILENAME;
196172
_new.SCREENSHOT_EXTENSION = _old.SCREENSHOT_EXTENSION;

‎Assets/_BossFight/Scripts/Settings/BF_GameSettings.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ private void Start()
8282
LoadGameData();
8383

8484
// set load and save game data
85-
var gs = JCS_GameSettings.instance;
86-
gs.SAVE_GAME_DATA_FUNC = SaveGameData;
87-
gs.LOAD_GAME_DATA_FUNC = LoadGameData;
85+
var apps = JCS_ApplicationSettings.instance;
86+
apps.SAVE_APP_DATA_FUNC = SaveGameData;
87+
apps.LOAD_APP_DATA_FUNC = LoadGameData;
8888
}
8989

9090
/// <summary>
@@ -110,10 +110,10 @@ protected override void TransferData(BF_GameSettings _old, BF_GameSettings _new)
110110
/// </summary>
111111
private void InitPath()
112112
{
113-
var gs = JCS_GameSettings.instance;
113+
var apps = JCS_ApplicationSettings.instance;
114114

115-
mFullFilePath = JCS_Path.Combine(Application.persistentDataPath, gs.DATA_PATH, FILE_PATH);
116-
mFullFileName = FILE_NAME + gs.DATA_EXTENSION;
115+
mFullFilePath = JCS_Path.Combine(Application.persistentDataPath, apps.DATA_PATH, FILE_PATH);
116+
mFullFileName = FILE_NAME + apps.DATA_EXTENSION;
117117
}
118118

119119
private void LoadGameData()

‎Assets/_RunningCrush/Scripts/Settings/RC_GameSettings.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ private void Start()
102102
GAME_MODE = FindGameMode(PLAYER_IN_GAME);
103103

104104
// set load and save game data
105-
var gs = JCS_GameSettings.instance;
106-
gs.SAVE_GAME_DATA_FUNC = SaveGameData;
107-
gs.LOAD_GAME_DATA_FUNC = LoadGameData;
105+
var apps = JCS_ApplicationSettings.instance;
106+
apps.SAVE_APP_DATA_FUNC = SaveGameData;
107+
apps.LOAD_APP_DATA_FUNC = LoadGameData;
108108
}
109109

110110
/// <summary>
@@ -152,10 +152,10 @@ private void TransferData(RC_GameSettings _old, RC_GameSettings _new)
152152
/// </summary>
153153
private void InitPath()
154154
{
155-
var gs = JCS_GameSettings.instance;
155+
var apps = JCS_ApplicationSettings.instance;
156156

157-
mFullFilePath = JCS_Path.Combine(Application.persistentDataPath, gs.DATA_PATH, FILE_PATH);
158-
mFullFileName = FILE_NAME + gs.DATA_EXTENSION;
157+
mFullFilePath = JCS_Path.Combine(Application.persistentDataPath, apps.DATA_PATH, FILE_PATH);
158+
mFullFileName = FILE_NAME + apps.DATA_EXTENSION;
159159
}
160160

161161
private void LoadGameData()

0 commit comments

Comments
 (0)