From 8dc0ae98fbd7982c88da90fdb10f630ee6588978 Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Thu, 9 Mar 2023 16:00:42 +0100 Subject: [PATCH] update --- ...rePack_HDRP_2018.4_v1.22.unitypackage.meta | 7 - ...rePack_LWRP_2018.4_v1.22.unitypackage.meta | 7 - ...urePack_URP_2019.3_v1.22.unitypackage.meta | 7 - .../Resources/Prefabs/Collectible/Coin.prefab | 17 ++ .../Resources/Prefabs/Modulok/module1.prefab | 17 ++ .../Resources/Prefabs/Modulok/module2.prefab | 31 +++- Assets/Scenes/EndlessRunnerTest.unity | 58 +++++- Assets/Scripts/CoinCounter.cs | 4 +- Assets/Scripts/DestroyObjects.cs | 5 + Assets/Scripts/Network/DatabaseData.cs | 23 ++- Assets/Scripts/PlayerController.cs | 4 +- UserSettings/Layouts/default-2021.dwlt | 166 +++++++++--------- 12 files changed, 225 insertions(+), 121 deletions(-) delete mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta delete mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta delete mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta deleted file mode 100644 index 9a23bc2..0000000 --- a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3b4dc5f685f8edc4bbba6fb0c8ea39ba -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta deleted file mode 100644 index 552dc86..0000000 --- a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8851c5995be5f704babebf752d60b4e2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta deleted file mode 100644 index f481ade..0000000 --- a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 88c6da05db186cb44a4453fd624b31b2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Collectible/Coin.prefab b/Assets/Resources/Prefabs/Collectible/Coin.prefab index 9d2268c..40ad2bc 100644 --- a/Assets/Resources/Prefabs/Collectible/Coin.prefab +++ b/Assets/Resources/Prefabs/Collectible/Coin.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 2338191564092369350} - component: {fileID: 1107841871989802330} - component: {fileID: 2302316598896059446} + - component: {fileID: 7652690552059465775} m_Layer: 0 m_Name: Coin m_TagString: Collectible @@ -110,3 +111,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 31a14933a49999c07988cabbf1a2e9fd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!54 &7652690552059465775 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6932244328486947952} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 diff --git a/Assets/Resources/Prefabs/Modulok/module1.prefab b/Assets/Resources/Prefabs/Modulok/module1.prefab index b1773a7..3429192 100644 --- a/Assets/Resources/Prefabs/Modulok/module1.prefab +++ b/Assets/Resources/Prefabs/Modulok/module1.prefab @@ -535,6 +535,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4168203924951896375} + - component: {fileID: 6681264605721016949} m_Layer: 0 m_Name: module1 m_TagString: Ground @@ -577,6 +578,22 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!54 &6681264605721016949 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3644467415503719309} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 --- !u!1 &3881739575044523192 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Modulok/module2.prefab b/Assets/Resources/Prefabs/Modulok/module2.prefab index 6277625..abbffac 100644 --- a/Assets/Resources/Prefabs/Modulok/module2.prefab +++ b/Assets/Resources/Prefabs/Modulok/module2.prefab @@ -221,7 +221,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789751102500862951} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0.8, y: 4.6863, z: -3.46} + m_LocalPosition: {x: -0.8, y: 3.63, z: -3.46} m_LocalScale: {x: 4.8444, y: 1.6431, z: 0.4095891} m_ConstrainProportionsScale: 0 m_Children: @@ -429,7 +429,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726319647689201405} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -8.1, y: 1, z: -3} + m_LocalPosition: {x: -8.1, y: -0.06, z: -3} m_LocalScale: {x: 4.8444, y: 1.5, z: 4.095891} m_ConstrainProportionsScale: 0 m_Children: @@ -1053,7 +1053,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7768164705704979040} m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} - m_LocalPosition: {x: 7.7, y: 1, z: 3} + m_LocalPosition: {x: 7.7, y: -0.06, z: 3} m_LocalScale: {x: 3.6332998, y: 1.4999996, z: 4.095891} m_ConstrainProportionsScale: 0 m_Children: @@ -1133,6 +1133,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8769601115213192681} + - component: {fileID: 1707776448831154223} m_Layer: 0 m_Name: module2 m_TagString: Ground @@ -1175,6 +1176,22 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!54 &1707776448831154223 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8284425857235584851} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 --- !u!1 &8481750556020934758 GameObject: m_ObjectHideFlags: 0 @@ -1617,7 +1634,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4937432100843187101, guid: 6b6fa1b740cdb740996ab966f7dea907, type: 3} propertyPath: m_LocalPosition.y - value: 7 + value: 5.18 objectReference: {fileID: 0} - target: {fileID: 4937432100843187101, guid: 6b6fa1b740cdb740996ab966f7dea907, type: 3} propertyPath: m_LocalPosition.z @@ -1827,7 +1844,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4937432100843187101, guid: 6b6fa1b740cdb740996ab966f7dea907, type: 3} propertyPath: m_LocalPosition.y - value: 7 + value: 5.18 objectReference: {fileID: 0} - target: {fileID: 4937432100843187101, guid: 6b6fa1b740cdb740996ab966f7dea907, type: 3} propertyPath: m_LocalPosition.z @@ -2037,7 +2054,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4937432100843187101, guid: 6b6fa1b740cdb740996ab966f7dea907, type: 3} propertyPath: m_LocalPosition.y - value: 7 + value: 5.18 objectReference: {fileID: 0} - target: {fileID: 4937432100843187101, guid: 6b6fa1b740cdb740996ab966f7dea907, type: 3} propertyPath: m_LocalPosition.z @@ -2107,7 +2124,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4937432100843187101, guid: 6b6fa1b740cdb740996ab966f7dea907, type: 3} propertyPath: m_LocalPosition.y - value: 7 + value: 5.18 objectReference: {fileID: 0} - target: {fileID: 4937432100843187101, guid: 6b6fa1b740cdb740996ab966f7dea907, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scenes/EndlessRunnerTest.unity b/Assets/Scenes/EndlessRunnerTest.unity index 1c8b44e..bd14344 100644 --- a/Assets/Scenes/EndlessRunnerTest.unity +++ b/Assets/Scenes/EndlessRunnerTest.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.56158954, g: 0.7218083, b: 0.8178571, a: 1} + m_IndirectSpecularColor: {r: 0.5615895, g: 0.72180885, b: 0.81785697, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -132,6 +132,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 261353087} + - component: {fileID: 261353088} + - component: {fileID: 261353089} m_Layer: 0 m_Name: base m_TagString: Ground @@ -157,6 +159,35 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!54 &261353088 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261353086} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!65 &261353089 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261353086} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &284201298 GameObject: m_ObjectHideFlags: 0 @@ -631,6 +662,7 @@ GameObject: - component: {fileID: 965562368} - component: {fileID: 965562367} - component: {fileID: 965562371} + - component: {fileID: 965562372} m_Layer: 0 m_Name: DestroyWall m_TagString: Untagged @@ -728,6 +760,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6c20965817cd66496b3cdc8cd79092d1, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!54 &965562372 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965562366} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 --- !u!1 &1201779180 GameObject: m_ObjectHideFlags: 0 @@ -807,7 +855,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rb: {fileID: 7917514869596290073} - jumpforce: 5 + jumpforce: 350 holdTime: 0.2 activeControllType: 1 leftButton: {fileID: 2129484388} @@ -1012,7 +1060,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1572233530 RectTransform: m_ObjectHideFlags: 0 @@ -11050,7 +11098,7 @@ Rigidbody: m_Mass: 1 m_Drag: 0 m_AngularDrag: 0 - m_UseGravity: 0 + m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 112 @@ -11064,7 +11112,7 @@ CapsuleCollider: m_GameObject: {fileID: 7398140401948337837} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 0 + m_Enabled: 1 m_Radius: 1.7212968 m_Height: 6.3698125 m_Direction: 1 diff --git a/Assets/Scripts/CoinCounter.cs b/Assets/Scripts/CoinCounter.cs index 2cfd9a1..0164d89 100644 --- a/Assets/Scripts/CoinCounter.cs +++ b/Assets/Scripts/CoinCounter.cs @@ -19,11 +19,11 @@ public class CoinCounter : MonoBehaviour public void AddCoin(ulong number){ coin += number; - coinCounterUI.text = coin.ToString(); + coinCounterUI.text = "Coins: " + coin.ToString(); } public void RemoveCoin(ulong number){ coin -= number; - coinCounterUI.text = coin.ToString(); + //coinCounterUI.text = "Coins: " + coin.ToString(); } } diff --git a/Assets/Scripts/DestroyObjects.cs b/Assets/Scripts/DestroyObjects.cs index 66f6bf8..cd5fcfd 100644 --- a/Assets/Scripts/DestroyObjects.cs +++ b/Assets/Scripts/DestroyObjects.cs @@ -8,4 +8,9 @@ public class DestroyObjects : MonoBehaviour Debug.Log("destroy wall trigger"); Destroy(other.gameObject); } + + private void OnCollisionEnter(Collision other) { + Debug.Log("collision enter"); + Destroy(other.gameObject); + } } diff --git a/Assets/Scripts/Network/DatabaseData.cs b/Assets/Scripts/Network/DatabaseData.cs index 89856e5..857873c 100644 --- a/Assets/Scripts/Network/DatabaseData.cs +++ b/Assets/Scripts/Network/DatabaseData.cs @@ -117,6 +117,26 @@ public class DatabaseData : MonoBehaviour } + private IEnumerator IGetHighScoreDataNew(){ + string uri = "http://localhost:3000/toplist"; + + var uwr = new UnityWebRequest(uri, "GET"); + uwr.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer(); + uwr.SetRequestHeader("Content-Type", "application/json"); + + yield return uwr.SendWebRequest(); + + if (uwr.isNetworkError) { + Debug.Log(uwr.error); + } else { + input.text = uwr.downloadHandler.text; + Debug.Log(uwr.downloadHandler.text); + jsonParserHighScore(uwr.downloadHandler.text); + hst.CreateTable(htdc.htd); //high score tabla letrehozasa + } + } + + private IEnumerator IGetPlayerCoins(string username){ string uri = "http://localhost:3000/coinget"; @@ -166,7 +186,8 @@ public class DatabaseData : MonoBehaviour string uri = "http://localhost:3000/newscore"; var uwr = new UnityWebRequest(uri, "POST"); - byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":2,\"bevitel2\":1,\"bevitel3\":400,\"bevitel4\":\"00:05:06\"}"); + byte[] jsonToSend = + new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":2,\"bevitel2\":1,\"bevitel3\":400,\"bevitel4\":\"00:05:06\"}"); uwr.uploadHandler = (UploadHandler)new UploadHandlerRaw(jsonToSend); uwr.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer(); uwr.SetRequestHeader("Content-Type", "application/json"); diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 85f68f6..f313366 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -31,7 +31,7 @@ public class PlayerController : MonoBehaviour private void Awake() { cc = FindObjectOfType(); //kamera vezerlo referencia - activeControllType = ControllType.Swipe; + activeControllType = ControllType.Button; } public void setControllType(ControllType controlltype){ @@ -85,7 +85,7 @@ public class PlayerController : MonoBehaviour } } }else if(activeControllType == ControllType.Button){ - jumpforce = 2; + //jumpforce = 100; /*leftButton.onClick.AddListener(goRight); jumpButton.onClick.AddListener(jump); rightButton.onClick.AddListener(goLeft);*/ diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index ba00353..4931084 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,11 +15,11 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 28 - width: 1366 - height: 673 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: Console + m_Title: Hierarchy m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -39,10 +39,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 664 + x: 933 y: 0 - width: 344 - height: 414 + width: 484 + height: 629 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} @@ -70,8 +70,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 - height: 673 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -95,7 +95,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -116,8 +116,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 653 - width: 1366 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1366 - height: 623 + width: 1920 + height: 947 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 53 + controlID: 65 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1008 - height: 623 + width: 1417 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 100 + controlID: 66 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -191,12 +191,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1008 - height: 414 + width: 1417 + height: 629 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 101 + controlID: 67 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -214,8 +214,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 168 - height: 414 + width: 197 + height: 629 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -238,12 +238,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 168 + x: 197 y: 0 - width: 496 - height: 414 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + width: 736 + height: 629 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -265,9 +265,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 414 - width: 1008 - height: 209 + y: 629 + width: 1417 + height: 318 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -285,23 +285,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: InspectorWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1008 + x: 1417 y: 0 - width: 358 - height: 623 - m_MinSize: {x: 101, y: 121} + width: 503 + height: 947 + m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} - {fileID: 16} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -323,9 +323,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 86 - width: 167 - height: 393 + y: 73 + width: 196 + height: 608 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -333,9 +333,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: dcf8ffff - m_LastClickedID: -1828 - m_ExpandedIDs: e0f8ffff22fbffff3a5a00004c5a0000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: ecf2ffff54f5ffff34fbffff20670000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -351,7 +351,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -379,10 +379,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 168 - y: 86 - width: 494 - height: 393 + x: 197 + y: 73 + width: 734 + height: 608 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -617,9 +617,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 700.56055, y: 145.45145, z: 667.6259} + m_Target: {x: 579.58923, y: 1254.9442, z: 8.661779} speed: 2 - m_Value: {x: 700.56055, y: 145.45145, z: 667.6259} + m_Value: {x: 579.58923, y: 1254.9442, z: 8.661779} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -658,7 +658,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 0 + 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} @@ -666,13 +666,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.07115192, y: -0.84182006, z: 0.114607, w: 0.52264017} + m_Target: {x: -0.042836577, y: 0.89744264, z: -0.08941653, w: -0.42986205} speed: 2 - m_Value: {x: 0.07002716, y: -0.8435508, z: 0.1135541, w: 0.5202151} + m_Value: {x: 0.042836573, y: -0.8974426, z: 0.089416526, w: 0.4298622} m_Size: - m_Target: 707.10693 + m_Target: 265.8147 speed: 2 - m_Value: 707.10693 + m_Value: 265.8147 m_Ortho: m_Target: 0 speed: 2 @@ -690,7 +690,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.121840216, y: 0.35399154, z: -0.046570867, w: -0.92611176} + m_LastSceneViewRotation: {x: -0.042836577, y: 0.89744264, z: -0.08941653, w: -0.42986205} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -718,9 +718,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 500 - width: 1007 - height: 188 + y: 702 + width: 1416 + height: 297 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -738,22 +738,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Scripts/Network m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Scripts/Network m_LastFoldersGridSize: -1 - m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner + m_LastProjectPath: C:\dev\zarodolgozat\ColorBall m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 44} - m_SelectedIDs: a6670000 - m_LastClickedID: 26534 - m_ExpandedIDs: 000000005065000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: c4650000 + m_LastClickedID: 26052 + m_ExpandedIDs: 00000000a8650000be650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -781,7 +781,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000050650000 + m_ExpandedIDs: 00000000a8650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -833,7 +833,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 66} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 @@ -857,10 +857,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1008 - y: 86 - width: 357 - height: 602 + x: 1417 + y: 73 + width: 502 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -885,10 +885,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1008 - y: 86 - width: 357 - height: 602 + x: 1417 + y: 73 + width: 502 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -926,10 +926,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 664 - y: 86 - width: 342 - height: 393 + x: 933 + y: 73 + width: 482 + height: 608 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -958,7 +958,7 @@ MonoBehaviour: - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin pluginStates: - '{}' - scale: 14 + scale: 22 fitToScreenEnabled: 1 rotationDegree: 0 highlightSafeAreaEnabled: 0