浏览代码

Merge remote-tracking branch 'tech-mkt/main' into pr-bash

/UI
Ciro Continisio 3 年前
当前提交
2b80d7b3
共有 5 个文件被更改,包括 163 次插入2 次删除
  1. 4
      UOP1_Project/Assets/Scripts/SaveSystem/FileManager.cs
  2. 5
      UOP1_Project/Assets/Scripts/SaveSystem/SaveSystem.cs
  3. 2
      UOP1_Project/Assets/Scripts/SceneManagement/StartGame.cs
  4. 143
      UOP1_Project/Assets/Scripts/Editor/SOsQuickAccessToolWindow.cs
  5. 11
      UOP1_Project/Assets/Scripts/Editor/SOsQuickAccessToolWindow.cs.meta

4
UOP1_Project/Assets/Scripts/SaveSystem/FileManager.cs


}
catch (Exception e)
{
Debug.LogError($"Failed to write to {fullPath} with exception {e}");
//Debug.LogError($"Failed to write to {fullPath} with exception {e}");
return false;
}
}

}
catch (Exception e)
{
Debug.LogError($"Failed to read from {fullPath} with exception {e}");
//Debug.LogError($"Failed to read from {fullPath} with exception {e}");
result = "";
return false;
}

5
UOP1_Project/Assets/Scripts/SaveSystem/SaveSystem.cs


}
}
}
public void WriteEmptySaveFile()
{
FileManager.WriteToFile(saveFilename, "");
}
}

2
UOP1_Project/Assets/Scripts/SceneManagement/StartGame.cs


private void Start()
{
_hasSaveData = saveSystem.LoadSaveDataFromDisk();
if (_hasSaveData)
{
startText.text = "Continue";

{
if (!_hasSaveData)
{
saveSystem.WriteEmptySaveFile();
//Start new game
onPlayButtonPress.RaiseEvent(locationsToLoad, showLoadScreen);
}

143
UOP1_Project/Assets/Scripts/Editor/SOsQuickAccessToolWindow.cs


using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEditor;
class SOsQuickAccessToolWindow : EditorWindow
{
[Header("Editor Window Related")]
Vector2 scroll;
int selected;
[Header("SOs related")]
string[] assetSearchFolders;
List<string> SOTypes;
string[] objectsGUIDs;
string[] objectsPaths;
ScriptableObject[] objects;
string[] displayObjectsGUIDs;
List<string> displayObjectsPaths;
List<ScriptableObject> displayObjects;
private void OnEnable()
{
assetSearchFolders = new string[1];
assetSearchFolders[0] = "Assets/ScriptableObjects";
FindAllSOs();
FindDisplaySOs();
}
void OnFocus()
{
FindAllSOs();
FindDisplaySOs();
}
[MenuItem("Tools/SOs Quick Access Tool")]
private static void ShowWindow()
{
GetWindow<SOsQuickAccessToolWindow>("SOs Quick Access Tool");
}
void OnGUI()
{
GUILayout.Space(EditorGUIUtility.singleLineHeight * 0.5f);
GUILayout.BeginHorizontal();
DrawSOsPicker();
if (GUILayout.Button("Refresh All"))
{
FindAllSOs();
FindDisplaySOs();
}
GUILayout.EndHorizontal();
DrawSOsList();
}
void DrawSOsPicker()
{
EditorGUI.BeginChangeCheck();
selected = EditorGUILayout.Popup(GUIContent.none, selected, SOTypes.ToArray());
if (EditorGUI.EndChangeCheck())
{
FindDisplaySOs();
}
}
void DrawSOsList()
{
scroll = GUILayout.BeginScrollView(scroll);
for (int i = 0; i < displayObjectsGUIDs.Length; i++)
{
GUILayout.Label(i + 1 + ". " + displayObjects[i].name);
if (GUILayout.Button("Locate Quickly"))
{
EditorUtility.FocusProjectWindow();
EditorGUIUtility.PingObject(displayObjects[i]);
}
GUILayout.Space(EditorGUIUtility.singleLineHeight);
}
GUILayout.EndScrollView();
}
void FindAllSOs()
{
objectsGUIDs = AssetDatabase.FindAssets("t:ScriptableObject", assetSearchFolders) as string[];
objectsPaths = new string[objectsGUIDs.Length];
objects = new ScriptableObject[objectsGUIDs.Length];
SOTypes = new List<string>();
for (int i = 0; i < objectsGUIDs.Length; i++)
{
objectsPaths[i] = AssetDatabase.GUIDToAssetPath(objectsGUIDs[i]);
objects[i] = (ScriptableObject)AssetDatabase.LoadAssetAtPath(objectsPaths[i], typeof(ScriptableObject));
//Debug.Log(objectsGUIDs[i] + ": " + objectsPaths[i] + " - " + i);
}
for (int i = 0; i < objects.Length; i++)
{
if (SOTypes.IndexOf(objects[i].GetType().ToString()) == -1)
{
SOTypes.Add(objects[i].GetType().ToString());
}
}
}
void FindDisplaySOs()
{
if (displayObjects != null)
{
displayObjects.Clear();
}
if (displayObjectsPaths != null)
{
displayObjectsPaths.Clear();
}
string type = SOTypes[selected];
string queryString = "t:" + type;
displayObjectsGUIDs = AssetDatabase.FindAssets(queryString);
displayObjectsPaths = new List<string>(displayObjectsGUIDs.Length);
displayObjects = new List<ScriptableObject>(displayObjectsGUIDs.Length);
for (int i = 0; i < displayObjectsGUIDs.Length; i++)
{
displayObjectsPaths.Add(AssetDatabase.GUIDToAssetPath(displayObjectsGUIDs[i]));
displayObjects.Add(AssetDatabase.LoadAssetAtPath(displayObjectsPaths[i], typeof(ScriptableObject)) as ScriptableObject);
}
}
}

11
UOP1_Project/Assets/Scripts/Editor/SOsQuickAccessToolWindow.cs.meta


fileFormatVersion: 2
guid: ec8c662b7f1823b4799529408de198f3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存