diff --git a/.gitignore b/.gitignore
index bbf307cd06a4ef697e37e0d160c9d7c77d426996..49aab4c22e69fe2631c99aa4daa400042dd54ddb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,6 @@ sysinfo.txt
# Crashlytics generated file
crashlytics-build.properties
+
+# Ignore UserSettings
+UserSettings/
diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab
index d43d451585866c2a3fd8ef65c0d7caec0d610c8a..73df60a1997e6c8719c8dc112cbafde9a731199a 100644
--- a/Assets/Resources/Prefabs/Stage_Default.prefab
+++ b/Assets/Resources/Prefabs/Stage_Default.prefab
@@ -416,52 +416,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &592093370111763564
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5927928908429282872}
- - component: {fileID: 6627291364910449471}
- m_Layer: 0
- m_Name: Gadgets_Ctrl
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &5927928908429282872
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 592093370111763564}
- 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_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 5425053786450669704}
- m_Father: {fileID: 3020720017683626808}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6627291364910449471
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 592093370111763564}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8facb6dc22c179e4dbb235c2424b67ed, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- GobjWithGadgetManager: {fileID: 3273965976878555728}
--- !u!1 &693753037525017877
GameObject:
m_ObjectHideFlags: 0
@@ -2617,7 +2571,6 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6937359050101973495}
- - {fileID: 5927928908429282872}
- {fileID: 1768374258906171685}
- {fileID: 1369773514886496846}
- {fileID: 586557948663584533}
@@ -3007,7 +2960,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &6641148130129521298
Transform:
m_ObjectHideFlags: 0
@@ -3068,7 +3021,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &5425053786450669704
Transform:
m_ObjectHideFlags: 0
@@ -3089,8 +3042,8 @@ Transform:
- {fileID: 3762494270952703558}
- {fileID: 6641148130129521298}
- {fileID: 2859908493837151596}
- m_Father: {fileID: 5927928908429282872}
- m_RootOrder: 0
+ m_Father: {fileID: 6937359050101973495}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2507285066805743952
MonoBehaviour:
@@ -3223,7 +3176,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &8166679387450829066
Transform:
m_ObjectHideFlags: 0
@@ -3987,7 +3940,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &3762494270952703558
Transform:
m_ObjectHideFlags: 0
@@ -4128,7 +4081,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &4105687439234304546
Transform:
m_ObjectHideFlags: 0
@@ -5020,6 +4973,7 @@ Transform:
m_Children:
- {fileID: 251852623843673080}
- {fileID: 3020720018354060037}
+ - {fileID: 5425053786450669704}
m_Father: {fileID: 3020720017683626808}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5054,7 +5008,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &7878940557929590980
Transform:
m_ObjectHideFlags: 0
@@ -5337,7 +5291,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3020720017683626808}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6463982756482544070
MeshFilter:
@@ -6412,7 +6366,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3020720017683626808}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &6224554715553933154
AudioListener:
@@ -6564,7 +6518,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &2859908493837151596
Transform:
m_ObjectHideFlags: 0
@@ -6700,7 +6654,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &3020790976703627454
Transform:
m_ObjectHideFlags: 0
@@ -7419,7 +7373,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &6770741779227478201
Transform:
m_ObjectHideFlags: 0
@@ -9296,7 +9250,7 @@ PrefabInstance:
- target: {fileID: 788784678299909003, guid: 1a0e8fc4bd33d48489e21d111c3a57e4,
type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 788784678299909003, guid: 1a0e8fc4bd33d48489e21d111c3a57e4,
type: 3}
@@ -10074,7 +10028,7 @@ PrefabInstance:
- target: {fileID: 7813080457042928604, guid: 1a271a0b704fdc549825da0c1274d138,
type: 3}
propertyPath: m_RootOrder
- value: 6
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: 7813080457042928604, guid: 1a271a0b704fdc549825da0c1274d138,
type: 3}
@@ -10967,7 +10921,7 @@ PrefabInstance:
- target: {fileID: 7002030793187184893, guid: 8590393c51194934a95cdc2075fc4dec,
type: 3}
propertyPath: m_RootOrder
- value: 5
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 7002030793187184893, guid: 8590393c51194934a95cdc2075fc4dec,
type: 3}
diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity
index 0ef54f85080afb969849c5d1b39b204d10ffb7a4..b1070c728dddf76052116eb42f9ce9daddad596e 100644
--- a/Assets/Scenes/Worlds/RiverWorld.unity
+++ b/Assets/Scenes/Worlds/RiverWorld.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.4410865, g: 0.48984045, b: 0.5699203, a: 1}
+ m_IndirectSpecularColor: {r: 0.44100717, g: 0.4898312, b: 0.5698877, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -3876,7 +3876,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh25864
+ m_Name: pb_Mesh160148
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -59585,12 +59585,12 @@ PrefabInstance:
- target: {fileID: 3273965976878555728, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_Name
- value: Gadgets (standby)
+ value: Gadgets
objectReference: {fileID: 0}
- target: {fileID: 3273965976878555728, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 3351996022838931937, guid: b07552db700124a4680401e6fb94c186,
type: 3}
diff --git a/Assets/Scripts/GameObjectExtensions.cs b/Assets/Scripts/GameObjectExtensions.cs
index 1a482a803b2f235e61a50d58d52cdccdc77472a6..ff58889fd8c0969c5cba9e465b9204f392f89df2 100644
--- a/Assets/Scripts/GameObjectExtensions.cs
+++ b/Assets/Scripts/GameObjectExtensions.cs
@@ -1,25 +1,28 @@
+using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public static class GameObjectExtensions
{
- public static void UpdateTagActive(this GameObject root, string tag, bool enable)
- {
- for (int i = 0; i < root.transform.childCount; i++)
- {
- GameObject child = root.transform.GetChild(i).gameObject;
+ public static void SetActiveByTagRecursive(this GameObject root, string tag, bool enable)
+ => root.ForAllChildren(child => {
if (child.CompareTag(tag))
child.SetActive(enable);
else
- UpdateTagActive(child, tag, enable);
- }
- }
+ SetActiveByTagRecursive(child, tag, enable);
+ });
public static void DestroyAllChildren(this GameObject root)
+ => root.ForAllChildren(child => GameObject.Destroy(child));
+
+ public static void SetActiveAllChildren(this GameObject root, bool active)
+ => root.ForAllChildren(child => child.SetActive(active));
+
+ public static void ForAllChildren(this GameObject root, Action<GameObject> func_on_child)
{
for (int i = 0; i < root.transform.childCount; i++)
- GameObject.Destroy(root.transform.GetChild(i).gameObject);
+ func_on_child(root.transform.GetChild(i).gameObject);
}
public static GameObject GetNthChild(this GameObject root, IEnumerable<int> pos)
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs
index 78ee14834d954e188e1085605faa2eb5ca9fc059..b6a18f56c8b44bc46c4141f933af1ad03fe03fd7 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs
@@ -12,13 +12,13 @@ public class ParsingDictionary {
//TODO? get rid of this, use reflection? instead, if possible
//TODO: docu
public static Dictionary<string, Func<Scroll.ScrollFact, Fact>> parseFactDictionary = new Dictionary<string, Func<Scroll.ScrollFact, Fact>>() {
- {MMTURIs.Point, PointFact.parseFact},
- {MMTURIs.Metric, LineFact.parseFact},
- {MMTURIs.Angle, AngleFact.parseFact},
- {MMTURIs.LineType, RayFact.parseFact},
- {MMTURIs.OnLine, OnLineFact.parseFact},
+ { JSONManager.MMTURIs.Point, PointFact.parseFact},
+ { JSONManager.MMTURIs.Metric, LineFact.parseFact},
+ { JSONManager.MMTURIs.Angle, AngleFact.parseFact},
+ { JSONManager.MMTURIs.LineType, RayFact.parseFact},
+ { JSONManager.MMTURIs.OnLine, OnLineFact.parseFact},
//90Degree-Angle
- {MMTURIs.Eq, AngleFact.parseFact}
+ { JSONManager.MMTURIs.Eq, AngleFact.parseFact}
};
}
@@ -542,8 +542,8 @@ private void init(Vector3 P, Vector3 N)
};
//OMS constructor generates full URI
- MMTTerm tp = new OMS(MMTURIs.Point);
- MMTTerm df = new OMA(new OMS(MMTURIs.Tuple), arguments);
+ MMTTerm tp = new OMS(JSONManager.MMTURIs.Point);
+ MMTTerm df = new OMA(new OMS(JSONManager.MMTURIs.Tuple), arguments);
MMTSymbolDeclaration mmtDecl = new MMTSymbolDeclaration(this.Label, tp, df);
AddFactResponse.sendAdd(mmtDecl, out this._URI);
@@ -669,14 +669,14 @@ private void init(string pid1, string pid2)
MMTTerm lhs =
new OMA(
- new OMS(MMTURIs.Metric),
+ new OMS(JSONManager.MMTURIs.Metric),
new List<MMTTerm> {
new OMS(p1URI),
new OMS(p2URI)
}
);
- MMTTerm valueTp = new OMS(MMTURIs.RealLit);
+ MMTTerm valueTp = new OMS(JSONManager.MMTURIs.RealLit);
MMTTerm value = new OMF(v);
//see point label
@@ -790,8 +790,8 @@ private void init(string pid1, string pid2)
};
//OMS constructor generates full URI
- MMTTerm tp = new OMS(MMTURIs.LineType);
- MMTTerm df = new OMA(new OMS(MMTURIs.LineOf), arguments);
+ MMTTerm tp = new OMS(JSONManager.MMTURIs.LineType);
+ MMTTerm df = new OMA(new OMS(JSONManager.MMTURIs.LineOf), arguments);
MMTSymbolDeclaration mmtDecl = new MMTSymbolDeclaration(this.Label, tp, df);
AddFactResponse.sendAdd(mmtDecl, out this._URI);
@@ -911,11 +911,11 @@ private void init(string pid, string rid)
List<MMTTerm> outerArguments = new List<MMTTerm>
{
- new OMA(new OMS(MMTURIs.OnLine), innerArguments)
+ new OMA(new OMS(JSONManager.MMTURIs.OnLine), innerArguments)
};
//OMS constructor generates full URI
- MMTTerm tp = new OMA(new OMS(MMTURIs.Ded), outerArguments);
+ MMTTerm tp = new OMA(new OMS(JSONManager.MMTURIs.Ded), outerArguments);
MMTTerm df = null;
MMTSymbolDeclaration mmtDecl = new MMTSymbolDeclaration(this.Label, tp, df);
@@ -1169,11 +1169,11 @@ private float GetAngle()
private MMTDeclaration generate90DegreeAngleDeclaration(float val, string p1URI, string p2URI, string p3URI) {
MMTTerm argument = new OMA(
- new OMS(MMTURIs.Eq),
+ new OMS(JSONManager.MMTURIs.Eq),
new List<MMTTerm> {
- new OMS(MMTURIs.RealLit),
+ new OMS(JSONManager.MMTURIs.RealLit),
new OMA(
- new OMS(MMTURIs.Angle),
+ new OMS(JSONManager.MMTURIs.Angle),
new List<MMTTerm> {
new OMS(p1URI),
new OMS(p2URI),
@@ -1183,8 +1183,8 @@ private MMTDeclaration generate90DegreeAngleDeclaration(float val, string p1URI,
new OMF(val) // 90f
}
);
-
- MMTTerm tp = new OMA(new OMS(MMTURIs.Ded), new List<MMTTerm> {argument});
+
+ MMTTerm tp = new OMA(new OMS(JSONManager.MMTURIs.Ded), new List<MMTTerm> { argument });
MMTTerm df = null;
return new MMTSymbolDeclaration(this.Label, tp, df);
@@ -1202,7 +1202,7 @@ private MMTDeclaration generateNot90DegreeAngleDeclaration(float val, string p1U
{
MMTTerm lhs =
new OMA(
- new OMS(MMTURIs.Angle),
+ new OMS(JSONManager.MMTURIs.Angle),
new List<MMTTerm> {
new OMS(p1URI),
new OMS(p2URI),
@@ -1210,7 +1210,7 @@ private MMTDeclaration generateNot90DegreeAngleDeclaration(float val, string p1U
}
);
- MMTTerm valueTp = new OMS(MMTURIs.RealLit);
+ MMTTerm valueTp = new OMS(JSONManager.MMTURIs.RealLit);
MMTTerm value = new OMF(val);
return new MMTValueDeclaration(this.Label, lhs, valueTp, value);
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/AngleTool.cs b/Assets/Scripts/InteractionEngine/Gadgets/AngleTool.cs
index e037236a891b5dd09f939c57c56a5d9a0b7b79e2..0a345a00bbef62f8f5a70c6a153965352d03df8d 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/AngleTool.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/AngleTool.cs
@@ -44,9 +44,6 @@ public override void _OnDisable()
public override void _OnHit(RaycastHit hit)
{
- if (!GadgetCanBeUsed) return;
- if (!isActiveAndEnabled) return;
-
if (hit.transform.gameObject.layer == LayerMask.NameToLayer("Point"))
{
PointFact tempFact = (PointFact)StageStatic.stage.factState[hit.transform.GetComponent<FactObject>().URI];
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs b/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs
index f7ca3e68ccb00ceaa0c22320a8627c469057d211..452f268b328225fdcccf1951eecb3b6dfc125f6e 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs
@@ -41,7 +41,7 @@ void Awake()
if (Cursor == null)
Cursor = GameObject.FindObjectOfType<WorldCursor>();
- CommunicationEvents.TriggerEvent.AddListener(_OnHit);
+ CommunicationEvents.TriggerEvent.AddListener(OnHit);
_Awake();
}
@@ -61,6 +61,9 @@ void OnDisable()
public void OnHit (RaycastHit hit)
{
+ if (!CommunicationEvents.GadgetCanBeUsed || !this.isActiveAndEnabled)
+ return;
+
_OnHit(hit);
}
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/GadgetManager.cs b/Assets/Scripts/InteractionEngine/Gadgets/GadgetManager.cs
index 50004bf88d93c068732f48ee50f45b42e6578b0d..f112dc3c4aa351f4f6b8b2862ca09566cd86aa89 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/GadgetManager.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/GadgetManager.cs
@@ -13,19 +13,14 @@ public class GadgetManager : MonoBehaviour
// Start is called before the first frame update
void Start()
{
- //Debug.Log("Start");
if (FrameITUIversion_ID == UIconfig.FrameITUIversion)
- {
- Start2();
- }
+ Start2();
}
void Start2()
{
-
-
CommunicationEvents.ToolModeChangedEvent.AddListener(OnToolModeChanged);
- gadgets = GetComponentsInChildren<Gadget>();
+ gadgets = GetComponentsInChildren<Gadget>(includeInactive: true);
for (int i = 0; i < gadgets.Length; i++)
{
@@ -50,26 +45,16 @@ void Start2()
public void CreateButton(Gadget gadget)
{
+ if (UIconfig.FrameITUIversion == 2)
+ CreateButton2(gadget);
-
- if (UIconfig.FrameITUIversion == 1)
- {
+ else//if (UIconfig.FrameITUIversion == 1) // default
CreateButton1(gadget);
- }
- if (UIconfig.FrameITUIversion == 2)
- {
- CreateButton2(gadget);
- }
if (UIconfig.FrameITUIversion != 2 && UIconfig.FrameITUIversion != 1)
- {
print("GadgetManager: please select a valid UIconfig.FrameITUIversion, or add how to handle ");
- CreateButton1(gadget);
- }
}
-
-
public void CreateButton1(Gadget gadget)
{
var button = GameObject.Instantiate(GadgetButton);
@@ -111,8 +96,8 @@ public void CreateButton2(Gadget gadget)
public void OnToolModeChanged(int id)
{
activeGadget.gameObject.SetActive(false);
- activeGadget = gadgets[id];
- activeGadget.gameObject.SetActive(true);
+ (activeGadget = gadgets[id])
+ .gameObject.SetActive(true);
}
}
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/LineTool.cs b/Assets/Scripts/InteractionEngine/Gadgets/LineTool.cs
index 3945dd8ee3e779a397b2ffe99d3c330139352dee..cad8d42e0e6f9225a6fba9279f88ab56aaf73ea5 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/LineTool.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/LineTool.cs
@@ -35,8 +35,6 @@ public override void _OnDisable()
public override void _OnHit(RaycastHit hit)
{
- if (!GadgetCanBeUsed) return;
- if (!this.isActiveAndEnabled) return;
if (hit.transform.gameObject.layer == LayerMask.NameToLayer("Point"))
{
Fact tempFact = StageStatic.stage.factState[hit.transform.GetComponent<FactObject>().URI];
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/LotTool.cs b/Assets/Scripts/InteractionEngine/Gadgets/LotTool.cs
index 67b1aa3ca2c1fdca71ccdf8498ce6975df5017b9..e7f462c6ff4ff80e6b6a0f41fcf1a65d391a25fd 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/LotTool.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/LotTool.cs
@@ -50,9 +50,6 @@ void CreateRayAndAngles(string pidIntersectionPoint, string pidLotPoint, bool sa
pidIntersectionPoint, pidLotPoint, true);
}
- if (!GadgetCanBeUsed) return;
- if (!this.isActiveAndEnabled) return;
-
//If LotPoint is on baseLine
if (this.LotModeIsPointSelected && (hit.transform.gameObject.layer == LayerMask.NameToLayer("Default") || hit.transform.gameObject.layer == LayerMask.NameToLayer("Tree")))
{
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Pendulum.cs b/Assets/Scripts/InteractionEngine/Gadgets/Pendulum.cs
index 411a16673d5fce28bfce5fadb55dd09254bc2d02..21eb3d017dc978d89cb4ad1a5be08c9c278facb5 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/Pendulum.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/Pendulum.cs
@@ -33,10 +33,6 @@ public override void _OnDisable()
public override void _OnHit(RaycastHit hit)
{
-
- if (!GadgetCanBeUsed) return;
- if (!this.isActiveAndEnabled) return;
-
if (hit.transform.gameObject.layer == LayerMask.NameToLayer("Point"))
{
PointFact tempFact = StageStatic.stage.factState[hit.transform.GetComponent<FactObject>().URI] as PointFact;
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Pointer.cs b/Assets/Scripts/InteractionEngine/Gadgets/Pointer.cs
index 45d9f02fa26bc072cd89a23c9b00ff2a7be78f1d..5ef66da77bf3df9fff10017fde471df001a2c81e 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/Pointer.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/Pointer.cs
@@ -14,10 +14,6 @@ public override void _Awake()
public override void _OnHit(RaycastHit hit)
{
- if (!GadgetCanBeUsed) return;
-
- if (!this.isActiveAndEnabled) return;
-
var pid = FactManager.AddPointFact(hit).Id;
if (hit.transform.gameObject.layer == LayerMask.NameToLayer("Ray"))
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/PoleTool.cs b/Assets/Scripts/InteractionEngine/Gadgets/PoleTool.cs
index a95d945a08c2165b0d29b637bc3fbcc7243eb668..b64afdb1fe273813b1ae5df2ea0d4e37f128e12c 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/PoleTool.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/PoleTool.cs
@@ -37,11 +37,10 @@ public override void _OnDisable()
public override void _OnHit(RaycastHit hit)
{
-
- if (!GadgetCanBeUsed) return;
- if (!this.isActiveAndEnabled ||
- !Physics.Raycast(Cursor.transform.position + Vector3.up * (float)Math3d.vectorPrecission,
- Vector3.down, maxHeight + (float)Math3d.vectorPrecission, LayerMask.GetMask(new string[]{"Default", "Tree"})))
+ if (!Physics.Raycast(
+ Cursor.transform.position + Vector3.up * (float)Math3d.vectorPrecission
+ , Vector3.down, maxHeight + (float)Math3d.vectorPrecission
+ , LayerMask.GetMask(new string[]{"Default", "Tree"})))
return;
UpdateLineDrawing();
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Remover.cs b/Assets/Scripts/InteractionEngine/Gadgets/Remover.cs
index 69438a411b22e1e405e8b648c7b3b11f43d463d7..3d05fdae0c24568d82b2e822652774eb16800dd4 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/Remover.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/Remover.cs
@@ -18,11 +18,6 @@ public override void _OnEnable() { }
public override void _OnHit(RaycastHit hit)
{
-
- if (!GadgetCanBeUsed) return;
- if (!this.isActiveAndEnabled)
- return;
-
// TODO: ask/warn user to cascade
var hid = hit.transform.GetComponent<FactObject>().URI;
StageStatic.stage.factState.Remove(hid);
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs b/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs
index 273f96090c9fe7efb9dd3cf55c0bc8628d248fc1..698b556f94c42e2e1a0565f11d64ca5c19c9e741 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs
@@ -36,8 +36,6 @@ public override void _OnDisable()
public override void _OnHit(RaycastHit hit)
{
- if (!GadgetCanBeUsed) return;
- if (!this.isActiveAndEnabled) return;
if (hit.transform.gameObject.layer == LayerMask.NameToLayer("Point"))
{
Fact tempFact = StageStatic.stage.factState[hit.transform.GetComponent<FactObject>().URI];
diff --git a/Assets/Scripts/JSONManager.cs b/Assets/Scripts/JSONManager.cs
index a0df7e51260ac9f07b61918e3b9140f322e680f8..5c75e5ded434533311ccb5c95f347eb55a2b8def 100644
--- a/Assets/Scripts/JSONManager.cs
+++ b/Assets/Scripts/JSONManager.cs
@@ -3,25 +3,23 @@
using JsonSubTypes;
-public class MMTURICollection
-{
- public string Tuple = "http://gl.mathhub.info/MMT/LFX/Sigma?Symbols?Tuple";
- public string Point = "http://mathhub.info/MitM/core/geometry?3DGeometry?point";
- public string LineType = "http://mathhub.info/MitM/core/geometry?Geometry/Common?line_type";
- public string LineOf = "http://mathhub.info/MitM/core/geometry?Geometry/Common?lineOf";
- public string OnLine = "http://mathhub.info/MitM/core/geometry?Geometry/Common?onLine";
- public string Metric = "http://mathhub.info/MitM/core/geometry?Geometry/Common?metric";
- public string Angle = "http://mathhub.info/MitM/core/geometry?Geometry/Common?angle_between";
- public string Ded = "http://mathhub.info/MitM/Foundation?Logic?ded";
- public string Eq = "http://mathhub.info/MitM/Foundation?Logic?eq";
- public string Sketch = "http://mathhub.info/MitM/Foundation?InformalProofs?proofsketch";
- public string RealLit = "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit";
-}
-public static class JSONManager
+public static class JSONManager
{
- //could init the strings of MMTURIs with JSON or other settings file instead
- public static MMTURICollection MMTURIs = new MMTURICollection();
+ public static class MMTURIs
+ {
+ public const string Tuple = "http://gl.mathhub.info/MMT/LFX/Sigma?Symbols?Tuple";
+ public const string Point = "http://mathhub.info/MitM/core/geometry?3DGeometry?point";
+ public const string LineType = "http://mathhub.info/MitM/core/geometry?Geometry/Common?line_type";
+ public const string LineOf = "http://mathhub.info/MitM/core/geometry?Geometry/Common?lineOf";
+ public const string OnLine = "http://mathhub.info/MitM/core/geometry?Geometry/Common?onLine";
+ public const string Metric = "http://mathhub.info/MitM/core/geometry?Geometry/Common?metric";
+ public const string Angle = "http://mathhub.info/MitM/core/geometry?Geometry/Common?angle_between";
+ public const string Ded = "http://mathhub.info/MitM/Foundation?Logic?ded";
+ public const string Eq = "http://mathhub.info/MitM/Foundation?Logic?eq";
+ public const string Sketch = "http://mathhub.info/MitM/Foundation?InformalProofs?proofsketch";
+ public const string RealLit = "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit";
+ }
public class URI
{
diff --git a/Assets/Scripts/Loading/Stage.cs b/Assets/Scripts/Loading/Stage.cs
index 04f8469c4b6ad3b0702b5e2546c742f1d923fe55..d8e59ac784446a640ffb4018c88263cf1375f101 100644
--- a/Assets/Scripts/Loading/Stage.cs
+++ b/Assets/Scripts/Loading/Stage.cs
@@ -5,7 +5,7 @@
using UnityEngine;
using Newtonsoft.Json;
using static CommunicationEvents;
-
+using System;
public class Stage: IJSONsavable<Stage>
{
@@ -45,7 +45,9 @@ public class Stage: IJSONsavable<Stage>
[JsonIgnore, JSONsavable.JsonSeparate]
public SaveGame savegame = null;
- //public List<PlayerRecord> solution_approches = new();
+ public List<PlayerRecord> solution_approches = new();
+ public List<string> AllowedScrolls = new();
+ public List<Type> AllowedGadgets = new();
#region makros/shortcuts
diff --git a/Assets/Scripts/StageStatic.cs b/Assets/Scripts/StageStatic.cs
index 17087d00893376758995d1a93c5a580ff0df35f9..3bbb9f2250d993da020e698b28668e1e38f2d3a1 100644
--- a/Assets/Scripts/StageStatic.cs
+++ b/Assets/Scripts/StageStatic.cs
@@ -194,10 +194,10 @@ public static void SetMode(Mode mode, GameObject gameObject = null)
switch (StageStatic.mode = mode)
{
case Mode.Play:
- gameObject.UpdateTagActive("CreatorMode", false);
+ gameObject.SetActiveByTagRecursive("CreatorMode", false);
break;
case Mode.Create:
- gameObject.UpdateTagActive("CreatorMode", true);
+ gameObject.SetActiveByTagRecursive("CreatorMode", true);
break;
}
@@ -379,7 +379,7 @@ public static bool LoadInitStage(bool restore_session, GameObject gameObject = n
}
if(gameObject != null)
- gameObject.UpdateTagActive("DevelopingMode", mode == Mode.Create);
+ gameObject.SetActiveByTagRecursive("DevelopingMode", mode == Mode.Create);
SetMode(mode);
return true;
}
diff --git a/Assets/Scripts/UI/InGame/GadgetManagerDelay.cs b/Assets/Scripts/UI/InGame/GadgetManagerDelay.cs
deleted file mode 100644
index d910a27d37b20e6811f38ce09314e250ffc4cb87..0000000000000000000000000000000000000000
--- a/Assets/Scripts/UI/InGame/GadgetManagerDelay.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Collections;
-using System.Linq;
-using UnityEngine;
-using UnityEngine.UI;
-
-
-public class GadgetManagerDelay : MonoBehaviour
-{
-
- public GameObject GobjWithGadgetManager;
-
-
- void Start()
- {
- //GobjWithGadgetManager.GetComponent<GadgetManager>().enabled = true;
- //GobjWithGadgetManager.GetComponent<GadgetManager>().enabled = true;
- //GobjWithGadgetManager.GetComponent<Gadget>().enabled = true;
- //GobjWithGadgetManager.SetActive(true);
-
- StartCoroutine(DelayRoutine());
- }
-
- IEnumerator DelayRoutine()
- {
-
- yield return new WaitForSeconds(1);
- //Activate ButtonGeneration
- GobjWithGadgetManager.SetActive(true);
- //print("GadgetManagerSuccessfullDelayed");
- StopCoroutine(DelayRoutine());
- //print("Stopped:DelayRoutine()");
-
-
-
- }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/InGame/GadgetManagerDelay.cs.meta b/Assets/Scripts/UI/InGame/GadgetManagerDelay.cs.meta
deleted file mode 100644
index 2be5a8fffe9d10e99e74ec56af1c78f8956c7471..0000000000000000000000000000000000000000
--- a/Assets/Scripts/UI/InGame/GadgetManagerDelay.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8facb6dc22c179e4dbb235c2424b67ed
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/UI/InGame/InputUI_Ctrl_mobile.cs b/Assets/Scripts/UI/InGame/InputUI_Ctrl_mobile.cs
index cf0d7fcbd9cd6f1aba3eaa44d2e2f9e8a2fe1179..54a70988ef96e001838ce17d513bb7d675ebf616 100644
--- a/Assets/Scripts/UI/InGame/InputUI_Ctrl_mobile.cs
+++ b/Assets/Scripts/UI/InGame/InputUI_Ctrl_mobile.cs
@@ -26,28 +26,8 @@ public class InputUI_Ctrl_mobile : MonoBehaviour
public GameObject FrameITUI_mobile_GObj;
private int FrameITUIversion_temp =-1;
- void Start()
- {
- Update();
- }
-
- private void Update()
- {
- /*
- switch (UIconfig.FrameITUIversion)
- {
- case 1:
- toMouseUI();
- break;
- case 2:
- toMobileUI();
- break;
- }
- */
- }
void Awake()
{
-
switch (UIconfig.FrameITUIversion)
{
case 1:
@@ -57,7 +37,6 @@ void Awake()
toMobileUI();
break;
}
-
}
public void toMouseUI()
@@ -100,8 +79,7 @@ public void toMobileUI2()
/// </summary>
private void ClearUIC()
{
-
- for (int i = 0; i < myself_GObj.transform.childCount; i++)
+ for (int i = 0; i < myself_GObj.transform.childCount-1; i++) // -1: dont affect Gadgets
{
myself_GObj.transform.GetChild(i).gameObject.SetActive(false);
}
diff --git a/Assets/Scripts/UI/ToolModeSelector.cs b/Assets/Scripts/UI/ToolModeSelector.cs
index 59334fb11817760d65724048a8238ee051b4d2d1..93124053795701aec093fea5116c360aec3cd0bd 100644
--- a/Assets/Scripts/UI/ToolModeSelector.cs
+++ b/Assets/Scripts/UI/ToolModeSelector.cs
@@ -111,20 +111,20 @@ IEnumerator HideRoutine()
// Update is called once per frame
void Update()
{
- //Used for reactivating of the Hitboxes for the pointer Gadget
- if(GadgetFirstUse == 0)
- {
- int id1 = 1;
- Select(id1);
- GadgetFirstUse++;
- }
- if (GadgetFirstUse == 1)
- {
- int id0 = 0;
- Select(id0);
- GadgetFirstUse++;
-
- }
+ ////Used for reactivating of the Hitboxes for the pointer Gadget
+ //if(GadgetFirstUse == 0)
+ //{
+ // int id1 = 1;
+ // Select(id1);
+ // GadgetFirstUse++;
+ //}
+ //if (GadgetFirstUse == 1)
+ //{
+ // int id0 = 0;
+ // Select(id0);
+ // GadgetFirstUse++;
+
+ //}
if (initUpdate == true) {
Update2();
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
deleted file mode 100644
index 2f207849f510bace4da2f77d78a287820e1cd07d..0000000000000000000000000000000000000000
--- a/UserSettings/EditorUserSettings.asset
+++ /dev/null
@@ -1,67 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!162 &1
-EditorUserSettings:
- m_ObjectHideFlags: 0
- serializedVersion: 4
- m_ConfigSettings:
- RecentlyUsedSceneGuid-0:
- value: 57505505560608585a56557116730644404e4d7b7c7b7562787e4f66e4b1313e
- flags: 0
- RecentlyUsedSceneGuid-1:
- value: 05070d5f50535d5e0c0c5472427008444e4e1b2f7a7170622e784e37bab3636a
- flags: 0
- RecentlyUsedSceneGuid-2:
- value: 0709560454055c0d0c5e5c2444740b4413154a72792d22627c714963e0b6373d
- flags: 0
- RecentlyUsedSceneGuid-3:
- value: 0502505152005e020c0d0e2446275e44144f19287f707e362c7c4b60b2b9353c
- flags: 0
- RecentlyUsedScenePath-0:
- value: 22424703114646680e0b0227036c721518021d39630928343f162e27e3f22076f7e93ffdfe
- flags: 0
- RecentlyUsedScenePath-1:
- value: 22424703114646680e0b0227036c721518021d39631b32313f3d5326ece92021
- flags: 0
- RecentlyUsedScenePath-2:
- value: 22424703114646680e0b0227036c681f041b1c39631c3435281e1221eee47a2decee22f0
- flags: 0
- RecentlyUsedScenePath-3:
- value: 22424703114646680c031c2e1530103918070d3e6c1b3f23392c107cb3ae6776b2a819e7aa093c2e3c07e17c27310f2be0050518b9240438121cf80b1fdc1f1d05d717c909fb1e11db151980d813d8f7cc
- flags: 0
- RecentlyUsedScenePath-4:
- value: 22424703114646680e0b0227036c721518021d396304293129201334d1e33136e7a923e7ee2e26
- flags: 0
- RecentlyUsedScenePath-5:
- value: 22424703114646680e0b0227036c721518021d39631b32313f3d2e30f0e53136acf238e0f323
- flags: 0
- RecentlyUsedScenePath-6:
- value: 22424703114646680e0b0227036c721518021d39630527392304183df7e57a2decee22f0
- flags: 0
- RecentlyUsedScenePath-7:
- value: 22424703114646680e0b0227036c681f041b1c39631a2f26283b2a3cf0ec3076f7e93ffdfe
- flags: 0
- RecentlyUsedScenePath-8:
- value: 22424703114646680e0b0227036c721518021d3963042725232a151ee7ee213dacf238e0f323
- flags: 0
- UnityRemoteDevice:
- value: 225f4d46245b0d4902070862342649191512
- flags: 0
- vcSharedLogLevel:
- value: 0d5e400f0650
- flags: 0
- m_VCAutomaticAdd: 1
- m_VCDebugCom: 0
- m_VCDebugCmd: 0
- m_VCDebugOut: 0
- m_SemanticMergeMode: 2
- m_DesiredImportWorkerCount: 4
- m_StandbyImportWorkerCount: 2
- m_IdleImportWorkerShutdownDelay: 60000
- m_VCShowFailedCheckout: 1
- m_VCOverwriteFailedCheckoutAssets: 1
- m_VCProjectOverlayIcons: 1
- m_VCHierarchyOverlayIcons: 1
- m_VCOtherOverlayIcons: 1
- m_VCAllowAsyncUpdate: 1
- m_ArtifactGarbageCollection: 1
diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt
deleted file mode 100644
index a3aaca8698cb2c8d2d4bd97b2d795f77017cef53..0000000000000000000000000000000000000000
--- a/UserSettings/Layouts/default-2021.dwlt
+++ /dev/null
@@ -1,1093 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &1
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_PixelRect:
- serializedVersion: 2
- x: 2783
- y: 205
- width: 640
- height: 661
- m_ShowMode: 0
- m_Title: Build Settings
- m_RootView: {fileID: 4}
- m_MinSize: {x: 640, y: 601}
- m_MaxSize: {x: 4000, y: 4021}
- m_Maximized: 0
---- !u!114 &2
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_PixelRect:
- serializedVersion: 2
- x: 0
- y: 43
- width: 1920
- height: 1157
- m_ShowMode: 4
- m_Title: Game
- m_RootView: {fileID: 9}
- m_MinSize: {x: 875, y: 300}
- m_MaxSize: {x: 10000, y: 10000}
- m_Maximized: 1
---- !u!114 &3
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: BuildPlayerWindow
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 640
- height: 661
- m_MinSize: {x: 640, y: 580}
- m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 15}
- m_Panes:
- - {fileID: 15}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &4
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 3}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 640
- height: 661
- m_MinSize: {x: 640, y: 601}
- m_MaxSize: {x: 4000, y: 4021}
- vertical: 0
- controlID: 112
---- !u!114 &5
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 12}
- - {fileID: 6}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 30
- width: 1920
- height: 1107
- m_MinSize: {x: 300, y: 200}
- m_MaxSize: {x: 24288, y: 16192}
- vertical: 0
- controlID: 49
---- !u!114 &6
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 1484
- y: 0
- width: 436
- height: 1107
- m_MinSize: {x: 275, y: 50}
- m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 17}
- m_Panes:
- - {fileID: 17}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &7
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 561
- height: 659
- m_MinSize: {x: 201, y: 221}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 18}
- m_Panes:
- - {fileID: 18}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &8
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: ConsoleWindow
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 659
- width: 1484
- height: 448
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 21}
- m_Panes:
- - {fileID: 16}
- - {fileID: 21}
- m_Selected: 1
- m_LastSelected: 0
---- !u!114 &9
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 10}
- - {fileID: 5}
- - {fileID: 11}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1920
- height: 1157
- m_MinSize: {x: 875, y: 300}
- m_MaxSize: {x: 10000, y: 10000}
- m_UseTopView: 1
- m_TopViewHeight: 30
- m_UseBottomView: 1
- m_BottomViewHeight: 20
---- !u!114 &10
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1920
- height: 30
- m_MinSize: {x: 0, y: 0}
- m_MaxSize: {x: 0, y: 0}
- m_LastLoadedLayoutName:
---- !u!114 &11
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 1137
- width: 1920
- height: 20
- m_MinSize: {x: 0, y: 0}
- m_MaxSize: {x: 0, y: 0}
---- !u!114 &12
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 13}
- - {fileID: 8}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1484
- height: 1107
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 16192, y: 16192}
- vertical: 1
- controlID: 50
---- !u!114 &13
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 7}
- - {fileID: 14}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1484
- height: 659
- m_MinSize: {x: 200, y: 100}
- m_MaxSize: {x: 16192, y: 8096}
- vertical: 0
- controlID: 51
---- !u!114 &14
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: GameView
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 561
- y: 0
- width: 923
- height: 659
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 20}
- m_Panes:
- - {fileID: 19}
- - {fileID: 20}
- m_Selected: 1
- m_LastSelected: 0
---- !u!114 &15
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 640, y: 580}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Build Settings
- m_Image: {fileID: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 2783
- y: 205
- width: 640
- height: 640
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_TreeViewState:
- scrollPos: {x: 0, y: 0}
- m_SelectedIDs:
- m_LastClickedID: 0
- m_ExpandedIDs:
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 0}
- m_SearchString:
---- !u!114 &16
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 230, y: 250}
- m_MaxSize: {x: 10000, y: 10000}
- m_TitleContent:
- m_Text: Project
- m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000,
- type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: -1920
- y: 661
- width: 1483
- height: 378
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_SearchFilter:
- m_NameFilter:
- m_ClassNames: []
- m_AssetLabels: []
- m_AssetBundleNames: []
- m_VersionControlStates: []
- m_SoftLockControlStates: []
- m_ReferencingInstanceIDs:
- m_SceneHandles:
- m_ShowAllHits: 0
- m_SkipHidden: 0
- m_SearchArea: 1
- m_Folders:
- - Assets/Scripts/UI/NetwMenue
- m_Globs: []
- m_OriginalText:
- m_ViewMode: 1
- m_StartGridSize: 64
- m_LastFolders:
- - Assets/Scripts/UI/NetwMenue
- m_LastFoldersGridSize: -1
- m_LastProjectPath: C:\Users\o-s-r\Documents\fau\Projekt_KI\OHNELEER\fresh\UFrameIT
- m_LockTracker:
- m_IsLocked: 0
- m_FolderTreeState:
- scrollPos: {x: 0, y: 202}
- m_SelectedIDs: d2ee0000
- m_LastClickedID: 61138
- m_ExpandedIDs: 0000000072d4000074d4000076d4000078d400007ad400007cd400007ed4000080d4000082d4000084d4000086d4000088d400008ad400008cd400008ed4000090d4000092d4000094d4000096d4000098d400009ad400009cd40000
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 0}
- m_SearchString:
- m_CreateAssetUtility:
- m_EndAction: {fileID: 0}
- m_InstanceID: 0
- m_Path:
- m_Icon: {fileID: 0}
- m_ResourceFile:
- m_AssetTreeState:
- scrollPos: {x: 0, y: 0}
- m_SelectedIDs:
- m_LastClickedID: 0
- m_ExpandedIDs: 0000000072d4000074d4000076d4000078d400007ad400007cd400007ed4000080d4000082d4000084d4000086d4000088d400008ad400008cd400008ed4000090d4000092d4000094d4000096d4000098d400009ad400009cd40000
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 0}
- m_SearchString:
- m_CreateAssetUtility:
- m_EndAction: {fileID: 0}
- m_InstanceID: 0
- m_Path:
- m_Icon: {fileID: 0}
- m_ResourceFile:
- m_ListAreaState:
- m_SelectedInstanceIDs: 1c560d00
- m_LastClickedInstanceID: 874012
- m_HadKeyboardFocusLastEvent: 1
- m_ExpandedInstanceIDs: c6230000
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 0}
- m_CreateAssetUtility:
- m_EndAction: {fileID: 0}
- m_InstanceID: 0
- m_Path:
- m_Icon: {fileID: 0}
- m_ResourceFile:
- m_NewAssetIndexInList: -1
- m_ScrollPosition: {x: 0, y: 0}
- m_GridSize: 64
- m_SkipHiddenPackages: 0
- m_DirectoriesAreaWidth: 207
---- !u!114 &17
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 275, y: 50}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Inspector
- m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000,
- type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 1484
- y: 73
- width: 435
- height: 1086
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_ObjectsLockedBeforeSerialization: []
- m_InstanceIDsLockedBeforeSerialization:
- m_PreviewResizer:
- m_CachedPref: 160
- m_ControlHash: -371814159
- m_PrefName: Preview_InspectorPreview
- m_LastInspectedObjectInstanceID: -1
- m_LastVerticalScrollValue: 0
- m_GlobalObjectId:
- m_InspectorMode: 0
- m_LockTracker:
- m_IsLocked: 0
- m_PreviewWindow: {fileID: 0}
---- !u!114 &18
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Hierarchy
- m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000,
- type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 0
- y: 73
- width: 560
- height: 638
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_SceneHierarchy:
- m_TreeViewState:
- scrollPos: {x: 0, y: 0}
- m_SelectedIDs:
- m_LastClickedID: 0
- m_ExpandedIDs: f4b5ffff16b6ffff1cb6ffff4ab7ffff52b7ffff18c8ffff1cc8ffff0afbffff
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 7}
- m_SearchString:
- m_ExpandedScenes: []
- m_CurrenRootInstanceID: 0
- m_LockTracker:
- m_IsLocked: 0
- m_CurrentSortingName: TransformSorting
- m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &19
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Scene
- m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000,
- type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: -1326
- y: 98
- width: 858
- height: 441
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData:
- - dockPosition: 0
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: -101, y: -26}
- snapCorner: 3
- id: Tool Settings
- index: 0
- layout: 1
- - dockPosition: 0
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: -141, y: 149}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 1
- id: unity-grid-and-snap-toolbar
- index: 1
- layout: 1
- - dockPosition: 1
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: unity-scene-view-toolbar
- index: 0
- layout: 1
- - dockPosition: 1
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 1
- id: unity-search-toolbar
- index: 1
- layout: 1
- - dockPosition: 1
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Open Tile Palette
- index: 2
- layout: 4
- - dockPosition: 1
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Tilemap Focus
- index: 3
- layout: 4
- - dockPosition: 0
- containerId: overlay-container--left
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: unity-transform-toolbar
- index: 0
- layout: 2
- - dockPosition: 0
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 67.5, y: 86}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Orientation
- index: 0
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Light Settings
- index: 0
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Camera
- index: 1
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Cloth Constraints
- index: 2
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Cloth Collisions
- index: 3
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Navmesh Display
- index: 4
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Agent Display
- index: 5
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Obstacle Display
- index: 6
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Occlusion Culling
- index: 7
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Physics Debugger
- index: 8
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Scene Visibility
- index: 9
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Particles
- index: 10
- layout: 4
- m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
- m_Gizmos: 1
- m_OverrideSceneCullingMask: 6917529027641081856
- m_SceneIsLit: 1
- m_SceneLighting: 1
- m_2DMode: 0
- m_isRotationLocked: 0
- m_PlayAudio: 0
- m_AudioPlay: 0
- m_Position:
- m_Target: {x: 0, y: 0, z: 0}
- speed: 2
- m_Value: {x: 0, y: 0, z: 0}
- m_RenderMode: 0
- m_CameraMode:
- drawMode: 0
- name: Shaded
- section: Shading Mode
- m_ValidateTrueMetals: 0
- m_DoValidateTrueMetals: 0
- m_ExposureSliderValue: 0
- m_SceneViewState:
- m_AlwaysRefresh: 0
- showFog: 1
- showSkybox: 1
- showFlares: 1
- showImageEffects: 1
- showParticleSystems: 1
- showVisualEffectGraphs: 1
- m_FxEnabled: 1
- m_Grid:
- xGrid:
- m_Fade:
- m_Target: 0
- speed: 2
- m_Value: 0
- m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
- m_Pivot: {x: 0, y: 0, z: 0}
- m_Size: {x: 0, y: 0}
- yGrid:
- m_Fade:
- m_Target: 1
- speed: 2
- m_Value: 1
- m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
- m_Pivot: {x: 0, y: 0, z: 0}
- m_Size: {x: 1, y: 1}
- zGrid:
- m_Fade:
- m_Target: 0
- speed: 2
- m_Value: 0
- m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
- m_Pivot: {x: 0, y: 0, z: 0}
- m_Size: {x: 0, y: 0}
- m_ShowGrid: 1
- m_GridAxis: 1
- m_gridOpacity: 0.5
- m_Rotation:
- m_Target: {x: -0.03362025, y: 0.96576387, z: -0.19859657, w: -0.16349317}
- speed: 2
- m_Value: {x: -0.03362024, y: 0.9657635, z: -0.19859649, w: -0.16349311}
- m_Size:
- m_Target: 7.754022
- speed: 2
- m_Value: 7.754022
- m_Ortho:
- m_Target: 1
- speed: 2
- m_Value: 1
- m_CameraSettings:
- m_Speed: 1
- m_SpeedNormalized: 0.5
- m_SpeedMin: 0.001
- m_SpeedMax: 2
- m_EasingEnabled: 1
- m_EasingDuration: 0.4
- m_AccelerationEnabled: 1
- m_FieldOfViewHorizontalOrVertical: 60
- m_NearClip: 0.03
- m_FarClip: 10000
- m_DynamicClip: 1
- m_OcclusionCulling: 0
- m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
- m_LastSceneViewOrtho: 0
- m_ReplacementShader: {fileID: 0}
- m_ReplacementString:
- m_SceneVisActive: 1
- m_LastLockedObject: {fileID: 0}
- m_ViewIsLockedToObject: 0
---- !u!114 &20
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Game
- m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000,
- type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 561
- y: 73
- width: 921
- height: 638
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_SerializedViewNames: []
- m_SerializedViewValues: []
- m_PlayModeViewName: GameView
- m_ShowGizmos: 0
- m_TargetDisplay: 0
- m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
- m_TargetSize: {x: 1920, y: 1080}
- m_TextureFilterMode: 0
- m_TextureHideFlags: 61
- m_RenderIMGUI: 1
- m_EnterPlayModeBehavior: 0
- m_UseMipMap: 0
- m_VSyncEnabled: 0
- m_Gizmos: 0
- m_Stats: 0
- m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000
- m_ZoomArea:
- m_HRangeLocked: 0
- m_VRangeLocked: 0
- hZoomLockedByDefault: 0
- vZoomLockedByDefault: 0
- m_HBaseRangeMin: -960
- m_HBaseRangeMax: 960
- m_VBaseRangeMin: -540
- m_VBaseRangeMax: 540
- m_HAllowExceedBaseRangeMin: 1
- m_HAllowExceedBaseRangeMax: 1
- m_VAllowExceedBaseRangeMin: 1
- m_VAllowExceedBaseRangeMax: 1
- m_ScaleWithWindow: 0
- m_HSlider: 0
- m_VSlider: 0
- m_IgnoreScrollWheelUntilClicked: 0
- m_EnableMouseInput: 1
- m_EnableSliderZoomHorizontal: 0
- m_EnableSliderZoomVertical: 0
- m_UniformScale: 1
- m_UpDirection: 1
- m_DrawArea:
- serializedVersion: 2
- x: 0
- y: 21
- width: 921
- height: 617
- m_Scale: {x: 0.4796875, y: 0.4796875}
- m_Translation: {x: 460.5, y: 308.5}
- m_MarginLeft: 0
- m_MarginRight: 0
- m_MarginTop: 0
- m_MarginBottom: 0
- m_LastShownAreaInsideMargins:
- serializedVersion: 2
- x: -960
- y: -643.127
- width: 1920
- height: 1286.254
- m_MinimalGUI: 1
- m_defaultScale: 0.4796875
- m_LastWindowPixelSize: {x: 921, y: 638}
- m_ClearInEditMode: 1
- m_NoCameraWarning: 1
- m_LowResolutionForAspectRatios: 01000000000000000000
- m_XRRenderMode: 0
- m_RenderTexture: {fileID: 0}
---- !u!114 &21
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Console
- m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000,
- type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 0
- y: 732
- width: 1483
- height: 427
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings
deleted file mode 100644
index 9e26dfeeb6e641a33dae4961196235bdb965b21b..0000000000000000000000000000000000000000
--- a/UserSettings/Search.settings
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file