Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

Revert FetchDatabaseStatic because it prevents builds

Browse Source
This commit is contained in:
craftwill 2023-07-22 01:32:22 -04:00
parent ecd32b09b8
commit fd22af5e65
8 changed files with 67 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Assets/Editor/DatabaseEditor.cs
View File

@ -3,6 +3,7 @@ using UnityEditor;
using UnityEngine;
using System.IO;
using System.Collections.Generic;
using UnityEngine.WSA;
[CustomEditor(typeof(Database))]
@ -16,7 +17,34 @@ public class DatabaseEditor : Editor
{
var targ = target as Database;
targ.FetchDatabase();
foreach (var folder in targ.Folders)
{
var path = AssetDatabase.GetAssetPath(folder);
foreach (var file in GetAllPaths(path))
{
var scriptableObject = AssetDatabase.LoadAssetAtPath<ScriptableObject>(file);
if (scriptableObject && !targ.ScriptableObjects.Contains(scriptableObject))
{
targ.ScriptableObjects.Add(scriptableObject);
}
var prefab = AssetDatabase.LoadAssetAtPath<GameObject>(file);
if (prefab && !targ.Prefabs.Contains(prefab))
{
targ.Prefabs.Add(prefab);
}
}
}
}
}
private static string[] GetAllPaths(string target)
{
var files = Directory.GetFiles(target).ToList();
foreach (var dir in Directory.GetDirectories(target))
{
files.AddRange(GetAllPaths(dir));
}
return files.ToArray();
}
}

38
Assets/Prefabs/LevelManager.prefab
View File

