Skip to content

Commit 5e76d53

Browse files
eomeneeomene
committed
namespace changes
1 parent 512c658 commit 5e76d53

File tree

7 files changed

+64
-72
lines changed

7 files changed

+64
-72
lines changed

‎Assets/LootLocker.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Assets/LootLocker/Admin/Editor/Panel/Assets.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void PopulateAssets(string search = null)
2424
{
2525
LootLockerSDKAdminManager.DebugMessage("Getting assets..");
2626

27-
currentView = View.Loading;
27+
currentView = LootLockerView.Loading;
2828

2929
LootLockerSDKAdminManager.GetAssets((response) =>
3030
{
@@ -44,7 +44,7 @@ void PopulateAssets(string search = null)
4444
if (response.success)
4545
{
4646
assetsResponse = response;
47-
currentView = View.Assets;
47+
currentView = LootLockerView.Assets;
4848
Repaint();
4949
LootLockerSDKAdminManager.DebugMessage("Successful got all assets: " + response.text);
5050
}
@@ -71,7 +71,7 @@ void DrawAssetsView()
7171

7272
if (GUILayout.Button("Back", GUILayout.Height(20)))
7373
{
74-
currentView = View.Menu;
74+
currentView = LootLockerView.Menu;
7575
}
7676

7777
EditorGUILayout.Separator();
@@ -125,14 +125,14 @@ void SelectAsset(int assetIndex)
125125
Debug.Log($"Current Asset set to: {assetsResponse.assets[assetIndex].id} Named: {assetsResponse.assets[assetIndex].name}");
126126

127127
activeAsset = assetsResponse.assets[assetIndex];
128-
currentView = View.UpdateAsset;
128+
currentView = LootLockerView.UpdateAsset;
129129
SelectAssetBase();
130130
}
131131

132132
void StartCreateAsset()
133133
{
134134
activeAsset = new LootLockerCommonAsset() { name = "untitleted", context = ContextNames[0] };
135-
currentView = View.CreateAsset;
135+
currentView = LootLockerView.CreateAsset;
136136
SelectAssetBase();
137137
}
138138

‎Assets/LootLocker/Admin/Editor/Panel/Files.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void PopulateFiles()
5454
});
5555

5656
getFilesResponse = response;
57-
currentView = View.Files;
57+
currentView = LootLockerView.Files;
5858
Repaint();
5959
Debug.Log("Successful got all files: " + response.text);
6060
}
@@ -116,7 +116,7 @@ void DrawFilesView()
116116

117117
GUILayout.BeginArea(ContentSection);
118118

119-
if (GUILayout.Button("Back", GUILayout.Height(20))) currentView = View.Menu;
119+
if (GUILayout.Button("Back", GUILayout.Height(20))) currentView = LootLockerView.Menu;
120120
EditorGUILayout.Separator();
121121

122122
EditorGUILayout.LabelField("Files", style);
@@ -286,7 +286,7 @@ void DrawCreateFileView()
286286
if (GUILayout.Button("Upload", GUILayout.Height(30)))
287287
{
288288

289-
currentView = View.Loading;
289+
currentView = LootLockerView.Loading;
290290

291291
var request = new LootLockerCreateAssetRequest() { name = assetName, context_id = Contexts[Array.IndexOf(ContextNames, activeAsset.context)].id };
292292

@@ -315,23 +315,23 @@ void DrawCreateFileView()
315315
else
316316
{
317317
Debug.LogError("Failed to upload file: " + uploadResponse.Error);
318-
currentView = View.CreateFile;
318+
currentView = LootLockerView.CreateFile;
319319
}
320320
}, tags: FileTags.Split(','));
321321

322322
}
323323
else
324324
{
325325
Debug.LogError("Failed to get assets: " + getAssetsResponse.Error);
326-
currentView = View.CreateFile;
326+
currentView = LootLockerView.CreateFile;
327327
}
328328
});
329329

