diff --git a/Assets/Fungus/Scripts/Commands/SavePoint.cs b/Assets/Fungus/Scripts/Commands/SavePoint.cs index e5979a2a..633d78ba 100644 --- a/Assets/Fungus/Scripts/Commands/SavePoint.cs +++ b/Assets/Fungus/Scripts/Commands/SavePoint.cs @@ -2,26 +2,33 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using UnityEngine.SceneManagement; -using System.Collections.Generic; namespace Fungus { - [CommandInfo("Variable", + [CommandInfo("Flow", "Save Point", "Creates a save point which can be saved to persistant storage and loaded again later.")] public class SavePoint : Command { + [Tooltip("A string key which identifies this save point. Must be unique in this scene.")] [SerializeField] protected string savePointKey; - [SerializeField] protected string savePointDescription; + [Tooltip("A short description of this save point.")] + [SerializeField] protected StringData savePointDescription; + [Tooltip("Resume execution from this command after loading a save point.")] [SerializeField] protected bool resumeFromHere = true; #region Public members + /// + /// A string key which identifies this save point. Must be unique in this scene. + /// public string SavePointKey { get { return savePointKey; } } + /// + /// Resume execution from this command after loading a save point. + /// public bool ResumeFromHere { get { return resumeFromHere; } } public override void OnEnter() @@ -34,7 +41,7 @@ namespace Fungus var saveManager = FungusManager.Instance.SaveManager; - saveManager.AddSavePoint(savePointKey, savePointDescription); + saveManager.AddSavePoint(savePointKey, savePointDescription.Value); Continue(); } @@ -46,7 +53,7 @@ namespace Fungus return "Error: Save Point Key not specified"; } - return savePointKey + " : " + savePointDescription; + return savePointKey + " : " + savePointDescription.Value; } public override Color GetButtonColor() diff --git a/Assets/Fungus/Scripts/Components/SaveManager.cs b/Assets/Fungus/Scripts/Components/SaveManager.cs index 1286e2fd..3cb35099 100644 --- a/Assets/Fungus/Scripts/Components/SaveManager.cs +++ b/Assets/Fungus/Scripts/Components/SaveManager.cs @@ -1,8 +1,10 @@ using UnityEngine; -using UnityEngine.SceneManagement; namespace Fungus { + /// + /// Manages the Save History (a list of Save Points). + /// public class SaveManager : MonoBehaviour { protected static SaveHistory saveHistory = new SaveHistory(); @@ -38,17 +40,29 @@ namespace Fungus #region Public members + /// + /// Returns the number of Save Points in the Save History. + /// public virtual int NumSavePoints { get { return saveHistory.NumSavePoints; } } + /// + /// Returns the current number of rewound Save Points in the Save History. + /// public virtual int NumRewoundSavePoints { get { return saveHistory.NumRewoundSavePoints; } } + /// + /// Writes the Save History to persistent storage. + /// public virtual void Save(string saveDataKey) { WriteSaveHistory(saveDataKey); SaveManagerSignals.DoGameSaved(saveDataKey); } - + + /// + /// Loads the Save History from persistent storage. + /// public void Load(string saveDataKey) { if (ReadSaveHistory(saveDataKey)) @@ -60,17 +74,26 @@ namespace Fungus } } + /// + /// Deletes a previously stored Save History from persistent storage. + /// public void Delete(string saveDataKey) { PlayerPrefs.DeleteKey(saveDataKey); PlayerPrefs.Save(); } + /// + /// Returns true if save data has previously been stored using this key. + /// public bool SaveDataExists(string saveDataKey) { return PlayerPrefs.HasKey(saveDataKey); } + /// + /// Creates a new Save Point using a key and description, and adds it to the Save History. + /// public virtual void AddSavePoint(string savePointKey, string savePointDescription) { saveHistory.AddSavePoint(savePointKey, savePointDescription); @@ -78,6 +101,9 @@ namespace Fungus SaveManagerSignals.DoSavePointAdded(savePointKey, savePointDescription); } + /// + /// Rewinds to the previous Save Point in the Save History and loads that Save Point. + /// public virtual void Rewind() { if (saveHistory.NumSavePoints > 0) @@ -87,6 +113,9 @@ namespace Fungus } } + /// + /// Fast forwards to the next rewound Save Point in the Save History and loads that Save Point. + /// public virtual void FastForward() { if (saveHistory.NumRewoundSavePoints > 0) @@ -96,6 +125,9 @@ namespace Fungus } } + /// + /// Deletes all Save Points in the Save History. + /// public virtual void ClearHistory() { saveHistory.Clear(); diff --git a/Assets/Fungus/Scripts/Components/SaveMenu.cs b/Assets/Fungus/Scripts/Components/SaveMenu.cs index 181bda09..4d50e301 100644 --- a/Assets/Fungus/Scripts/Components/SaveMenu.cs +++ b/Assets/Fungus/Scripts/Components/SaveMenu.cs @@ -1,33 +1,44 @@ using UnityEngine; using UnityEngine.UI; -using System.Collections; using System.Collections.Generic; using UnityEngine.SceneManagement; namespace Fungus { + /// + /// A singleton game object which displays a simple UI for the save system. + /// public class SaveMenu : MonoBehaviour { const string SaveDataKey = "save_data"; const string NewGameSavePointKey = "new_game"; + [Tooltip("On scene start, execute any Save Point Loaded event handlers which have the 'new_game' key")] [SerializeField] protected bool autoStartGame = true; + [Tooltip("Delete the save game data from disk when player restarts the game. Useful for testing, but best switched off for release builds.")] [SerializeField] protected bool restartDeletesSave = false; + [Tooltip("The CanvasGroup containing the save menu buttons")] [SerializeField] protected CanvasGroup saveMenuGroup; + [Tooltip("The button which hides / displays the save menu")] [SerializeField] protected Button saveMenuButton; + [Tooltip("The button which saves the save history to disk")] [SerializeField] protected Button saveButton; + [Tooltip("The button which loads the save history from disk")] [SerializeField] protected Button loadButton; + [Tooltip("The button which rewinds the save history to the previous save point.")] [SerializeField] protected Button rewindButton; + [Tooltip("The button which fast forwards the save history to the next save point.")] [SerializeField] protected Button forwardButton; + [Tooltip("The button which restarts the game.")] [SerializeField] protected Button restartButton; protected static bool saveMenuActive = false; @@ -58,6 +69,7 @@ namespace Fungus protected virtual void Start() { + // Assume that the first scene that contains the SaveMenu is also the scene to load on restart. startScene = SceneManager.GetActiveScene().name; var saveManager = FungusManager.Instance.SaveManager; @@ -101,7 +113,7 @@ namespace Fungus } /// - /// Warn if duplicate SavePointKeys are found. + /// Warns if duplicate SavePointKeys are found. /// protected void CheckSavePointKeys() { @@ -136,7 +148,7 @@ namespace Fungus } /// - /// Callback for restart scene load + /// Callback for the restart scene load /// protected void OnSceneLoaded(Scene scene, LoadSceneMode mode) { @@ -151,6 +163,10 @@ namespace Fungus #region Public methods + /// + /// Toggles the expanded / collapsed state of the save menu. + /// Uses a tween to fade the menu UI in and out. + /// public virtual void ToggleSaveMenu() { if (fadeTween != null) @@ -181,6 +197,9 @@ namespace Fungus saveMenuActive = !saveMenuActive; } + /// + /// Handler function called when the Save button is pressed. + /// public virtual void Save() { var saveManager = FungusManager.Instance.SaveManager; @@ -192,6 +211,9 @@ namespace Fungus } } + /// + /// Handler function called when the Load button is pressed. + /// public virtual void Load() { var saveManager = FungusManager.Instance.SaveManager; @@ -203,6 +225,9 @@ namespace Fungus } } + /// + /// Handler function called when the Rewind button is pressed. + /// public virtual void Rewind() { PlayClickSound(); @@ -214,7 +239,10 @@ namespace Fungus } } - public virtual void Forward() + /// + /// Handler function called when the Fast Forward button is pressed. + /// + public virtual void FastForward() { PlayClickSound(); @@ -225,6 +253,9 @@ namespace Fungus } } + /// + /// Handler function called when the Restart button is pressed. + /// public virtual void Restart() { if (string.IsNullOrEmpty(startScene)) diff --git a/Assets/Fungus/Scripts/Components/SaveGameObjects.cs b/Assets/Fungus/Scripts/Components/SavedObjects.cs similarity index 55% rename from Assets/Fungus/Scripts/Components/SaveGameObjects.cs rename to Assets/Fungus/Scripts/Components/SavedObjects.cs index 6fcb0670..c4a41f9d 100644 --- a/Assets/Fungus/Scripts/Components/SaveGameObjects.cs +++ b/Assets/Fungus/Scripts/Components/SavedObjects.cs @@ -3,13 +3,19 @@ using System.Collections.Generic; namespace Fungus { - [System.Serializable] - public class SaveGameObjects : MonoBehaviour + /// + /// Contains a list of game objects whose state will be saved for each Save Point. + /// + public class SavedObjects : MonoBehaviour { + [Tooltip("A list of Flowchart objects whose variables will be encoded in the save data. Boolean, Integer, Float and String variables are supported.")] [SerializeField] protected List flowcharts = new List(); #region Public methods + /// + /// Encodes the list of saved objects and adds it to a Save Point Data object. + /// public void Encode(SavePointData savePointData) { for (int i = 0; i < flowcharts.Count; i++) diff --git a/Assets/Fungus/Scripts/Components/SaveGameObjects.cs.meta b/Assets/Fungus/Scripts/Components/SavedObjects.cs.meta similarity index 76% rename from Assets/Fungus/Scripts/Components/SaveGameObjects.cs.meta rename to Assets/Fungus/Scripts/Components/SavedObjects.cs.meta index 293553be..ccf6cea5 100644 --- a/Assets/Fungus/Scripts/Components/SaveGameObjects.cs.meta +++ b/Assets/Fungus/Scripts/Components/SavedObjects.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: f9c00b58b03474e37b54a4b39ed6c8ee -timeCreated: 1480503989 +guid: 60d92858185944732937980806717234 +timeCreated: 1483972111 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Fungus/Scripts/SavePoints.meta b/Assets/Fungus/Scripts/SavePoints.meta deleted file mode 100644 index 9683f914..00000000 --- a/Assets/Fungus/Scripts/SavePoints.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 6bd8827dc9c254f3daa0a9b2672a7764 -folderAsset: yes -timeCreated: 1479213577 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Fungus/Scripts/SavePoints/FlowchartData.cs b/Assets/Fungus/Scripts/Utils/FlowchartData.cs similarity index 81% rename from Assets/Fungus/Scripts/SavePoints/FlowchartData.cs rename to Assets/Fungus/Scripts/Utils/FlowchartData.cs index 53d24c8f..25bc493c 100644 --- a/Assets/Fungus/Scripts/SavePoints/FlowchartData.cs +++ b/Assets/Fungus/Scripts/Utils/FlowchartData.cs @@ -1,9 +1,11 @@ using System.Collections.Generic; using UnityEngine; -using UnityEngine.SceneManagement; namespace Fungus { + /// + /// Serializable container for a string variable. + /// [System.Serializable] public class StringVar { @@ -18,6 +20,9 @@ namespace Fungus #endregion } + /// + /// Serializable container for an integer variable. + /// [System.Serializable] public class IntVar { @@ -32,6 +37,9 @@ namespace Fungus #endregion } + /// + /// Serializable container for a float variable. + /// [System.Serializable] public class FloatVar { @@ -46,6 +54,9 @@ namespace Fungus #endregion } + /// + /// Serializable container for a boolean variable. + /// [System.Serializable] public class BoolVar { @@ -60,6 +71,9 @@ namespace Fungus #endregion } + /// + /// Serializable container for encoding the state of a Flowchart's variables. + /// [System.Serializable] public class FlowchartData { @@ -71,12 +85,34 @@ namespace Fungus #region Public methods + /// + /// Gets or sets the name of the encoded Flowchart. + /// public string FlowchartName { get { return flowchartName; } set { flowchartName = value; } } + + /// + /// Gets or sets the list of encoded string variables. + /// public List StringVars { get { return stringVars; } set { stringVars = value; } } + + /// + /// Gets or sets the list of encoded integer variables. + /// public List IntVars { get { return intVars; } set { intVars = value; } } + + /// + /// Gets or sets the list of encoded float variables. + /// public List FloatVars { get { return floatVars; } set { floatVars = value; } } + + /// + /// Gets or sets the list of encoded boolean variables. + /// public List BoolVars { get { return boolVars; } set { boolVars = value; } } + /// + /// Encodes the data in a Flowchart into a structure that can be stored by the save system. + /// public static FlowchartData Encode(Flowchart flowchart) { var flowchartData = new FlowchartData(); @@ -131,6 +167,9 @@ namespace Fungus return flowchartData; } + /// + /// Decodes a FlowchartData object and uses it to restore the state of a Flowchart in the scene. + /// public static void Decode(FlowchartData flowchartData) { var go = GameObject.Find(flowchartData.FlowchartName); diff --git a/Assets/Fungus/Scripts/SavePoints/FlowchartData.cs.meta b/Assets/Fungus/Scripts/Utils/FlowchartData.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/SavePoints/FlowchartData.cs.meta rename to Assets/Fungus/Scripts/Utils/FlowchartData.cs.meta diff --git a/Assets/Fungus/Scripts/SavePoints/SaveHistory.cs b/Assets/Fungus/Scripts/Utils/SaveHistory.cs similarity index 63% rename from Assets/Fungus/Scripts/SavePoints/SaveHistory.cs rename to Assets/Fungus/Scripts/Utils/SaveHistory.cs index efd17657..edee9705 100644 --- a/Assets/Fungus/Scripts/SavePoints/SaveHistory.cs +++ b/Assets/Fungus/Scripts/Utils/SaveHistory.cs @@ -5,6 +5,9 @@ using UnityEngine.SceneManagement; namespace Fungus { + /// + /// The Save History is a list of previously created Save Points, sorted chronologically. + /// [System.Serializable] public class SaveHistory { @@ -21,10 +24,19 @@ namespace Fungus #region Public methods + /// + /// Returns the number of Save Points in the Save History. + /// public int NumSavePoints { get { return savePoints.Count; } } + /// + /// Returns the current number of rewound Save Points in the Save History. + /// public int NumRewoundSavePoints { get { return rewoundSavePoints.Count; } } + /// + /// Creates a new Save Point using a key and description, and adds it to the Save History. + /// public void AddSavePoint(string savePointKey, string savePointDescription) { string sceneName = SceneManager.GetActiveScene().name; @@ -32,6 +44,10 @@ namespace Fungus savePoints.Add(savePointData); } + /// + /// Rewinds to the previous Save Point in the Save History. + /// The latest Save Point is moved to a seperate list of rewound save points. + /// public void Rewind() { if (savePoints.Count > 0) @@ -41,6 +57,10 @@ namespace Fungus } } + /// + /// Fast forwards to the next Save Point in the Save History. + /// The most recently rewound Save Point is moved back to the main list of save points. + /// public void FastForward() { if (rewoundSavePoints.Count > 0) @@ -50,6 +70,9 @@ namespace Fungus } } + /// + /// Loads the latest Save Point. + /// public void LoadLatestSavePoint() { if (savePoints.Count > 0) @@ -59,12 +82,18 @@ namespace Fungus } } + /// + /// Clears all Save Points. + /// public void Clear() { savePoints.Clear(); rewoundSavePoints.Clear(); } + /// + /// Clears rewound Save Points only. The main Save Point list is not changed. + /// public void ClearRewoundSavePoints() { rewoundSavePoints.Clear(); diff --git a/Assets/Fungus/Scripts/SavePoints/SaveHistory.cs.meta b/Assets/Fungus/Scripts/Utils/SaveHistory.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/SavePoints/SaveHistory.cs.meta rename to Assets/Fungus/Scripts/Utils/SaveHistory.cs.meta diff --git a/Assets/Fungus/Scripts/SavePoints/SavePointData.cs b/Assets/Fungus/Scripts/Utils/SavePointData.cs similarity index 84% rename from Assets/Fungus/Scripts/SavePoints/SavePointData.cs rename to Assets/Fungus/Scripts/Utils/SavePointData.cs index 5734366e..df77a30e 100644 --- a/Assets/Fungus/Scripts/SavePoints/SavePointData.cs +++ b/Assets/Fungus/Scripts/Utils/SavePointData.cs @@ -4,6 +4,9 @@ using UnityEngine.SceneManagement; namespace Fungus { + /// + /// Serializable container for a Save Point. + /// [System.Serializable] public class SavePointData { @@ -83,16 +86,34 @@ namespace Fungus #region Public methods + /// + /// Gets or sets the unique key for the Save Point. + /// public string SavePointKey { get { return savePointKey; } set { savePointKey = value; } } + + /// + /// Gets or sets the description for the Save Point. + /// public string SavePointDescription { get { return savePointDescription; } set { savePointDescription = value; } } + + /// + /// Gets or sets the scene name associated with the Save Point. + /// public string SceneName { get { return sceneName; } set { sceneName = value; } } + + /// + /// Gets or sets the encoded Flowchart data for the Save Point. + /// public List FlowchartDatas { get { return flowchartDatas; } set { flowchartDatas = value; } } + /// + /// Encodes a new Save Point to data and converts it to JSON text format. + /// public static string Encode(string _savePointKey, string _savePointDescription, string _sceneName) { var savePointData = Create(_savePointKey, _savePointDescription, _sceneName); - var saveGameObjects = GameObject.FindObjectOfType(); + var saveGameObjects = GameObject.FindObjectOfType(); if (saveGameObjects == null) { Debug.LogWarning("Failed to find a SaveGameObjects in current scene"); @@ -105,6 +126,9 @@ namespace Fungus return JsonUtility.ToJson(savePointData, true); } + /// + /// Decodes a Save Point from JSON text format and loads it. + /// public static void Decode(string saveDataJSON) { tempSavePointData = JsonUtility.FromJson(saveDataJSON); diff --git a/Assets/Fungus/Scripts/SavePoints/SavePointData.cs.meta b/Assets/Fungus/Scripts/Utils/SavePointData.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/SavePoints/SavePointData.cs.meta rename to Assets/Fungus/Scripts/Utils/SavePointData.cs.meta diff --git a/Assets/FungusExamples/SaveGame/SaveExample.unity b/Assets/FungusExamples/SaveGame/SaveExample.unity index d746ad91..47f66eb2 100644 --- a/Assets/FungusExamples/SaveGame/SaveExample.unity +++ b/Assets/FungusExamples/SaveGame/SaveExample.unity @@ -1,15 +1,15 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + serializedVersion: 2 m_OcclusionBakeSettings: smallestOccluder: 5 smallestHole: 0.25 backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 @@ -79,27 +79,28 @@ NavMeshSettings: m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 + agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 agentSlope: 45 agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: 0.16666667 manualCellSize: 0 + cellSize: 0.16666667 + accuratePlacement: 0 m_NavMeshData: {fileID: 0} --- !u!1 &24276234 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 24276235} - - 222: {fileID: 24276237} - - 114: {fileID: 24276236} + - component: {fileID: 24276235} + - component: {fileID: 24276237} + - component: {fileID: 24276236} m_Layer: 5 m_Name: NameText m_TagString: Untagged @@ -117,10 +118,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 2135898993} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 586.5, y: -38.369995} @@ -172,12 +173,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 132162242} - - 222: {fileID: 132162245} - - 114: {fileID: 132162244} - - 114: {fileID: 132162243} + - component: {fileID: 132162242} + - component: {fileID: 132162245} + - component: {fileID: 132162244} + - component: {fileID: 132162243} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -195,10 +196,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 2135898993} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -178.5, y: 263.13} @@ -263,12 +264,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 180152, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 162867991} - - 222: {fileID: 162867994} - - 114: {fileID: 162867993} - - 114: {fileID: 162867992} + - component: {fileID: 162867991} + - component: {fileID: 162867994} + - component: {fileID: 162867993} + - component: {fileID: 162867992} m_Layer: 5 m_Name: Continue m_TagString: Untagged @@ -286,11 +287,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 2029004623} m_Father: {fileID: 2025975870} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -38.900024, y: 38.074993} @@ -384,15 +385,67 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 162867990} +--- !u!1001 &202469951 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 114272980009688704, guid: eae76c041b933476bbe9bdd4c3d80793, + type: 2} + propertyPath: flowcharts.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4704521519618994, guid: eae76c041b933476bbe9bdd4c3d80793, type: 2} + propertyPath: m_LocalPosition.x + value: 1079.5829 + objectReference: {fileID: 0} + - target: {fileID: 4704521519618994, guid: eae76c041b933476bbe9bdd4c3d80793, type: 2} + propertyPath: m_LocalPosition.y + value: 593.8655 + objectReference: {fileID: 0} + - target: {fileID: 4704521519618994, guid: eae76c041b933476bbe9bdd4c3d80793, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4704521519618994, guid: eae76c041b933476bbe9bdd4c3d80793, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4704521519618994, guid: eae76c041b933476bbe9bdd4c3d80793, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4704521519618994, guid: eae76c041b933476bbe9bdd4c3d80793, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4704521519618994, guid: eae76c041b933476bbe9bdd4c3d80793, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4704521519618994, guid: eae76c041b933476bbe9bdd4c3d80793, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114272980009688704, guid: eae76c041b933476bbe9bdd4c3d80793, + type: 2} + propertyPath: flowcharts.Array.data[0] + value: + objectReference: {fileID: 1889213476} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: eae76c041b933476bbe9bdd4c3d80793, type: 2} + m_IsPrefabParent: 0 --- !u!1 &397720777 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 397720779} - - 114: {fileID: 397720778} + - component: {fileID: 397720779} + - component: {fileID: 397720778} m_Layer: 0 m_Name: _FungusState m_TagString: Untagged @@ -421,20 +474,20 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &659497557 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 659497560} - - 114: {fileID: 659497559} - - 114: {fileID: 659497558} + - component: {fileID: 659497560} + - component: {fileID: 659497559} + - component: {fileID: 659497558} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -483,10 +536,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &661260494 Prefab: m_ObjectHideFlags: 0 @@ -584,6 +637,156 @@ Prefab: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 224000012150207008, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000012150207008, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000012150207008, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 21.630001 + objectReference: {fileID: 0} + - target: {fileID: 224000012150207008, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000012150207008, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_SizeDelta.x + value: 43.260002 + objectReference: {fileID: 0} + - target: {fileID: 224000012150207008, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013898185038, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000013898185038, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000013898185038, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 64.89 + objectReference: {fileID: 0} + - target: {fileID: 224000013898185038, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013898185038, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_SizeDelta.x + value: 43.260002 + objectReference: {fileID: 0} + - target: {fileID: 224000013898185038, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000012687811630, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000012687811630, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000012687811630, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 108.15001 + objectReference: {fileID: 0} + - target: {fileID: 224000012687811630, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000012687811630, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_SizeDelta.x + value: 43.260002 + objectReference: {fileID: 0} + - target: {fileID: 224000012687811630, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000012590701094, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000012590701094, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000012590701094, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 151.41 + objectReference: {fileID: 0} + - target: {fileID: 224000012590701094, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000012590701094, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_SizeDelta.x + value: 43.260002 + objectReference: {fileID: 0} + - target: {fileID: 224000012590701094, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013149320576, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000013149320576, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000013149320576, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 194.67001 + objectReference: {fileID: 0} + - target: {fileID: 224000013149320576, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013149320576, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_SizeDelta.x + value: 43.260002 + objectReference: {fileID: 0} + - target: {fileID: 224000013149320576, guid: bd2b99773f3e0489aae9f9b5053ad360, + type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: bd2b99773f3e0489aae9f9b5053ad360, type: 2} m_IsPrefabParent: 0 @@ -592,18 +795,18 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1011241900} - - 223: {fileID: 1011241899} - - 114: {fileID: 1011241898} - - 225: {fileID: 1011241897} - - 114: {fileID: 1011241896} - - 114: {fileID: 1011241895} - - 114: {fileID: 1011241894} - - 114: {fileID: 1011241893} - - 114: {fileID: 1011241892} - - 82: {fileID: 1011241891} + - component: {fileID: 1011241900} + - component: {fileID: 1011241899} + - component: {fileID: 1011241898} + - component: {fileID: 1011241897} + - component: {fileID: 1011241896} + - component: {fileID: 1011241895} + - component: {fileID: 1011241894} + - component: {fileID: 1011241893} + - component: {fileID: 1011241892} + - component: {fileID: 1011241891} m_Layer: 5 m_Name: SayDialog m_TagString: Untagged @@ -628,6 +831,7 @@ AudioSource: Loop: 0 Mute: 0 Spatialize: 0 + SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 MinDistance: 1 @@ -640,12 +844,14 @@ AudioSource: rolloffCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -656,7 +862,8 @@ AudioSource: panLevelCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -667,7 +874,8 @@ AudioSource: spreadCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -678,7 +886,8 @@ AudioSource: reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 @@ -845,70 +1054,28 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 2135898993} m_Father: {fileID: 0} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &1193374352 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1193374354} - - 114: {fileID: 1193374353} - m_Layer: 0 - m_Name: SaveGameObjects - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1193374353 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1193374352} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f9c00b58b03474e37b54a4b39ed6c8ee, type: 3} - m_Name: - m_EditorClassIdentifier: - flowcharts: - - {fileID: 1889213476} ---- !u!4 &1193374354 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1193374352} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1079.5829, y: 593.8655, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 --- !u!1 &1288505573 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1288505578} - - 20: {fileID: 1288505577} - - 92: {fileID: 1288505576} - - 124: {fileID: 1288505575} - - 81: {fileID: 1288505574} + - component: {fileID: 1288505578} + - component: {fileID: 1288505577} + - component: {fileID: 1288505576} + - component: {fileID: 1288505575} + - component: {fileID: 1288505574} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -980,29 +1147,29 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1889213469 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1889213477} - - 114: {fileID: 1889213476} - - 114: {fileID: 1889213475} - - 114: {fileID: 1889213474} - - 114: {fileID: 1889213481} - - 114: {fileID: 1889213480} - - 114: {fileID: 1889213479} - - 114: {fileID: 1889213478} - - 114: {fileID: 1889213473} - - 114: {fileID: 1889213472} - - 114: {fileID: 1889213471} - - 114: {fileID: 1889213470} + - component: {fileID: 1889213477} + - component: {fileID: 1889213476} + - component: {fileID: 1889213475} + - component: {fileID: 1889213474} + - component: {fileID: 1889213481} + - component: {fileID: 1889213480} + - component: {fileID: 1889213479} + - component: {fileID: 1889213478} + - component: {fileID: 1889213473} + - component: {fileID: 1889213472} + - component: {fileID: 1889213471} + - component: {fileID: 1889213470} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -1049,7 +1216,9 @@ MonoBehaviour: itemId: 14 indentLevel: 0 savePointKey: step 4 - savePointDescription: + savePointDescription: + stringRef: {fileID: 0} + stringVal: resumeFromHere: 1 --- !u!114 &1889213472 MonoBehaviour: @@ -1090,7 +1259,9 @@ MonoBehaviour: itemId: 12 indentLevel: 0 savePointKey: step 3 - savePointDescription: + savePointDescription: + stringRef: {fileID: 0} + stringVal: resumeFromHere: 1 --- !u!114 &1889213474 MonoBehaviour: @@ -1164,7 +1335,8 @@ MonoBehaviour: height: 922 selectedBlocks: - {fileID: 1889213475} - selectedCommands: [] + selectedCommands: + - {fileID: 1889213479} variables: [] description: stepPause: 0 @@ -1185,10 +1357,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1889213478 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1228,7 +1400,9 @@ MonoBehaviour: itemId: 10 indentLevel: 0 savePointKey: step 2 - savePointDescription: + savePointDescription: + stringRef: {fileID: 0} + stringVal: resumeFromHere: 1 --- !u!114 &1889213480 MonoBehaviour: @@ -1269,19 +1443,21 @@ MonoBehaviour: itemId: 8 indentLevel: 0 savePointKey: step 1 - savePointDescription: + savePointDescription: + stringRef: {fileID: 0} + stringVal: resumeFromHere: 1 --- !u!1 &2025975869 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 2025975870} - - 222: {fileID: 2025975873} - - 114: {fileID: 2025975872} - - 114: {fileID: 2025975871} + - component: {fileID: 2025975870} + - component: {fileID: 2025975873} + - component: {fileID: 2025975872} + - component: {fileID: 2025975871} m_Layer: 5 m_Name: StoryText m_TagString: Untagged @@ -1299,11 +1475,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 162867991} m_Father: {fileID: 2135898993} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.78700006} m_AnchoredPosition: {x: 3, y: 14.130005} @@ -1374,11 +1550,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 155030, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 2029004623} - - 222: {fileID: 2029004625} - - 114: {fileID: 2029004624} + - component: {fileID: 2029004623} + - component: {fileID: 2029004625} + - component: {fileID: 2029004624} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1396,10 +1572,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 162867991} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -1451,13 +1627,13 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 2135898993} - - 222: {fileID: 2135898992} - - 114: {fileID: 2135898991} - - 225: {fileID: 2135898990} - - 114: {fileID: 2135898989} + - component: {fileID: 2135898993} + - component: {fileID: 2135898992} + - component: {fileID: 2135898991} + - component: {fileID: 2135898990} + - component: {fileID: 2135898989} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -1553,13 +1729,13 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 24276235} - {fileID: 132162242} - {fileID: 2025975870} m_Father: {fileID: 1011241900} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -750.0001, y: 0} diff --git a/Assets/FungusExamples/SaveGame/SaveMenu.prefab b/Assets/FungusExamples/SaveGame/SaveMenu.prefab index e80ab344..d7046de4 100644 --- a/Assets/FungusExamples/SaveGame/SaveMenu.prefab +++ b/Assets/FungusExamples/SaveGame/SaveMenu.prefab @@ -16,11 +16,11 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000012272122410} - - 222: {fileID: 222000011100116716} - - 114: {fileID: 114000010632254224} + - component: {fileID: 224000012272122410} + - component: {fileID: 222000011100116716} + - component: {fileID: 114000010632254224} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -33,11 +33,11 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000013492386186} - - 222: {fileID: 222000013799985356} - - 114: {fileID: 114000010080207576} + - component: {fileID: 224000013492386186} + - component: {fileID: 222000013799985356} + - component: {fileID: 114000010080207576} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -50,12 +50,12 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000013898185038} - - 222: {fileID: 222000010789171018} - - 114: {fileID: 114000013665828214} - - 114: {fileID: 114000011771453486} + - component: {fileID: 224000013898185038} + - component: {fileID: 222000010789171018} + - component: {fileID: 114000013665828214} + - component: {fileID: 114000011771453486} m_Layer: 5 m_Name: LoadButton m_TagString: Untagged @@ -68,12 +68,12 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000012687811630} - - 222: {fileID: 222000010636408894} - - 114: {fileID: 114000014272909388} - - 114: {fileID: 114000012958020502} + - component: {fileID: 224000012687811630} + - component: {fileID: 222000010636408894} + - component: {fileID: 114000014272909388} + - component: {fileID: 114000012958020502} m_Layer: 5 m_Name: RestartButton m_TagString: Untagged @@ -86,11 +86,11 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000014030277060} - - 222: {fileID: 222000010984446676} - - 114: {fileID: 114000011947483722} + - component: {fileID: 224000014030277060} + - component: {fileID: 222000010984446676} + - component: {fileID: 114000011947483722} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -103,12 +103,12 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000012150207008} - - 222: {fileID: 222000013070489478} - - 114: {fileID: 114000011397682902} - - 114: {fileID: 114000010610974372} + - component: {fileID: 224000012150207008} + - component: {fileID: 222000013070489478} + - component: {fileID: 114000011397682902} + - component: {fileID: 114000010610974372} m_Layer: 5 m_Name: SaveButton m_TagString: Untagged @@ -121,14 +121,14 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000011191842766} - - 114: {fileID: 114000010566872590} - - 223: {fileID: 223000014176703286} - - 114: {fileID: 114000011070993724} - - 114: {fileID: 114000011308786264} - - 82: {fileID: 82000012749735044} + - component: {fileID: 224000011191842766} + - component: {fileID: 114000010566872590} + - component: {fileID: 223000014176703286} + - component: {fileID: 114000011070993724} + - component: {fileID: 114000011308786264} + - component: {fileID: 82000012749735044} m_Layer: 5 m_Name: SaveMenu m_TagString: Untagged @@ -141,14 +141,14 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000012525218478} - - 222: {fileID: 222000010752835546} - - 114: {fileID: 114000013144661380} - - 114: {fileID: 114000013844340798} - - 114: {fileID: 114000013850039374} - - 225: {fileID: 225000012423540070} + - component: {fileID: 224000012525218478} + - component: {fileID: 222000010752835546} + - component: {fileID: 114000013144661380} + - component: {fileID: 114000013844340798} + - component: {fileID: 114000013850039374} + - component: {fileID: 225000012423540070} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -161,11 +161,11 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000013719675004} - - 222: {fileID: 222000011515314216} - - 114: {fileID: 114000010615359398} + - component: {fileID: 224000013719675004} + - component: {fileID: 222000011515314216} + - component: {fileID: 114000010615359398} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -178,12 +178,12 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000012590701094} - - 222: {fileID: 222000012009353026} - - 114: {fileID: 114000013129043042} - - 114: {fileID: 114000013791261618} + - component: {fileID: 224000012590701094} + - component: {fileID: 222000012009353026} + - component: {fileID: 114000013129043042} + - component: {fileID: 114000013791261618} m_Layer: 5 m_Name: RewindButton m_TagString: Untagged @@ -196,11 +196,11 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000010035212648} - - 222: {fileID: 222000013564722444} - - 114: {fileID: 114000012893161026} + - component: {fileID: 224000010035212648} + - component: {fileID: 222000013564722444} + - component: {fileID: 114000012893161026} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -213,13 +213,13 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000013748593462} - - 222: {fileID: 222000010966400006} - - 114: {fileID: 114000012438047488} - - 114: {fileID: 114000012074514418} - - 114: {fileID: 114000010366395696} + - component: {fileID: 224000013748593462} + - component: {fileID: 222000010966400006} + - component: {fileID: 114000012438047488} + - component: {fileID: 114000012074514418} + - component: {fileID: 114000010366395696} m_Layer: 5 m_Name: SaveMenuButton m_TagString: Untagged @@ -232,12 +232,12 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 224000013149320576} - - 222: {fileID: 222000011280725060} - - 114: {fileID: 114000011862434686} - - 114: {fileID: 114000014122010370} + - component: {fileID: 224000013149320576} + - component: {fileID: 222000011280725060} + - component: {fileID: 114000011862434686} + - component: {fileID: 114000014122010370} m_Layer: 5 m_Name: FastForwardButton m_TagString: Untagged @@ -261,6 +261,7 @@ AudioSource: Loop: 0 Mute: 0 Spatialize: 0 + SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 MinDistance: 1 @@ -273,12 +274,14 @@ AudioSource: rolloffCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -289,7 +292,8 @@ AudioSource: panLevelCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -300,7 +304,8 @@ AudioSource: spreadCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -311,7 +316,8 @@ AudioSource: reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 @@ -1003,6 +1009,8 @@ MonoBehaviour: m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 --- !u!114 &114000013850039374 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1023,6 +1031,8 @@ MonoBehaviour: m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 --- !u!114 &114000014122010370 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1063,7 +1073,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114000010566872590} - m_MethodName: Forward + m_MethodName: FastForward m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1202,10 +1212,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 224000012590701094} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -1220,12 +1230,12 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 224000012525218478} - {fileID: 224000013748593462} m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -1240,11 +1250,11 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 224000012272122410} m_Father: {fileID: 224000012525218478} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -1259,10 +1269,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 224000012150207008} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -1277,7 +1287,6 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 224000012150207008} - {fileID: 224000013898185038} @@ -1286,6 +1295,7 @@ RectTransform: - {fileID: 224000013149320576} m_Father: {fileID: 224000011191842766} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -20, y: 0} @@ -1300,11 +1310,11 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 224000010035212648} m_Father: {fileID: 224000012525218478} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -1319,11 +1329,11 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 224000013719675004} m_Father: {fileID: 224000012525218478} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -1338,11 +1348,11 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 224000014030277060} m_Father: {fileID: 224000012525218478} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -1357,10 +1367,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 224000013898185038} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -1375,10 +1385,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 224000012687811630} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -1393,10 +1403,10 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 224000011191842766} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -1411,11 +1421,11 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 224000013492386186} m_Father: {fileID: 224000012525218478} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -1430,10 +1440,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 224000013149320576} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} diff --git a/Assets/FungusExamples/SaveGame/SavedObjects.prefab b/Assets/FungusExamples/SaveGame/SavedObjects.prefab new file mode 100644 index 00000000..c9f676c5 --- /dev/null +++ b/Assets/FungusExamples/SaveGame/SavedObjects.prefab @@ -0,0 +1,54 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1310974650352510} + m_IsPrefabParent: 1 +--- !u!1 &1310974650352510 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4704521519618994} + - component: {fileID: 114272980009688704} + m_Layer: 0 + m_Name: SavedObjects + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4704521519618994 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1310974650352510} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1079.5829, y: 593.8655, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &114272980009688704 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1310974650352510} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60d92858185944732937980806717234, type: 3} + m_Name: + m_EditorClassIdentifier: + flowcharts: [] diff --git a/Assets/FungusExamples/SaveGame/SavedObjects.prefab.meta b/Assets/FungusExamples/SaveGame/SavedObjects.prefab.meta new file mode 100644 index 00000000..4ae1a80a --- /dev/null +++ b/Assets/FungusExamples/SaveGame/SavedObjects.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eae76c041b933476bbe9bdd4c3d80793 +timeCreated: 1483972230 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/Libs.meta b/Assets/UnityTestTools/IntegrationTestsFramework/Libs.meta deleted file mode 100644 index 1b749751..00000000 --- a/Assets/UnityTestTools/IntegrationTestsFramework/Libs.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: e22ba039de7077c4aa95758ef723b803 -folderAsset: yes -timeCreated: 1445282049 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll b/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll deleted file mode 100644 index 161d2fdc..00000000 Binary files a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll and /dev/null differ diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll.meta b/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll.meta deleted file mode 100644 index a040b4f3..00000000 --- a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll.meta +++ /dev/null @@ -1,24 +0,0 @@ -fileFormatVersion: 2 -guid: 713231d47408a06408a45470c967bae8 -timeCreated: 1441797177 -licenseType: Store -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll b/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll deleted file mode 100644 index f55f7a5d..00000000 Binary files a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll and /dev/null differ diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll.meta b/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll.meta deleted file mode 100644 index 88805bdd..00000000 --- a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll.meta +++ /dev/null @@ -1,24 +0,0 @@ -fileFormatVersion: 2 -guid: 28fc22990733f8f4ea1137f15e363609 -timeCreated: 1441797177 -licenseType: Store -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/GuiHelper.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/GuiHelper.cs index 7c213ba0..a35327f3 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/GuiHelper.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/GuiHelper.cs @@ -3,10 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; -using Mono.Cecil; -using Mono.Cecil.Cil; -using Mono.Cecil.Mdb; -using Mono.Collections.Generic; using UnityEditor; using UnityEditorInternal; using UnityEngine; diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 057c661a..7016a0e2 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -38,22 +38,18 @@ GraphicsSettings: m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderSettings_Tier1: + m_TierSettings_Tier1: + renderingPath: 1 useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_ShaderSettings_Tier2: + m_TierSettings_Tier2: + renderingPath: 1 useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_ShaderSettings_Tier3: + m_TierSettings_Tier3: + renderingPath: 1 useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_BuildTargetShaderSettings: [] + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] m_LightmapStripping: 0 m_FogStripping: 0 m_LightmapKeepPlain: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 027070f2..66e05aa7 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 5.4.3f1 -m_StandardAssetsVersion: 0 +m_EditorVersion: 5.5.0f3 diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/UnityAdsSettings.asset deleted file mode 100644 index 224050ce..00000000 --- a/ProjectSettings/UnityAdsSettings.asset +++ /dev/null @@ -1,11 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!292 &1 -UnityAdsSettings: - m_ObjectHideFlags: 0 - m_Enabled: 0 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_EnabledPlatforms: 4294967295 - m_IosGameId: - m_AndroidGameId: diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 9b7a5783..2943e440 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -3,6 +3,14 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 + m_Enabled: 0 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: + CrashReportingSettings: + m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes + m_Enabled: 0 + m_CaptureEditorExceptions: 1 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 @@ -12,3 +20,10 @@ UnityConnectSettings: m_TestMode: 0 m_TestEventUrl: m_TestConfigUrl: + UnityAdsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_EnabledPlatforms: 4294967295 + m_IosGameId: + m_AndroidGameId: