diff --git a/.idea/.idea.BABA_YAGA/.idea/workspace.xml b/.idea/.idea.BABA_YAGA/.idea/workspace.xml
index 6db1079c..7cfc8b88 100644
--- a/.idea/.idea.BABA_YAGA/.idea/workspace.xml
+++ b/.idea/.idea.BABA_YAGA/.idea/workspace.xml
@@ -5,7 +5,45 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -98,6 +136,7 @@
1780826181670
+
diff --git a/Assets/All for one/TargetTrainingMiniGame/Scripts/vSendScore.cs b/Assets/All for one/TargetTrainingMiniGame/Scripts/vSendScore.cs
index a630f0b2..57f88679 100644
--- a/Assets/All for one/TargetTrainingMiniGame/Scripts/vSendScore.cs
+++ b/Assets/All for one/TargetTrainingMiniGame/Scripts/vSendScore.cs
@@ -9,7 +9,7 @@ public class vSendScore : MonoBehaviour
{
if (shooterScore == null)
{
- shooterScore = FindObjectOfType();
+ shooterScore = FindFirstObjectByType();
}
if (shooterScore != null)
diff --git a/Assets/Scenes/Main Scene.unity b/Assets/Scenes/Main Scene.unity
index 7d2624a0..decbe07d 100644
--- a/Assets/Scenes/Main Scene.unity
+++ b/Assets/Scenes/Main Scene.unity
@@ -185,75 +185,6 @@ MonoBehaviour:
m_EditorClassIdentifier: Assembly-CSharp::_PlayerDataManager
_Players:
_items: []
---- !u!1001 &51806460
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_LocalPosition.y
- value: 12.48
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_LocalPosition.z
- value: -16.72
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.7071067
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0.7071068
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 919132149155446097, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_Name
- value: Straight_Manhole_Up 1
- objectReference: {fileID: 0}
- - target: {fileID: 919132149155446097, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1788441690}
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
---- !u!4 &51806461 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e4cc6038906227b41bbab3e2f4906158, type: 3}
- m_PrefabInstance: {fileID: 51806460}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &200732282
GameObject:
m_ObjectHideFlags: 0
@@ -417,75 +348,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2207112960010484425, guid: fb7874830b9e56341bf88f2a1123c677, type: 3}
m_PrefabInstance: {fileID: 3886963620680427248}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &841412614
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_LocalPosition.y
- value: 11.84
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_LocalPosition.z
- value: -25.93
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.7071068
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0.70710677
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 919132149155446097, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_Name
- value: Dead_End_Manhole_Down
- objectReference: {fileID: 0}
- - target: {fileID: 919132149155446097, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1580015190}
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
---- !u!4 &841412615 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c7b8e72ff8d936143a810e1baa494428, type: 3}
- m_PrefabInstance: {fileID: 841412614}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &1142785471
GameObject:
m_ObjectHideFlags: 0
@@ -742,7 +604,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -10, z: 0}
- m_LocalScale: {x: 100, y: 1, z: 100}
+ m_LocalScale: {x: 50, y: 1, z: 50}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1313417867}
@@ -794,142 +656,6 @@ MonoBehaviour:
m_EditorClassIdentifier: Assembly-CSharp::Hallucinate.GameSetup.Maze.MazeRenderer
visualProfile: {fileID: 11400000, guid: 15b745b0bb979b84ea937c679ee0f1ed, type: 2}
floorHeight: 3.5
---- !u!1001 &1580015189
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 841412615}
- m_Modifications:
- - target: {fileID: -8679921383154817045, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- propertyPath: m_LocalPosition.y
- value: -12.12
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.70710677
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0.7071068
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 919132149155446097, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- propertyPath: m_Name
- value: Dead_Manhole_Up
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
---- !u!4 &1580015190 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3}
- m_PrefabInstance: {fileID: 1580015189}
- m_PrefabAsset: {fileID: 0}
---- !u!1001 &1788441689
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 51806461}
- m_Modifications:
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalScale.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalScale.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalScale.z
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalPosition.z
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 919132149155446097, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- propertyPath: m_Name
- value: Straight_Manhole_Down
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
---- !u!4 &1788441690 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0bcb8b5c17d1d3c4cab9ff76ce3b36bc, type: 3}
- m_PrefabInstance: {fileID: 1788441689}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &1997343488
GameObject:
m_ObjectHideFlags: 0
@@ -1113,259 +839,9 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fb7874830b9e56341bf88f2a1123c677, type: 3}
---- !u!1001 &5166543384961234755
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 2878949705306832448, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_Name
- value: Celling
- objectReference: {fileID: 0}
- - target: {fileID: 2878949705306832448, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3224512652964734202, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3224512652964734202, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3224512652964734202, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_LocalPosition.z
- value: -5.54
- objectReference: {fileID: 0}
- - target: {fileID: 3224512652964734202, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.70710313
- objectReference: {fileID: 0}
- - target: {fileID: 3224512652964734202, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_LocalRotation.x
- value: -8.6595606e-17
- objectReference: {fileID: 0}
- - target: {fileID: 3224512652964734202, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0.7071104
- objectReference: {fileID: 0}
- - target: {fileID: 3224512652964734202, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_LocalRotation.z
- value: 8.6595606e-17
- objectReference: {fileID: 0}
- - target: {fileID: 3224512652964734202, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3224512652964734202, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3224512652964734202, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3}
---- !u!1001 &6183881471858100781
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 8318903820966450222, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_Name
- value: Door
- objectReference: {fileID: 0}
- - target: {fileID: 8318903820966450222, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8663094307863400084, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_LocalPosition.x
- value: -5.166
- objectReference: {fileID: 0}
- - target: {fileID: 8663094307863400084, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8663094307863400084, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8663094307863400084, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8663094307863400084, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8663094307863400084, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8663094307863400084, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8663094307863400084, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8663094307863400084, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8663094307863400084, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 68e1706bd55181e4aad756a4b2f9782f, type: 3}
---- !u!1001 &7477006319521516329
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3804928350305649978, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3804928350305649978, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3804928350305649978, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_LocalPosition.z
- value: 4.75
- objectReference: {fileID: 0}
- - target: {fileID: 3804928350305649978, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3804928350305649978, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3804928350305649978, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3804928350305649978, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3804928350305649978, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3804928350305649978, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3804928350305649978, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4577348821146165120, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_Name
- value: Wall
- objectReference: {fileID: 0}
- - target: {fileID: 4577348821146165120, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3}
---- !u!1001 &8258928368180580295
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3589531372551451367, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3589531372551451367, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3589531372551451367, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3589531372551451367, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3589531372551451367, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3589531372551451367, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3589531372551451367, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3589531372551451367, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3589531372551451367, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3589531372551451367, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4223043221652826205, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_Name
- value: Floor
- objectReference: {fileID: 0}
- - target: {fileID: 4223043221652826205, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1997343489}
- {fileID: 1142785474}
- - {fileID: 841412614}
- - {fileID: 51806460}
- - {fileID: 8258928368180580295}
- - {fileID: 7477006319521516329}
- - {fileID: 6183881471858100781}
- - {fileID: 5166543384961234755}
diff --git a/Assets/Scripts/Audio/AudioDatabase.cs b/Assets/Scripts/Audio/AudioDatabase.cs
index 9a0fafa9..b5aae4a1 100644
--- a/Assets/Scripts/Audio/AudioDatabase.cs
+++ b/Assets/Scripts/Audio/AudioDatabase.cs
@@ -15,7 +15,7 @@ namespace Hallucinate.Audio
public AudioMixerGroup MixerGroup;
}
- [CreateAssetMenu(fileName = "AudioDatabase", menuName = "Hallucinate/Audio/Audio Database")]
+ [CreateAssetMenu(fileName = "AudioDatabase", menuName = "BABA_YAGA/Audio/Audio Database")]
public class AudioDatabase : ScriptableObject
{
[SerializeField] private List samples = new List();
diff --git a/Assets/Scripts/Camera/vThirdPersonCamera.cs b/Assets/Scripts/Camera/vThirdPersonCamera.cs
index f5c9d2a2..36b8df9c 100644
--- a/Assets/Scripts/Camera/vThirdPersonCamera.cs
+++ b/Assets/Scripts/Camera/vThirdPersonCamera.cs
@@ -17,7 +17,7 @@ namespace Invector.vCamera
{
if (_instance == null)
{
- _instance = GameObject.FindObjectOfType();
+ _instance = GameObject.FindFirstObjectByType();
//Tell unity not to destroy this object when loading a new scene!
//DontDestroyOnLoad(_instance.gameObject);
@@ -283,7 +283,7 @@ namespace Invector.vCamera
}
if (inputReader == null) inputReader = mainTarget.GetComponent();
- if (inputReader == null) inputReader = GameObject.FindObjectOfType();
+ if (inputReader == null) inputReader = GameObject.FindFirstObjectByType();
firstUpdated = true;
useSmooth = true;
diff --git a/Assets/Scripts/GameSetup/CharacterSetupSettings.cs b/Assets/Scripts/GameSetup/CharacterSetupSettings.cs
index e917be03..e3f0427b 100644
--- a/Assets/Scripts/GameSetup/CharacterSetupSettings.cs
+++ b/Assets/Scripts/GameSetup/CharacterSetupSettings.cs
@@ -2,7 +2,7 @@ using UnityEngine;
namespace OnlyScove.Scripts.GameSetup
{
- [CreateAssetMenu(fileName = "CharacterSetupSettings", menuName = "Setup/Character Setup Settings")]
+ [CreateAssetMenu(fileName = "CharacterSetupSettings", menuName = "BABA_YAGA/Setup/Character Setup Settings")]
public class CharacterSetupSettings : ScriptableObject
{
[Header("Movement Constraints")]
diff --git a/Assets/Scripts/GameSetup/GameSettings.cs b/Assets/Scripts/GameSetup/GameSettings.cs
index c5ee4b21..4b0315fd 100644
--- a/Assets/Scripts/GameSetup/GameSettings.cs
+++ b/Assets/Scripts/GameSetup/GameSettings.cs
@@ -2,7 +2,7 @@ using UnityEngine;
namespace OnlyScove.Scripts
{
- [CreateAssetMenu(fileName = "GameSettings", menuName = "Settings/GameSettings")]
+ [CreateAssetMenu(fileName = "GameSettings", menuName = "BABA_YAGA/Settings/GameSettings")]
public class GameSettings : ScriptableObject
{
[Header("Camera Settings")]
diff --git a/Assets/Scripts/GameSetup/Maze/MazeVisualProfile.cs b/Assets/Scripts/GameSetup/Maze/MazeVisualProfile.cs
index 524ac73c..d8f4a483 100644
--- a/Assets/Scripts/GameSetup/Maze/MazeVisualProfile.cs
+++ b/Assets/Scripts/GameSetup/Maze/MazeVisualProfile.cs
@@ -2,7 +2,7 @@ using UnityEngine;
namespace Hallucinate.GameSetup.Maze
{
- [CreateAssetMenu(fileName = "MazeVisualProfile", menuName = "Hallucinate/Maze/Visual Profile")]
+ [CreateAssetMenu(fileName = "MazeVisualProfile", menuName = "BABA_YAGA/Maze/Visual Profile")]
public class MazeVisualProfile : ScriptableObject
{
[Header("Rotation Offsets")]
diff --git a/Assets/Scripts/GameSetup/ObjectInteraction.cs b/Assets/Scripts/GameSetup/ObjectInteraction.cs
index 1f8d6350..151d85bd 100644
--- a/Assets/Scripts/GameSetup/ObjectInteraction.cs
+++ b/Assets/Scripts/GameSetup/ObjectInteraction.cs
@@ -1,6 +1,6 @@
using UnityEngine;
-[CreateAssetMenu(fileName = "ObjectInteraction", menuName = "Scriptable Objects/ObjectInteraction")]
+[CreateAssetMenu(fileName = "ObjectInteraction", menuName = "BABA_YAGA/Scriptable Objects/ObjectInteraction")]
public class ObjectInteraction : ScriptableObject
{
[Header("UI Settings")]
diff --git a/Assets/Scripts/Interaction/Item Manager/vInventory.cs b/Assets/Scripts/Interaction/Item Manager/vInventory.cs
index 5faaaa66..23347600 100644
--- a/Assets/Scripts/Interaction/Item Manager/vInventory.cs
+++ b/Assets/Scripts/Interaction/Item Manager/vInventory.cs
@@ -123,7 +123,7 @@ namespace Invector.vItemManager
canEquip = true;
// search for a StandaloneInputModule in the scene
- inputModule = FindObjectOfType();
+ inputModule = FindFirstObjectByType();
// if there is none, a new EventSystem is created
if (inputModule == null)
{
@@ -201,7 +201,7 @@ namespace Invector.vItemManager
protected virtual IEnumerator ReloadEquipment()
{
yield return new WaitForEndOfFrame();
- inputModule = FindObjectOfType();
+ inputModule = FindFirstObjectByType();
isOpen = true;
@@ -397,7 +397,7 @@ namespace Invector.vItemManager
}
else
{
- inputModule = FindObjectOfType();
+ inputModule = FindFirstObjectByType();
}
}
diff --git a/Assets/Scripts/Interaction/Item Manager/vItemCollectionDisplay.cs b/Assets/Scripts/Interaction/Item Manager/vItemCollectionDisplay.cs
index 798b2247..02bfd11d 100644
--- a/Assets/Scripts/Interaction/Item Manager/vItemCollectionDisplay.cs
+++ b/Assets/Scripts/Interaction/Item Manager/vItemCollectionDisplay.cs
@@ -14,7 +14,7 @@ namespace Invector.vItemManager
{
get
{
- if (instance == null) { instance = GameObject.FindObjectOfType(); }
+ if (instance == null) { instance = GameObject.FindFirstObjectByType(); }
return vItemCollectionDisplay.instance;
}
}
diff --git a/Assets/Scripts/Interaction/Item Manager/vItemListData.cs b/Assets/Scripts/Interaction/Item Manager/vItemListData.cs
index b86a4375..49be9e37 100644
--- a/Assets/Scripts/Interaction/Item Manager/vItemListData.cs
+++ b/Assets/Scripts/Interaction/Item Manager/vItemListData.cs
@@ -3,7 +3,7 @@ using UnityEngine;
namespace Invector.vItemManager
{
- [CreateAssetMenu(menuName = "Invector/Inventory/New Item List")]
+ [CreateAssetMenu(menuName = "BABA_YAGA/Invector/Inventory/New Item List")]
public class vItemListData : ScriptableObject
{
public List items = new List();
diff --git a/Assets/Scripts/Interaction/Item Manager/vJoystickMouseInput.cs b/Assets/Scripts/Interaction/Item Manager/vJoystickMouseInput.cs
index 3750d15a..135e5fa9 100644
--- a/Assets/Scripts/Interaction/Item Manager/vJoystickMouseInput.cs
+++ b/Assets/Scripts/Interaction/Item Manager/vJoystickMouseInput.cs
@@ -50,7 +50,7 @@ public class vJoystickMouseInput : BaseInput
{
base.Awake();
if (!inputModule)
- inputModule = FindObjectOfType();
+ inputModule = FindFirstObjectByType();
if (inputModule)
{
oldOverride = inputModule.inputOverride;
diff --git a/Assets/Scripts/Interaction/Item Manager/vLeaveDropItemExample.cs b/Assets/Scripts/Interaction/Item Manager/vLeaveDropItemExample.cs
index ef3aea49..e50c5b32 100644
--- a/Assets/Scripts/Interaction/Item Manager/vLeaveDropItemExample.cs
+++ b/Assets/Scripts/Interaction/Item Manager/vLeaveDropItemExample.cs
@@ -15,7 +15,7 @@ namespace Invector.vItemManager
private void vLeaveDropItensWindow(int windowID)
{
GUILayout.BeginVertical();
- itemManager = FindObjectOfType();
+ itemManager = FindFirstObjectByType();
if (itemManager)
{
diff --git a/Assets/Scripts/Player/CharacterController/Editor/vCreateMeleeCharacterEditor.cs b/Assets/Scripts/Player/CharacterController/Editor/vCreateMeleeCharacterEditor.cs
index 429897f8..50a4780d 100644
--- a/Assets/Scripts/Player/CharacterController/Editor/vCreateMeleeCharacterEditor.cs
+++ b/Assets/Scripts/Player/CharacterController/Editor/vCreateMeleeCharacterEditor.cs
@@ -260,7 +260,7 @@ namespace Invector.vMelee
if (useGameController)
{
GameObject gC = null;
- var gameController = FindObjectOfType();
+ var gameController = FindFirstObjectByType();
if (gameController == null)
{
gC = new GameObject("vGameController_Example");
diff --git a/Assets/Scripts/Player/CharacterController/vGameController.cs b/Assets/Scripts/Player/CharacterController/vGameController.cs
index b254cca2..ea46d7d1 100644
--- a/Assets/Scripts/Player/CharacterController/vGameController.cs
+++ b/Assets/Scripts/Player/CharacterController/vGameController.cs
@@ -172,7 +172,7 @@ namespace Invector
protected virtual void FindPlayer()
{
- var player = GameObject.FindObjectOfType();
+ var player = GameObject.FindFirstObjectByType();
if (player)
{
diff --git a/Assets/Scripts/Player/CharacterController/vHUDController.cs b/Assets/Scripts/Player/CharacterController/vHUDController.cs
index 8f87fa63..56d8c734 100644
--- a/Assets/Scripts/Player/CharacterController/vHUDController.cs
+++ b/Assets/Scripts/Player/CharacterController/vHUDController.cs
@@ -55,7 +55,7 @@ namespace Invector.vCharacterController
{
if (_instance == null)
{
- _instance = GameObject.FindObjectOfType();
+ _instance = GameObject.FindFirstObjectByType();
//Tell unity not to destroy this object when loading a new scene
//DontDestroyOnLoad(_instance.gameObject);
}
diff --git a/Assets/Scripts/Player/CharacterController/vInput.cs b/Assets/Scripts/Player/CharacterController/vInput.cs
index 42b442e4..072a2237 100644
--- a/Assets/Scripts/Player/CharacterController/vInput.cs
+++ b/Assets/Scripts/Player/CharacterController/vInput.cs
@@ -19,7 +19,7 @@ namespace Invector.vCharacterController
{
if (_instance == null)
{
- _instance = GameObject.FindObjectOfType();
+ _instance = GameObject.FindFirstObjectByType();
if (_instance == null)
{
_instance = new GameObject("vInputType").AddComponent();
diff --git a/Assets/Scripts/Player/CharacterController/vThirdPersonInput.cs b/Assets/Scripts/Player/CharacterController/vThirdPersonInput.cs
index 8176ba04..fb23d492 100644
--- a/Assets/Scripts/Player/CharacterController/vThirdPersonInput.cs
+++ b/Assets/Scripts/Player/CharacterController/vThirdPersonInput.cs
@@ -147,7 +147,7 @@ namespace Invector.vCharacterController
public virtual void FindCamera()
{
- var tpCameras = FindObjectsOfType();
+ var tpCameras = FindObjectsByType(FindObjectsSortMode.None);
if (tpCameras.Length > 1)
{
@@ -591,7 +591,7 @@ namespace Invector.vCharacterController
if (tpCamera == null)
{
- tpCamera = FindObjectOfType();
+ tpCamera = FindFirstObjectByType();
if (tpCamera == null)
{
return;
diff --git a/Assets/Scripts/Player/CharacterCreator/Script/Editor/vCreateBasicCharacterEditor.cs b/Assets/Scripts/Player/CharacterCreator/Script/Editor/vCreateBasicCharacterEditor.cs
index 3ba175cf..ca4ab5e3 100644
--- a/Assets/Scripts/Player/CharacterCreator/Script/Editor/vCreateBasicCharacterEditor.cs
+++ b/Assets/Scripts/Player/CharacterCreator/Script/Editor/vCreateBasicCharacterEditor.cs
@@ -235,7 +235,7 @@ namespace Invector.vCharacterController
if (useGameController)
{
GameObject gC = null;
- var gameController = FindObjectOfType();
+ var gameController = FindFirstObjectByType();
if (gameController == null)
{
gC = new GameObject("vGameController_Example");
diff --git a/Assets/Scripts/Player/Generic/BodySnapSystem/Scripts/vBodyStruct.cs b/Assets/Scripts/Player/Generic/BodySnapSystem/Scripts/vBodyStruct.cs
index 5d2e7f87..cdd74682 100644
--- a/Assets/Scripts/Player/Generic/BodySnapSystem/Scripts/vBodyStruct.cs
+++ b/Assets/Scripts/Player/Generic/BodySnapSystem/Scripts/vBodyStruct.cs
@@ -2,7 +2,7 @@
using System.Linq;
using UnityEngine;
-[CreateAssetMenu(menuName = "Invector/SnapBody/New Body Struct")]
+[CreateAssetMenu(menuName = "BABA_YAGA/Invector/SnapBody/New Body Struct")]
public class vBodyStruct : ScriptableObject
{
public List bones = new List();
diff --git a/Assets/Scripts/Player/Generic/Editor/InvectorDefineSymbolsManager.cs b/Assets/Scripts/Player/Generic/Editor/InvectorDefineSymbolsManager.cs
index 3293dc09..1af83095 100644
--- a/Assets/Scripts/Player/Generic/Editor/InvectorDefineSymbolsManager.cs
+++ b/Assets/Scripts/Player/Generic/Editor/InvectorDefineSymbolsManager.cs
@@ -18,7 +18,7 @@ namespace Invector.DefineSymbolsManager
public static void CreateDefinitions()
{
- string definesString = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
+ string definesString = PlayerSettings.GetScriptingDefineSymbols(UnityEditor.Build.NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup));
List allDefines = definesString.Split(';').ToList();
List allInvectorDefines = new List();
@@ -70,8 +70,8 @@ namespace Invector.DefineSymbolsManager
}
currentDefineSymbols.AddRange(targetDefineSymbols.Except(currentDefineSymbols));
if (needUpdate)
- PlayerSettings.SetScriptingDefineSymbolsForGroup(
- EditorUserBuildSettings.selectedBuildTargetGroup,
+ PlayerSettings.SetScriptingDefineSymbols(
+ UnityEditor.Build.NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup),
string.Join(";", currentDefineSymbols.ToArray()));
}
diff --git a/Assets/Scripts/Player/Generic/Editor/vInspectorSearchTool.cs b/Assets/Scripts/Player/Generic/Editor/vInspectorSearchTool.cs
index 7882b21f..7ddf280d 100644
--- a/Assets/Scripts/Player/Generic/Editor/vInspectorSearchTool.cs
+++ b/Assets/Scripts/Player/Generic/Editor/vInspectorSearchTool.cs
@@ -8,7 +8,7 @@ static class vInspectorSearchTool
{
// Editor.finishedDefaultHeaderGUI -= DrawInpectorSearchTool;
// Editor.finishedDefaultHeaderGUI += DrawInpectorSearchTool;
- Debug.LogWarning("vInspectorSearchTool: finishedDefaultHeaderGUI is deprecated/removed in Unity 6 and has been disabled.");
+ // Debug.LogWarning("vInspectorSearchTool: finishedDefaultHeaderGUI is deprecated/removed in Unity 6 and has been disabled.");
}
public static string search;
diff --git a/Assets/Scripts/Player/Generic/Editor/vInvectorIcon.cs b/Assets/Scripts/Player/Generic/Editor/vInvectorIcon.cs
index 43be519b..a4c65768 100644
--- a/Assets/Scripts/Player/Generic/Editor/vInvectorIcon.cs
+++ b/Assets/Scripts/Player/Generic/Editor/vInvectorIcon.cs
@@ -16,7 +16,7 @@ namespace Invector
}
static void ThirPersonCameraIcon(int instanceId, Rect selectionRect)
{
- GameObject go = EditorUtility.InstanceIDToObject(instanceId) as GameObject;
+ GameObject go = EditorUtility.EntityIdToObject(instanceId) as GameObject;
if (go == null) return;
var tpCamera = go.GetComponent();
@@ -25,7 +25,7 @@ namespace Invector
static void ThirdPersonControllerIcon(int instanceId, Rect selectionRect)
{
- GameObject go = EditorUtility.InstanceIDToObject(instanceId) as GameObject;
+ GameObject go = EditorUtility.EntityIdToObject(instanceId) as GameObject;
if (go == null) return;
var controller = go.GetComponent();
diff --git a/Assets/Scripts/Player/Generic/Triggers/vChangeCameraAngleTrigger.cs b/Assets/Scripts/Player/Generic/Triggers/vChangeCameraAngleTrigger.cs
index 92b4d102..da35c5b6 100644
--- a/Assets/Scripts/Player/Generic/Triggers/vChangeCameraAngleTrigger.cs
+++ b/Assets/Scripts/Player/Generic/Triggers/vChangeCameraAngleTrigger.cs
@@ -21,7 +21,7 @@ namespace Invector.vCamera
}
IEnumerator Start()
{
- tpCamera = FindObjectOfType();
+ tpCamera = FindFirstObjectByType();
var collider = GetComponent();
if (collider)
{
diff --git a/Assets/Scripts/Player/Generic/Utils/vMousePositionHandler.cs b/Assets/Scripts/Player/Generic/Utils/vMousePositionHandler.cs
index 3f4fae68..aa59553b 100644
--- a/Assets/Scripts/Player/Generic/Utils/vMousePositionHandler.cs
+++ b/Assets/Scripts/Player/Generic/Utils/vMousePositionHandler.cs
@@ -16,7 +16,7 @@ namespace Invector.vCharacterController
{
if (_instance == null)
{
- _instance = FindObjectOfType();
+ _instance = FindFirstObjectByType();
}
if (_instance == null)
diff --git a/Assets/Scripts/Player/IK/vWeaponIKAdjust.cs b/Assets/Scripts/Player/IK/vWeaponIKAdjust.cs
index 80ed7390..d84e884e 100644
--- a/Assets/Scripts/Player/IK/vWeaponIKAdjust.cs
+++ b/Assets/Scripts/Player/IK/vWeaponIKAdjust.cs
@@ -7,7 +7,7 @@ namespace Invector.vShooter
using IK;
using UnityEngine.Serialization;
- [CreateAssetMenu(menuName = "Invector/Shooter/New Weapon IK Adjust")]
+ [CreateAssetMenu(menuName = "BABA_YAGA/Invector/Shooter/New Weapon IK Adjust")]
public class vWeaponIKAdjust : ScriptableObject
{
public const string StandingState = "Standing";
diff --git a/Assets/Scripts/Player/IK/vWeaponIKAdjustList.cs b/Assets/Scripts/Player/IK/vWeaponIKAdjustList.cs
index d86dcf65..f1caace3 100644
--- a/Assets/Scripts/Player/IK/vWeaponIKAdjustList.cs
+++ b/Assets/Scripts/Player/IK/vWeaponIKAdjustList.cs
@@ -3,7 +3,7 @@ using UnityEngine;
namespace Invector.vShooter
{
- [CreateAssetMenu(menuName = "Invector/Shooter/New Weapon IK Adjust List")]
+ [CreateAssetMenu(menuName = "BABA_YAGA/Invector/Shooter/New Weapon IK Adjust List")]
public class vWeaponIKAdjustList : ScriptableObject
{
[vSeparator("Global Offsets for all Weapons Hand IK target")]
diff --git a/Assets/Scripts/Player/ImpactEffect/Scripts/CustomImpactEffects/vCustomImpactEffectSample.cs b/Assets/Scripts/Player/ImpactEffect/Scripts/CustomImpactEffects/vCustomImpactEffectSample.cs
index 9ce874e3..45a5484a 100644
--- a/Assets/Scripts/Player/ImpactEffect/Scripts/CustomImpactEffects/vCustomImpactEffectSample.cs
+++ b/Assets/Scripts/Player/ImpactEffect/Scripts/CustomImpactEffects/vCustomImpactEffectSample.cs
@@ -2,7 +2,7 @@
using UnityEngine;
namespace Invector.vShooter
{
- [CreateAssetMenu(menuName = "Invector/Shooter/Impact Effects/New Custom ImpactEffect", fileName = "CustomImpactEffect@")]
+ [CreateAssetMenu(menuName = "BABA_YAGA/Invector/Shooter/Impact Effects/New Custom ImpactEffect", fileName = "CustomImpactEffect@")]
public class vCustomImpactEffectSample : vImpactEffectBase
{
public enum Align
diff --git a/Assets/Scripts/Player/ImpactEffect/Scripts/vImpactEffect.cs b/Assets/Scripts/Player/ImpactEffect/Scripts/vImpactEffect.cs
index f717f3e9..fbe0ceca 100644
--- a/Assets/Scripts/Player/ImpactEffect/Scripts/vImpactEffect.cs
+++ b/Assets/Scripts/Player/ImpactEffect/Scripts/vImpactEffect.cs
@@ -2,7 +2,7 @@
using UnityEngine;
namespace Invector.vShooter
{
- [CreateAssetMenu(menuName = "Invector/Shooter/Impact Effects/New ImpactEffect", fileName = "ImpactEffect@")]
+ [CreateAssetMenu(menuName = "BABA_YAGA/Invector/Shooter/Impact Effects/New ImpactEffect", fileName = "ImpactEffect@")]
public class vImpactEffect : vImpactEffectBase
{
public List decals;
diff --git a/Assets/Scripts/Player/Shooter/Editor/vCreateShooterCharacterEditor.cs b/Assets/Scripts/Player/Shooter/Editor/vCreateShooterCharacterEditor.cs
index 6d49f5a6..0309c883 100644
--- a/Assets/Scripts/Player/Shooter/Editor/vCreateShooterCharacterEditor.cs
+++ b/Assets/Scripts/Player/Shooter/Editor/vCreateShooterCharacterEditor.cs
@@ -265,7 +265,7 @@ namespace Invector.vShooter
if (useGameController)
{
GameObject gC = null;
- var gameController = FindObjectOfType();
+ var gameController = FindFirstObjectByType();
if (gameController == null)
{
gC = new GameObject("vGameController_Example");
diff --git a/Assets/Scripts/Player/Shooter/vShooterManager.cs b/Assets/Scripts/Player/Shooter/vShooterManager.cs
index 4b008177..52da38e2 100644
--- a/Assets/Scripts/Player/Shooter/vShooterManager.cs
+++ b/Assets/Scripts/Player/Shooter/vShooterManager.cs
@@ -217,7 +217,7 @@ namespace Invector.vShooter
animator = GetComponent();
if (applyRecoilToCamera)
{
- tpCamera = FindObjectOfType();
+ tpCamera = FindFirstObjectByType();
}
ammoManager = GetComponent();
if (ammoManager != null)
diff --git a/Assets/Scripts/Player/Shooter/vShooterMeleeInput.cs b/Assets/Scripts/Player/Shooter/vShooterMeleeInput.cs
index eba7f4b8..1da72610 100644
--- a/Assets/Scripts/Player/Shooter/vShooterMeleeInput.cs
+++ b/Assets/Scripts/Player/Shooter/vShooterMeleeInput.cs
@@ -291,7 +291,7 @@ namespace Invector.vCharacterController
{
if (!_controlAimCanvas)
{
- _controlAimCanvas = FindObjectOfType();
+ _controlAimCanvas = FindFirstObjectByType();
if (_controlAimCanvas)
{
_controlAimCanvas.Init(cc);
@@ -1145,7 +1145,7 @@ namespace Invector.vCharacterController
if (tpCamera == null)
{
- tpCamera = FindObjectOfType();
+ tpCamera = FindFirstObjectByType();
if (tpCamera == null)
{
return;
diff --git a/Assets/Scripts/Player/ThrowSystem/Scripts/vThrowSettings.cs b/Assets/Scripts/Player/ThrowSystem/Scripts/vThrowSettings.cs
index 5d36f0a6..33f70c9b 100644
--- a/Assets/Scripts/Player/ThrowSystem/Scripts/vThrowSettings.cs
+++ b/Assets/Scripts/Player/ThrowSystem/Scripts/vThrowSettings.cs
@@ -1,7 +1,7 @@
using UnityEngine;
namespace Invector.Throw
{
- [CreateAssetMenu(menuName = "Invector/Throw/New ThrowSettings")]
+ [CreateAssetMenu(menuName = "BABA_YAGA/Invector/Throw/New ThrowSettings")]
public class vThrowSettings : ScriptableObject
{
[Tooltip("Align End point UP to surface normal direction")]
diff --git a/Assets/Scripts/Player/ThrowSystem/Scripts/vThrowVisualSettings.cs b/Assets/Scripts/Player/ThrowSystem/Scripts/vThrowVisualSettings.cs
index 02a08e03..59645eb9 100644
--- a/Assets/Scripts/Player/ThrowSystem/Scripts/vThrowVisualSettings.cs
+++ b/Assets/Scripts/Player/ThrowSystem/Scripts/vThrowVisualSettings.cs
@@ -1,7 +1,7 @@
using UnityEngine;
namespace Invector.Throw
{
- [CreateAssetMenu(menuName = "Invector/Throw/New ThrowVisualSettings")]
+ [CreateAssetMenu(menuName = "BABA_YAGA/Invector/Throw/New ThrowVisualSettings")]
public class vThrowVisualSettings : ScriptableObject
{
[vSeparator("Visual Line")]
diff --git a/Assets/Scripts/Player/Weapon/vBulletLifeSettings.cs b/Assets/Scripts/Player/Weapon/vBulletLifeSettings.cs
index 6d7d0f60..dea9ea1c 100644
--- a/Assets/Scripts/Player/Weapon/vBulletLifeSettings.cs
+++ b/Assets/Scripts/Player/Weapon/vBulletLifeSettings.cs
@@ -2,7 +2,7 @@
using UnityEngine;
namespace Invector.vShooter
{
- [CreateAssetMenu(menuName = "Invector/Shooter/New BulletLifeSettings")]
+ [CreateAssetMenu(menuName = "BABA_YAGA/Invector/Shooter/New BulletLifeSettings")]
public class vBulletLifeSettings : ScriptableObject
{
public List bulletLostLifeList;
diff --git a/Assets/Scripts/Player/Weapon/vShooterWeapon.cs b/Assets/Scripts/Player/Weapon/vShooterWeapon.cs
index 191f3c24..ba871986 100644
--- a/Assets/Scripts/Player/Weapon/vShooterWeapon.cs
+++ b/Assets/Scripts/Player/Weapon/vShooterWeapon.cs
@@ -233,8 +233,9 @@ namespace Invector.vShooter
onDisable.Invoke();
}
- protected virtual void Start()
+ protected override void Start()
{
+ base.Start();
if (!reloadSource)
{
reloadSource = source;
diff --git a/Assets/Scripts/UI/FirebaseConfig.cs b/Assets/Scripts/UI/FirebaseConfig.cs
index 5db4c07a..cc28cb16 100644
--- a/Assets/Scripts/UI/FirebaseConfig.cs
+++ b/Assets/Scripts/UI/FirebaseConfig.cs
@@ -2,7 +2,7 @@ using UnityEngine;
namespace Hallucinate.UI
{
- [CreateAssetMenu(fileName = "FirebaseConfig", menuName = "Configs/FirebaseConfig")]
+ [CreateAssetMenu(fileName = "FirebaseConfig", menuName = "BABA_YAGA/Configs/FirebaseConfig")]
public class FirebaseConfig : ScriptableObject
{
public string baseUrl;
diff --git a/Assets/Scripts/UI/PauseMenuController.cs b/Assets/Scripts/UI/PauseMenuController.cs
index a3563320..d44ffd01 100644
--- a/Assets/Scripts/UI/PauseMenuController.cs
+++ b/Assets/Scripts/UI/PauseMenuController.cs
@@ -62,13 +62,13 @@ namespace Hallucinate.UI
{
Show();
root.style.opacity = 0;
- PrimeTween.Tween.Custom(0f, 1f, duration: 0.2f, onValueChange: val => root.style.opacity = val);
+ await PrimeTween.Tween.Custom(0f, 1f, duration: 0.2f, onValueChange: val => root.style.opacity = val);
await Task.Delay(200);
}
public override async Task PlayTransitionOut()
{
- PrimeTween.Tween.Custom(1f, 0f, duration: 0.2f, onValueChange: val => root.style.opacity = val);
+ await PrimeTween.Tween.Custom(1f, 0f, duration: 0.2f, onValueChange: val => root.style.opacity = val);
await Task.Delay(200);
Hide();
}
diff --git a/Assets/Third Parties/vFavorites.meta b/Assets/Third Parties/vFavorites.meta
new file mode 100644
index 00000000..2f375665
--- /dev/null
+++ b/Assets/Third Parties/vFavorites.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 61e90743ef9987d44832f60b572715ef
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Third Parties/vFavorites/Manual.pdf b/Assets/Third Parties/vFavorites/Manual.pdf
new file mode 100644
index 00000000..101f3fc8
Binary files /dev/null and b/Assets/Third Parties/vFavorites/Manual.pdf differ
diff --git a/Assets/Third Parties/vFavorites/Manual.pdf.meta b/Assets/Third Parties/vFavorites/Manual.pdf.meta
new file mode 100644
index 00000000..a486e69d
--- /dev/null
+++ b/Assets/Third Parties/vFavorites/Manual.pdf.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 842468ccf23564770b4b1cb9f7eca30e
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Third Parties/vFavorites/VFavorites.asmdef b/Assets/Third Parties/vFavorites/VFavorites.asmdef
new file mode 100644
index 00000000..8897fa16
--- /dev/null
+++ b/Assets/Third Parties/vFavorites/VFavorites.asmdef
@@ -0,0 +1,16 @@
+{
+ "name": "VFavorites",
+ "rootNamespace": "",
+ "references": [],
+ "includePlatforms": [
+ "Editor"
+ ],
+ "excludePlatforms": [],
+ "allowUnsafeCode": false,
+ "overrideReferences": false,
+ "precompiledReferences": [],
+ "autoReferenced": true,
+ "defineConstraints": [],
+ "versionDefines": [],
+ "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Assets/Third Parties/vFavorites/VFavorites.asmdef.meta b/Assets/Third Parties/vFavorites/VFavorites.asmdef.meta
new file mode 100644
index 00000000..d92c7c02
--- /dev/null
+++ b/Assets/Third Parties/vFavorites/VFavorites.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d8266c7db84a045d3b706b23e60aa197
+AssemblyDefinitionImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Third Parties/vFavorites/VFavorites.cs b/Assets/Third Parties/vFavorites/VFavorites.cs
new file mode 100644
index 00000000..226dc0da
--- /dev/null
+++ b/Assets/Third Parties/vFavorites/VFavorites.cs
@@ -0,0 +1,1818 @@
+#if UNITY_EDITOR
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using UnityEngine.SceneManagement;
+using UnityEditor.SceneManagement;
+using UnityEditor.ShortcutManagement;
+using System.Reflection;
+using System.Linq;
+using UnityEngine.UIElements;
+using Type = System.Type;
+using static VFavorites.Libs.VUtils;
+using static VFavorites.Libs.VGUI;
+using static VFavorites.VFavoritesData;
+
+
+namespace VFavorites
+{
+ public static class VFavorites
+ {
+ static void WrappedOnGUI(object _)
+ {
+ if (wrappedBrowser?.GetType() != t_BrowserWindow) { originalBrowserGUI(); return; }
+
+
+ void createData()
+ {
+ if (data) return;
+
+ data = ScriptableObject.CreateInstance();
+
+ AssetDatabase.CreateAsset(data, GetScriptPath("VFavorites").GetParentPath().CombinePath("vFavorites Data.asset"));
+
+
+
+ // migrateDataFromV1
+
+ if (!EditorPrefs.HasKey("vFavorites-guids-" + GetProjectId())) return;
+ if (EditorPrefs.HasKey("vHierarchy-dataMigrationFromV1Attempted-" + GetProjectId())) return;
+
+ EditorPrefs.SetBool("vHierarchy-dataMigrationFromV1Attempted-" + GetProjectId(), true);
+
+
+ if (!data.pages.Any())
+ data.pages.Add(new Page("Page 1"));
+
+
+ var guidsFromV1 = EditorPrefs.GetString("vFavorites-guids-" + GetProjectId()).Split('-').Where(r => r != "").ToList();
+
+ foreach (var guid in guidsFromV1)
+ if (AssetDatabase.LoadAssetAtPath