330330
}
331331
else
332332
{
333333
Debug.LogError("failed to get create/update asset: " + response.Error);
334-
currentView = View.CreateFile;
334+
currentView = LootLockerView.CreateFile;
335335
}
336336
});
337337

@@ -356,7 +356,7 @@ void CreateFile()
356356
{
357357

358358
filePath = "";
359-
currentView = View.CreateFile;
359+
currentView = LootLockerView.CreateFile;
360360

361361
//LootLockerSDKAdminManager.GetAssets((response) =>
362362
//{
@@ -384,7 +384,7 @@ void CreateFile()
384384
void SelectFile(int index)
385385
{
386386
activeFile = getFilesResponse.files[index];
387-
currentView = View.File;
387+
currentView = LootLockerView.File;
388388

389389
FileTags = String.Empty;
390390
if (activeFile.tags == null) return;

‎Assets/LootLocker/Admin/Editor/Panel/Games.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void PopulateGames()
2121
if (response.success)
2222
{
2323
gamesResponse = response;
24-
currentView = View.Games;
24+
currentView = LootLockerView.Games;
2525
Repaint();
2626
Debug.Log("Successful got all games: " + response.text);
2727
}
@@ -126,7 +126,7 @@ void DrawGamesView()
126126

127127
if (GUILayout.Button("Back", GUILayout.Height(40)))
128128
{
129-
currentView = View.Login;
129+
currentView = LootLockerView.Login;
130130
}
131131

132132
GUILayout.EndArea();
@@ -169,13 +169,13 @@ void DrawDeleteGameConfirmationView()
169169
if (GUILayout.Button("Yes", GUILayout.Height(40)))
170170
{
171171
DeleteGame();
172-
currentView = View.Loading;
172+
currentView = LootLockerView.Loading;
173173
}
174174
EditorGUILayout.EndHorizontal();
175175
EditorGUILayout.BeginHorizontal();
176176
if (GUILayout.Button("No", GUILayout.Height(40)))
177177
{
178-
currentView = View.Games;
178+
currentView = LootLockerView.Games;
179179
}
180180
EditorGUILayout.EndHorizontal();
181181
GUILayout.EndArea();
@@ -257,7 +257,7 @@ void DrawCreateGameView()
257257
steam_app_id = CreateGame_steamAppID.ToString()
258258
};
259259
CreateGame(cagr);
260-
currentView = View.Loading;
260+
currentView = LootLockerView.Loading;
261261
}
262262
EditorGUILayout.EndHorizontal();
263263
EditorGUILayout.BeginHorizontal();
@@ -283,7 +283,7 @@ public void CreateGame(LootLockerCreatingAGameRequest gameToCreate)
283283
else
284284
{
285285
Debug.LogError("failed to create game: " + response.Error);
286-
currentView = View.CreateGame;
286+
currentView = LootLockerView.CreateGame;
287287
}
288288
});
289289
}
@@ -312,7 +312,7 @@ private void SetCurrentGame(int id, bool setToDelete = false)
312312
activeGameID = id;
313313
if (!setToDelete)
314314
{
315-
currentView = View.Loading;
315+
currentView = LootLockerView.Loading;
316316
LootLockerSDKAdminManager.GetDetailedInformationAboutAGame(id.ToString(), (response) =>
317317
{
318318
if (response.success)
@@ -327,7 +327,7 @@ private void SetCurrentGame(int id, bool setToDelete = false)
327327
LootLockerConfig.current.apiKey = response.game.game_key;
328328
LootLockerConfig.current.gameID = response.game.id;
329329
}
330-
currentView = View.Menu;
330+
currentView = LootLockerView.Menu;
331331
}
332332
else
333333
{
@@ -338,7 +338,7 @@ private void SetCurrentGame(int id, bool setToDelete = false)
338338
}
339339
else
340340
{
341-
currentView = View.DeleteGameConfirmation;
341+
currentView = LootLockerView.DeleteGameConfirmation;
342342
}
343343
}
344344

0 commit comments

Comments
 (0)