@ -46,7 +46,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c8f415d45fd9659408ac8c5ce2e96aba, type: 3}
m_Name:
m_EditorClassIdentifier:
firstLevel: {fileID: 11400000, guid: e715669e1ed4b294c82d07ac011e89bb, type: 2}
firstLevel: {fileID: 11400000, guid: a6e34739c9325da4cac4fbaea30d052c, type: 2}
--- !u!114 &3028288566889208749
MonoBehaviour:
m_ObjectHideFlags: 0
@ -65,20 +65,48 @@ MonoBehaviour:
- {fileID: 102900000, guid: 0ca30b5ca281be24bb62d7e48cc2bec8, type: 3}
- {fileID: 102900000, guid: 73ca1afa7b0f7dd4ea39f69cf74f8370, type: 3}
_prefabs:
- {fileID: 6962989255644195630, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
- {fileID: 6962989255644195630, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
- {fileID: 6962989255644195630, guid: 869a03bba705e8d4485aa73daad773dc, type: 3}
- {fileID: 1436362432952518814, guid: 8d56b160dedb7f84d830d749372fe8e8, type: 3}
- {fileID: 3028288566889208744}
- {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3}
- {fileID: 5531237550998824024, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
- {fileID: 6962989255644195630, guid: 9b40c232eddfd1b469bea688e3c970c0, type: 3}
- {fileID: 6962989255644195630, guid: e4a4754288971e949a74f90737193702, type: 3}
- {fileID: 6962989255644195630, guid: 02eb2d787f58e9943a0cb46d0b13e6b8, type: 3}
- {fileID: 5157279992115123224, guid: 85534a2d6c2add54d864073914646192, type: 3}
- {fileID: 6962989255644195630, guid: 8b50d9afb3bbd204d8dfea3d64f13fa2, type: 3}
- {fileID: 809914571062164693, guid: 5497dc5adfbe67341980c9d946816424, type: 3}
- {fileID: 4052934186652138539, guid: 8560e1f66d452b543a705c8a0f3e22fa, type: 3}
- {fileID: 3814095509541806390, guid: 9527f3a1482b90a48bb6c62acc70f986, type: 3}
- {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
- {fileID: 907652127959947826, guid: afc444040d3adcf45a882e4882521f5e, type: 3}
- {fileID: 4817988606444742093, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
- {fileID: 1893888152770301340, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3}
- {fileID: 3405186844740662670, guid: 074c072b696214a4ba44ff66e9a7d9a6, type: 3}
- {fileID: 6962989255644195630, guid: a2dc5d9672c10074fa9c35c12f6339c1, type: 3}
- {fileID: 6962989255644195630, guid: 484f0eca1c74ae34694692de56a36739, type: 3}
- {fileID: 6962989255644195630, guid: f20569b5452c2b341a95d656b7534b7e, type: 3}
_scriptableObjects:
- {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2}
- {fileID: 11400000, guid: 15606c8c503e8164fb69178aa7016f58, type: 2}
- {fileID: 11400000, guid: 7568f730b2ba3754297a7612452482e2, type: 2}
- {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2}
- {fileID: 11400000, guid: a19b3b6859986b449aac7484e064097a, type: 2}
- {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2}
- {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2}
- {fileID: 11400000, guid: 4aaf448680c7f8a438a9a5861c622a55, type: 2}
- {fileID: 11400000, guid: a6e34739c9325da4cac4fbaea30d052c, type: 2}
- {fileID: 11400000, guid: d37561e153d6a6448a03839488fdec5e, type: 2}
- {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2}
- {fileID: 11400000, guid: 4aaf448680c7f8a438a9a5861c622a55, type: 2}
- {fileID: 11400000, guid: e715669e1ed4b294c82d07ac011e89bb, type: 2}
- {fileID: 11400000, guid: 7a1313e5c16e74c4ba11a8114b9fd786, type: 2}
- {fileID: 11400000, guid: b501f7eea1fdfb843853bcba5b30533a, type: 2}
- {fileID: 11400000, guid: 0a9c94eb38c575948992453fc29bcede, type: 2}
- {fileID: 11400000, guid: ec229632b369eb746a30dbfafe3de373, type: 2}
- {fileID: 11400000, guid: 458348dd169e806459b7449b7e157d64, type: 2}
- {fileID: 11400000, guid: f5a11cb6d0d324b47b493042c7615112, type: 2}
- {fileID: 11400000, guid: a387250a316b97e43be83b85980101e1, type: 2}
- {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2}
- {fileID: 11400000, guid: 5f47d74ebc4a8fe439ac6a4fe9ec436f, type: 2}
--- !u!114 &-245230096461627285
MonoBehaviour:
m_ObjectHideFlags: 0

92
Assets/Scenes/Game.unity
View File

@ -783,98 +783,6 @@ PrefabInstance:
propertyPath: m_Name
value: LevelManager
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[0]
value:
objectReference: {fileID: 6962989255644195630, guid: 377c7275c0001cc47a6b8926ac57d573, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[1]
value:
objectReference: {fileID: 6962989255644195630, guid: 869a03bba705e8d4485aa73daad773dc, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[2]
value:
objectReference: {fileID: 6962989255644195630, guid: 9b40c232eddfd1b469bea688e3c970c0, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[3]
value:
objectReference: {fileID: 4052934186652138539, guid: 8560e1f66d452b543a705c8a0f3e22fa, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[4]
value:
objectReference: {fileID: 3814095509541806390, guid: 9527f3a1482b90a48bb6c62acc70f986, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[5]
value:
objectReference: {fileID: 5531237550998824024, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[6]
value:
objectReference: {fileID: 1436362432952518814, guid: 8d56b160dedb7f84d830d749372fe8e8, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[7]
value:
objectReference: {fileID: 5157279992115123224, guid: 85534a2d6c2add54d864073914646192, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[8]
value:
objectReference: {fileID: 3028288566889208744, guid: 02daecb0115395844b4932445d039051, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[9]
value:
objectReference: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[10]
value:
objectReference: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[11]
value:
objectReference: {fileID: 907652127959947826, guid: afc444040d3adcf45a882e4882521f5e, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[12]
value:
objectReference: {fileID: 6962989255644195630, guid: a2dc5d9672c10074fa9c35c12f6339c1, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[13]
value:
objectReference: {fileID: 6962989255644195630, guid: 484f0eca1c74ae34694692de56a36739, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _prefabs.Array.data[14]
value:
objectReference: {fileID: 6962989255644195630, guid: f20569b5452c2b341a95d656b7534b7e, type: 3}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _scriptableObjects.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _scriptableObjects.Array.data[7]
value:
objectReference: {fileID: 11400000, guid: 7568f730b2ba3754297a7612452482e2, type: 2}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _scriptableObjects.Array.data[8]
value:
objectReference: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _scriptableObjects.Array.data[9]
value:
objectReference: {fileID: 11400000, guid: a19b3b6859986b449aac7484e064097a, type: 2}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _scriptableObjects.Array.data[10]
value:
objectReference: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2}
- target: {fileID: 3028288566889208749, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: _scriptableObjects.Array.data[11]
value:
objectReference: {fileID: 11400000, guid: 458348dd169e806459b7449b7e157d64, type: 2}
- target: {fileID: 3028288566889208750, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: firstLevel
value:
objectReference: {fileID: 11400000, guid: a6e34739c9325da4cac4fbaea30d052c, type: 2}
- target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
propertyPath: m_RootOrder
value: 2

1
Assets/Scripts/Drag&Drop/DraggablePlaceholder.cs
View File

@ -1,4 +1,3 @@
using Codice.CM.Client.Differences;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

38
Assets/Scripts/General/Database.cs
View File

@ -4,7 +4,6 @@ using UnityEngine;
using System.Linq;
using System.IO;
using System;
using Unity.VisualScripting.YamlDotNet.Core.Tokens;
#if UNITY_EDITOR
using UnityEditor;
@ -27,43 +26,6 @@ public class Database : SingletonBehaviour<Database>
public const string TYPE = nameof(TYPE);
public void FetchDatabase()
{
foreach (var folder in Folders)
{
var path = AssetDatabase.GetAssetPath(folder);
foreach (var file in GetAllPaths(path))
{
var scriptableObject = AssetDatabase.LoadAssetAtPath<ScriptableObject>(file);
if (scriptableObject && !ScriptableObjects.Contains(scriptableObject))
{
ScriptableObjects.Add(scriptableObject);
}
var prefab = AssetDatabase.LoadAssetAtPath<GameObject>(file);
if (prefab && !Prefabs.Contains(prefab))
{
Prefabs.Add(prefab);
}
}
}
}
public static void FetchDatabaseStatic()
{
Instance.FetchDatabase();
}
private static string[] GetAllPaths(string target)
{
var files = Directory.GetFiles(target).ToList();
foreach (var dir in Directory.GetDirectories(target))
{
files.AddRange(GetAllPaths(dir));
}
return files.ToArray();
}
[Serializable]
public class DataList<T> : IEnumerable<T> where T : UnityEngine.Object
{

1
Assets/Scripts/LevelManager/LevelManager.cs
View File

@ -6,7 +6,6 @@ using UnityEngine;
using System.Linq;
using Newtonsoft.Json;
using System.IO;
using Codice.CM.Client.Differences.Merge;
/// <summary>
/// data class for containing everything level related

8
Assets/Scripts/LevelManager/LevelManagerScript.cs
View File

@ -4,14 +4,11 @@ using GatherAndDefend.LevelEditor;
public class LevelManagerScript : SingletonBehaviour<LevelManagerScript>
{
public Level firstLevel;
protected override void Awake()
private void Start()
{
DontDestroyOnLoad(gameObject);
if (!firstLevel) throw new System.Exception("there is no first level set in the level manager script");
Database.FetchDatabaseStatic();
int levelToLoadFromWorldMap = PlayerPrefs.GetInt("LevelToLoad", -1);
if (levelToLoadFromWorldMap != -1)
{
@ -19,9 +16,10 @@ public class LevelManagerScript : SingletonBehaviour<LevelManagerScript>
LevelManager.Instance.LoadLevel(lvlName, true);
return;
}
LevelManager.Instance.LoadLevel(firstLevel, true);
}
void Update()
{
LevelManager.Instance.UpdateLevel();

3
ProjectSettings/ProjectSettings.asset
View File

@ -135,7 +135,8 @@ PlayerSettings:
16:9: 1
Others: 1
bundleVersion: 1.0
preloadedAssets: []
preloadedAssets:
- {fileID: 11400000, guid: 2670dfbb5772b0248b8c8ccaa6470d9a, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1