From 0b6b3e436948a760865cdcc57388a8e199778bd0 Mon Sep 17 00:00:00 2001 From: GraphicEdit Date: Mon, 25 Dec 2023 13:37:30 +0000 Subject: [PATCH] animator Network "sync" --- DarkFlow/.vsconfig | 6 - .../Assets/Characters/1_Mutant/Mutant.prefab | 242 ++++--- .../2_Erika/Animator_Erika.controller | 2 +- .../Assets/Characters/2_Erika/Erika.prefab | 660 ++++++++++++++---- DarkFlow/Assets/Editor/StartupSceneLoader.cs | 21 +- DarkFlow/Assets/Scenes/Gameplay.unity | 30 +- DarkFlow/Assets/Scripts/CameraController.cs | 42 -- DarkFlow/Assets/Scripts/CameraFollow.cs | 33 + ...ontroller.cs.meta => CameraFollow.cs.meta} | 0 .../Assets/Scripts/ClientNetworkAnimator.cs | 15 + .../Scripts/ClientNetworkAnimator.cs.meta | 11 + .../Assets/Scripts/ClientNetworkTransform.cs | 13 + .../Scripts/ClientNetworkTransform.cs.meta | 11 + .../InputSystem/ThirdPersonController.cs | 39 +- .../NetcodeForGameObjects.asset | 17 + .../ProjectSettings/ProjectSettings.asset | 6 +- 16 files changed, 858 insertions(+), 290 deletions(-) delete mode 100644 DarkFlow/.vsconfig delete mode 100644 DarkFlow/Assets/Scripts/CameraController.cs create mode 100644 DarkFlow/Assets/Scripts/CameraFollow.cs rename DarkFlow/Assets/Scripts/{CameraController.cs.meta => CameraFollow.cs.meta} (100%) create mode 100644 DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs create mode 100644 DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs.meta create mode 100644 DarkFlow/Assets/Scripts/ClientNetworkTransform.cs create mode 100644 DarkFlow/Assets/Scripts/ClientNetworkTransform.cs.meta create mode 100644 DarkFlow/ProjectSettings/NetcodeForGameObjects.asset diff --git a/DarkFlow/.vsconfig b/DarkFlow/.vsconfig deleted file mode 100644 index f019fd0..0000000 --- a/DarkFlow/.vsconfig +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "1.0", - "components": [ - "Microsoft.VisualStudio.Workload.ManagedGame" - ] -} diff --git a/DarkFlow/Assets/Characters/1_Mutant/Mutant.prefab b/DarkFlow/Assets/Characters/1_Mutant/Mutant.prefab index 7218d8b..f6da2d7 100644 --- a/DarkFlow/Assets/Characters/1_Mutant/Mutant.prefab +++ b/DarkFlow/Assets/Characters/1_Mutant/Mutant.prefab @@ -107,17 +107,17 @@ PrefabInstance: - target: {fileID: -8021001004253913084, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -4.072857 + value: 4.4793024 objectReference: {fileID: 0} - target: {fileID: -8021001004253913084, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0.16464998 + value: 0.7833245 objectReference: {fileID: 0} - target: {fileID: -8021001004253913084, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0.38854307 + value: -0.22153012 objectReference: {fileID: 0} - target: {fileID: -7657966619581158213, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -132,17 +132,17 @@ PrefabInstance: - target: {fileID: -7219772299731422950, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 5.0201926 + value: -14.71802 objectReference: {fileID: 0} - target: {fileID: -7219772299731422950, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -3.6197228 + value: 0.84575266 objectReference: {fileID: 0} - target: {fileID: -7219772299731422950, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -22.185013 + value: -7.329793 objectReference: {fileID: 0} - target: {fileID: -7121769801107515815, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -152,47 +152,47 @@ PrefabInstance: - target: {fileID: -6874584590210671055, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 56.870205 + value: 57.4198 objectReference: {fileID: 0} - target: {fileID: -6874584590210671055, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 10.353819 + value: 2.231802 objectReference: {fileID: 0} - target: {fileID: -6874584590210671055, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 12.022205 + value: -5.5978785 objectReference: {fileID: 0} - target: {fileID: -6803169544883306252, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 86.59248 + value: 71.56063 objectReference: {fileID: 0} - target: {fileID: -6803169544883306252, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -124.50629 + value: 95.47339 objectReference: {fileID: 0} - target: {fileID: -6803169544883306252, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -34.02514 + value: -177.60622 objectReference: {fileID: 0} - target: {fileID: -6768225281626788248, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 1.8831136 + value: 79.4626 objectReference: {fileID: 0} - target: {fileID: -6768225281626788248, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -1.0163618 + value: -21.765383 objectReference: {fileID: 0} - target: {fileID: -6768225281626788248, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -19.254894 + value: -26.034239 objectReference: {fileID: 0} - target: {fileID: -6370085079684087283, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -217,17 +217,17 @@ PrefabInstance: - target: {fileID: -5480977901411583989, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 15.450411 + value: 79.466034 objectReference: {fileID: 0} - target: {fileID: -5480977901411583989, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0.20970322 + value: -21.722456 objectReference: {fileID: 0} - target: {fileID: -5480977901411583989, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0.8940058 + value: -25.996422 objectReference: {fileID: 0} - target: {fileID: -5195048882033904264, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -252,17 +252,17 @@ PrefabInstance: - target: {fileID: -3746190272939815206, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -27.749947 + value: -20.666317 objectReference: {fileID: 0} - target: {fileID: -3746190272939815206, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 4.0444546 + value: 6.671916 objectReference: {fileID: 0} - target: {fileID: -3746190272939815206, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -1.9454613 + value: -0.8813188 objectReference: {fileID: 0} - target: {fileID: -3542885339558904099, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -272,47 +272,47 @@ PrefabInstance: - target: {fileID: -3480699329000672020, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 4.368597 + value: 0.2758569 objectReference: {fileID: 0} - target: {fileID: -3480699329000672020, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0.65449464 + value: 2.266861 objectReference: {fileID: 0} - target: {fileID: -3480699329000672020, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0.7423246 + value: 4.0793705 objectReference: {fileID: 0} - target: {fileID: -3432401550182100168, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 82.55491 + value: 58.497814 objectReference: {fileID: 0} - target: {fileID: -3432401550182100168, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -21.497683 + value: -33.74009 objectReference: {fileID: 0} - target: {fileID: -3432401550182100168, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -17.139498 + value: -26.49197 objectReference: {fileID: 0} - target: {fileID: -3321919801592875672, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -6.1334596 + value: 3.1986458 objectReference: {fileID: 0} - target: {fileID: -3321919801592875672, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 3.3701816 + value: 1.6490194 objectReference: {fileID: 0} - target: {fileID: -3321919801592875672, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 4.9566283 + value: 1.1032292 objectReference: {fileID: 0} - target: {fileID: -3086436065929644917, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -322,17 +322,17 @@ PrefabInstance: - target: {fileID: -2770666803903516498, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 45.486786 + value: 46.910507 objectReference: {fileID: 0} - target: {fileID: -2770666803903516498, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.256934 + value: 5.7534246 objectReference: {fileID: 0} - target: {fileID: -2770666803903516498, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0.1828043 + value: 3.9134357 objectReference: {fileID: 0} - target: {fileID: -2084811680363313996, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -342,32 +342,32 @@ PrefabInstance: - target: {fileID: -2072040086291044643, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -20.381231 + value: -18.568619 objectReference: {fileID: 0} - target: {fileID: -2072040086291044643, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -4.6568174 + value: -2.5427175 objectReference: {fileID: 0} - target: {fileID: -2072040086291044643, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 1.4543207 + value: 0.48089188 objectReference: {fileID: 0} - target: {fileID: -1812909498023395591, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -0.000012443411 + value: -0.00030248667 objectReference: {fileID: 0} - target: {fileID: -1812909498023395591, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.0000075099706 + value: -0.00087384466 objectReference: {fileID: 0} - target: {fileID: -1812909498023395591, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -11.739515 + value: -18.928846 objectReference: {fileID: 0} - target: {fileID: -1781356600409242780, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -387,32 +387,32 @@ PrefabInstance: - target: {fileID: -1070350730909333850, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -2.83711 + value: 64.583885 objectReference: {fileID: 0} - target: {fileID: -1070350730909333850, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 1.9250966 + value: -10.154777 objectReference: {fileID: 0} - target: {fileID: -1070350730909333850, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 30.412384 + value: -14.241626 objectReference: {fileID: 0} - target: {fileID: -870823317777057635, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -3.3222709 + value: 1.0734557 objectReference: {fileID: 0} - target: {fileID: -870823317777057635, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 5.4276357 + value: -0.16498077 objectReference: {fileID: 0} - target: {fileID: -870823317777057635, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -13.494762 + value: -15.988905 objectReference: {fileID: 0} - target: {fileID: -751476226918971245, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -436,17 +436,17 @@ PrefabInstance: - target: {fileID: 366175167995203695, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 4.997714 + value: 6.5517464 objectReference: {fileID: 0} - target: {fileID: 366175167995203695, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0.18200941 + value: 0.87203723 objectReference: {fileID: 0} - target: {fileID: 366175167995203695, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0.2979661 + value: -0.2375275 objectReference: {fileID: 0} - target: {fileID: 414117464747255840, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -456,17 +456,17 @@ PrefabInstance: - target: {fileID: 608321761475470972, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 61.77005 + value: 56.095936 objectReference: {fileID: 0} - target: {fileID: 608321761475470972, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 1.6202583 + value: -8.799026 objectReference: {fileID: 0} - target: {fileID: 608321761475470972, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 2.3913374 + value: -2.4475415 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -496,17 +496,17 @@ PrefabInstance: - target: {fileID: 1189529853000058984, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 18.97802 + value: 64.57736 objectReference: {fileID: 0} - target: {fileID: 1189529853000058984, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -89.0263 + value: -10.214619 objectReference: {fileID: 0} - target: {fileID: 1189529853000058984, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -14.393224 + value: -14.2956705 objectReference: {fileID: 0} - target: {fileID: 1339101018200438765, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -516,17 +516,17 @@ PrefabInstance: - target: {fileID: 1852576806548013000, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 12.054613 + value: -16.945585 objectReference: {fileID: 0} - target: {fileID: 1852576806548013000, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -24.108416 + value: -6.2092924 objectReference: {fileID: 0} - target: {fileID: 1852576806548013000, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -23.108238 + value: 5.730829 objectReference: {fileID: 0} - target: {fileID: 2219207278016453899, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -536,32 +536,32 @@ PrefabInstance: - target: {fileID: 2559285840627121667, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -4.405688 + value: -2.4869711 objectReference: {fileID: 0} - target: {fileID: 2559285840627121667, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -9.949953 + value: -6.22651 objectReference: {fileID: 0} - target: {fileID: 2559285840627121667, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 173.08424 + value: -178.84671 objectReference: {fileID: 0} - target: {fileID: 2563496969622287784, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0.0000047331628 + value: 0.00012243926 objectReference: {fileID: 0} - target: {fileID: 2563496969622287784, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.0000028440677 + value: -0.0016105212 objectReference: {fileID: 0} - target: {fileID: 2563496969622287784, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 14.33312 + value: 13.064403 objectReference: {fileID: 0} - target: {fileID: 2715566404302941441, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -576,17 +576,17 @@ PrefabInstance: - target: {fileID: 2916570863362053800, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 47.028336 + value: 47.124924 objectReference: {fileID: 0} - target: {fileID: 2916570863362053800, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0.000109851775 + value: -5.811549 objectReference: {fileID: 0} - target: {fileID: 2916570863362053800, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0.00014909155 + value: -3.9556582 objectReference: {fileID: 0} - target: {fileID: 3135921509060577837, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -621,47 +621,47 @@ PrefabInstance: - target: {fileID: 5097370190579632962, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 4.8844533 + value: 79.46357 objectReference: {fileID: 0} - target: {fileID: 5097370190579632962, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.0060264277 + value: -21.74988 objectReference: {fileID: 0} - target: {fileID: 5097370190579632962, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 1.1922472 + value: -26.023373 objectReference: {fileID: 0} - target: {fileID: 5372056943023685468, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0.042743545 + value: 79.468 objectReference: {fileID: 0} - target: {fileID: 5372056943023685468, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0.1724248 + value: -21.674044 objectReference: {fileID: 0} - target: {fileID: 5372056943023685468, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -23.092808 + value: -25.974882 objectReference: {fileID: 0} - target: {fileID: 5465940246521907071, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -3.0191383 + value: -5.1064534 objectReference: {fileID: 0} - target: {fileID: 5465940246521907071, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0.44366622 + value: -1.5698754 objectReference: {fileID: 0} - target: {fileID: 5465940246521907071, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0.97245145 + value: -1.2985562 objectReference: {fileID: 0} - target: {fileID: 5866666021909216657, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -671,62 +671,62 @@ PrefabInstance: - target: {fileID: 6000407479487422213, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 72.51578 + value: 57.48826 objectReference: {fileID: 0} - target: {fileID: 6000407479487422213, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 47.855114 + value: -5.3131566 objectReference: {fileID: 0} - target: {fileID: 6000407479487422213, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 41.37522 + value: -7.1815233 objectReference: {fileID: 0} - target: {fileID: 6502182839619065283, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -2.0403352 + value: -2.1213183 objectReference: {fileID: 0} - target: {fileID: 6502182839619065283, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 23.93093 + value: 24.03912 objectReference: {fileID: 0} - target: {fileID: 6502182839619065283, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 4.7466784 + value: 5.09346 objectReference: {fileID: 0} - target: {fileID: 6515712193588681746, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -0.3333959 + value: -5.4161077 objectReference: {fileID: 0} - target: {fileID: 6515712193588681746, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.544639 + value: -1.4146731 objectReference: {fileID: 0} - target: {fileID: 6515712193588681746, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0.60310966 + value: -3.2710824 objectReference: {fileID: 0} - target: {fileID: 7078722787440015773, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 87.59391 + value: 63.998062 objectReference: {fileID: 0} - target: {fileID: 7078722787440015773, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 140.49445 + value: -97.01278 objectReference: {fileID: 0} - target: {fileID: 7078722787440015773, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 52.73698 + value: 179.64677 objectReference: {fileID: 0} - target: {fileID: 7542137907003004905, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -736,32 +736,32 @@ PrefabInstance: - target: {fileID: 8169382868667117632, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -7.382117 + value: -6.5555224 objectReference: {fileID: 0} - target: {fileID: 8169382868667117632, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 12.12332 + value: 15.357347 objectReference: {fileID: 0} - target: {fileID: 8169382868667117632, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -178.27353 + value: -173.74974 objectReference: {fileID: 0} - target: {fileID: 8447082967072642302, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 6.510921 + value: 25.544107 objectReference: {fileID: 0} - target: {fileID: 8447082967072642302, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 12.1502 + value: 26.592428 objectReference: {fileID: 0} - target: {fileID: 8447082967072642302, guid: a65433442e687234ab8043c546677d72, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 46.495613 + value: 28.400003 objectReference: {fileID: 0} - target: {fileID: 8817898888258712963, guid: a65433442e687234ab8043c546677d72, type: 3} @@ -805,6 +805,14 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 6233464797961255142} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a65433442e687234ab8043c546677d72, + type: 3} + insertIndex: -1 + addedObject: {fileID: -8907161250196263378} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a65433442e687234ab8043c546677d72, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8027232384722410602} m_SourcePrefab: {fileID: 100100000, guid: a65433442e687234ab8043c546677d72, type: 3} --- !u!4 &1469482750486030645 stripped Transform: @@ -884,7 +892,7 @@ CharacterController: m_StepOffset: 0.25 m_SkinWidth: 0.25 m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 1.05, z: 0} + m_Center: {x: 0, y: 0.9, z: 0} --- !u!114 &3639033402812819131 MonoBehaviour: m_ObjectHideFlags: 0 @@ -892,7 +900,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2247144937675617167} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} m_Name: @@ -969,3 +977,47 @@ MonoBehaviour: analogMovement: 0 cursorLocked: 1 cursorInputForLook: 1 +--- !u!114 &-8907161250196263378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2247144937675617167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcbf6eee32d3ec54fa1b9fd9929b7bec, type: 3} + m_Name: + m_EditorClassIdentifier: + SyncPositionX: 1 + SyncPositionY: 1 + SyncPositionZ: 1 + SyncRotAngleX: 0 + SyncRotAngleY: 1 + SyncRotAngleZ: 0 + SyncScaleX: 0 + SyncScaleY: 0 + SyncScaleZ: 0 + PositionThreshold: 0.001 + RotAngleThreshold: 0.01 + ScaleThreshold: 0.01 + UseQuaternionSynchronization: 0 + UseQuaternionCompression: 0 + UseHalfFloatPrecision: 0 + InLocalSpace: 0 + Interpolate: 1 + SlerpPosition: 0 +--- !u!114 &8027232384722410602 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2247144937675617167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b02d2af4a8667b7439dfdd74d286fa7c, type: 3} + m_Name: + m_EditorClassIdentifier: + TransitionStateInfoList: [] + m_Animator: {fileID: 222671947941112760} diff --git a/DarkFlow/Assets/Characters/2_Erika/Animator_Erika.controller b/DarkFlow/Assets/Characters/2_Erika/Animator_Erika.controller index 89c6f80..c0d82e8 100644 --- a/DarkFlow/Assets/Characters/2_Erika/Animator_Erika.controller +++ b/DarkFlow/Assets/Characters/2_Erika/Animator_Erika.controller @@ -11,7 +11,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1898023701926295212} - m_Position: {x: 10, y: 200, z: 0} + m_Position: {x: -70, y: 160, z: 0} - serializedVersion: 1 m_State: {fileID: -3398653591857322796} m_Position: {x: 30, y: 290, z: 0} diff --git a/DarkFlow/Assets/Characters/2_Erika/Erika.prefab b/DarkFlow/Assets/Characters/2_Erika/Erika.prefab index 5727181..4f8bdf4 100644 --- a/DarkFlow/Assets/Characters/2_Erika/Erika.prefab +++ b/DarkFlow/Assets/Characters/2_Erika/Erika.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8408292032187987872} - m_Layer: 0 + m_Layer: 3 m_Name: PlayerCameraRoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -24,7 +24,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2034699475712123807} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0.088634305, y: 0.8976513, z: 0.21136884, w: 0.37641641} m_LocalPosition: {x: 0, y: 1.44, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 @@ -39,6 +39,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -9070493210130169274, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_RootOrder @@ -97,47 +102,67 @@ PrefabInstance: - target: {fileID: -8191740002585371210, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -14.784149 + value: -14.782986 objectReference: {fileID: 0} - target: {fileID: -8191740002585371210, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0.104026526 + value: -0.10458321 objectReference: {fileID: 0} - target: {fileID: -8191740002585371210, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -22.441326 + value: -22.560555 + objectReference: {fileID: 0} + - target: {fileID: -8183481454299698827, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: -8068027186691560116, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 31.317518 + value: 31.070194 objectReference: {fileID: 0} - target: {fileID: -8068027186691560116, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 1.0190501 + value: 1.0004627 objectReference: {fileID: 0} - target: {fileID: -8068027186691560116, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 3.6257615 + value: 3.5903933 objectReference: {fileID: 0} - target: {fileID: -8021001004253913084, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 4.4792576 + value: 4.4793024 objectReference: {fileID: 0} - target: {fileID: -8021001004253913084, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.7783122 + value: 0.7833245 objectReference: {fileID: 0} - target: {fileID: -8021001004253913084, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0.13618444 + value: -0.22153012 + objectReference: {fileID: 0} + - target: {fileID: -8006009767450596044, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7657966619581158213, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7360747449169001873, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: -7219772299731422950, guid: 4f52f003eca24b843924f016ea500470, type: 3} @@ -154,50 +179,55 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -7.329793 objectReference: {fileID: 0} + - target: {fileID: -7121769801107515815, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: -6874584590210671055, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 59.835266 + value: 57.4198 objectReference: {fileID: 0} - target: {fileID: -6874584590210671055, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 1.53458 + value: 2.231802 objectReference: {fileID: 0} - target: {fileID: -6874584590210671055, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -4.912259 + value: -5.5978785 objectReference: {fileID: 0} - target: {fileID: -6857788192064577062, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 1.5675404 + value: 1.5728564 objectReference: {fileID: 0} - target: {fileID: -6857788192064577062, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.20904352 + value: 0.1923524 objectReference: {fileID: 0} - target: {fileID: -6857788192064577062, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 14.131142 + value: 14.026364 objectReference: {fileID: 0} - target: {fileID: -6803169544883306252, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 71.88601 + value: 71.56063 objectReference: {fileID: 0} - target: {fileID: -6803169544883306252, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 94.930984 + value: 95.47339 objectReference: {fileID: 0} - target: {fileID: -6803169544883306252, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -178.24066 + value: -177.60622 objectReference: {fileID: 0} - target: {fileID: -6768225281626788248, guid: 4f52f003eca24b843924f016ea500470, type: 3} @@ -214,6 +244,36 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -26.034239 objectReference: {fileID: 0} + - target: {fileID: -6621945745981909287, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6370085079684087283, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6234591296559379751, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6170625038081293824, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6153458435004094520, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6056541330796499132, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: -6024149945523619558, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -229,20 +289,30 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -25.87728 objectReference: {fileID: 0} + - target: {fileID: -5857696854640597626, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: -5665043316445423941, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 30.200912 + value: 29.953331 objectReference: {fileID: 0} - target: {fileID: -5665043316445423941, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.93396777 + value: 0.9164885 objectReference: {fileID: 0} - target: {fileID: -5665043316445423941, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 3.4604192 + value: 3.4257843 + objectReference: {fileID: 0} + - target: {fileID: -5561550452697079657, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: -5480977901411583989, guid: 4f52f003eca24b843924f016ea500470, type: 3} @@ -259,65 +329,120 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -25.996422 objectReference: {fileID: 0} + - target: {fileID: -5195048882033904264, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4999088201633142198, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4728426434207774260, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4501530691011011137, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4332706925441422008, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4278032810995721380, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3799395697873186154, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: -3746190272939815206, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -20.731892 + value: -20.666317 objectReference: {fileID: 0} - target: {fileID: -3746190272939815206, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 6.3814535 + value: 6.671916 objectReference: {fileID: 0} - target: {fileID: -3746190272939815206, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0.98397946 + value: -0.8813188 + objectReference: {fileID: 0} + - target: {fileID: -3542885339558904099, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: -3480699329000672020, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -0.007347554 + value: 0.2758569 objectReference: {fileID: 0} - target: {fileID: -3480699329000672020, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 2.461473 + value: 2.266861 objectReference: {fileID: 0} - target: {fileID: -3480699329000672020, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 2.0300028 + value: 4.0793705 + objectReference: {fileID: 0} + - target: {fileID: -3478013746326755454, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: -3432401550182100168, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 58.76451 + value: 58.497814 objectReference: {fileID: 0} - target: {fileID: -3432401550182100168, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -34.217155 + value: -33.74009 objectReference: {fileID: 0} - target: {fileID: -3432401550182100168, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -26.058376 + value: -26.49197 objectReference: {fileID: 0} - target: {fileID: -3321919801592875672, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 3.2334244 + value: 3.1986458 objectReference: {fileID: 0} - target: {fileID: -3321919801592875672, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 1.8339595 + value: 1.6490194 objectReference: {fileID: 0} - target: {fileID: -3321919801592875672, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 1.3472767 + value: 1.1032292 + objectReference: {fileID: 0} + - target: {fileID: -3214267034143217929, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3086436065929644917, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: -2899422035419094908, guid: 4f52f003eca24b843924f016ea500470, type: 3} @@ -337,92 +462,122 @@ PrefabInstance: - target: {fileID: -2770666803903516498, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 46.77802 + value: 46.910507 objectReference: {fileID: 0} - target: {fileID: -2770666803903516498, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 5.718221 + value: 5.7534246 objectReference: {fileID: 0} - target: {fileID: -2770666803903516498, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 3.888425 + value: 3.9134357 objectReference: {fileID: 0} - target: {fileID: -2594260964506120097, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 20.295128 + value: 20.047852 objectReference: {fileID: 0} - target: {fileID: -2594260964506120097, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 1.1530429 + value: 1.1321192 objectReference: {fileID: 0} - target: {fileID: -2594260964506120097, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 4.765787 + value: 4.7327514 objectReference: {fileID: 0} - target: {fileID: -2389525917609993686, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 32.878906 + value: 32.631413 objectReference: {fileID: 0} - target: {fileID: -2389525917609993686, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 1.1260762 + value: 1.1060379 objectReference: {fileID: 0} - target: {fileID: -2389525917609993686, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 3.8380916 + value: 3.8015056 + objectReference: {fileID: 0} + - target: {fileID: -2084811680363313996, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: -2072040086291044643, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -22.534521 + value: -18.568619 objectReference: {fileID: 0} - target: {fileID: -2072040086291044643, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -1.4041581 + value: -2.5427175 objectReference: {fileID: 0} - target: {fileID: -2072040086291044643, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0.23476483 + value: 0.48089188 objectReference: {fileID: 0} - target: {fileID: -1864740628597940677, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 10.350588 + value: 10.102508 objectReference: {fileID: 0} - target: {fileID: -1864740628597940677, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.10212263 + value: 0.09727419 objectReference: {fileID: 0} - target: {fileID: -1864740628597940677, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 1.0856397 + value: 1.0590167 objectReference: {fileID: 0} - target: {fileID: -1812909498023395591, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -0.00029069162 + value: -0.00030248667 objectReference: {fileID: 0} - target: {fileID: -1812909498023395591, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0.0008316897 + value: -0.00087384466 objectReference: {fileID: 0} - target: {fileID: -1812909498023395591, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -19.221828 + value: -18.928846 + objectReference: {fileID: 0} + - target: {fileID: -1781356600409242780, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1703473491307067327, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1425791611860619382, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1268151995469589007, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1200856079203341021, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: -1070350730909333850, guid: 4f52f003eca24b843924f016ea500470, type: 3} @@ -454,6 +609,31 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -15.988905 objectReference: {fileID: 0} + - target: {fileID: -751476226918971245, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -552831747908440785, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -298872764833787496, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -290750445479886849, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -203856693384778745, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: -104578136787704052, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -469,41 +649,75 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -14.253611 objectReference: {fileID: 0} + - target: {fileID: -76546954072915012, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9171100556185337, guid: 4f52f003eca24b843924f016ea500470, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 205264445719448523, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 366175167995203695, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 6.5537615 + value: 6.5517464 objectReference: {fileID: 0} - target: {fileID: 366175167995203695, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.9042835 + value: 0.87203723 objectReference: {fileID: 0} - target: {fileID: 366175167995203695, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0.10972907 + value: -0.2375275 + objectReference: {fileID: 0} + - target: {fileID: 414117464747255840, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 608321761475470972, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 56.329697 + value: 56.095936 objectReference: {fileID: 0} - target: {fileID: 608321761475470972, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -8.320191 + value: -8.799026 objectReference: {fileID: 0} - target: {fileID: 608321761475470972, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -1.947632 + value: -2.4475415 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_Name value: Erika objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: 1082271958561512970, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 1092408308860062549, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -537,107 +751,162 @@ PrefabInstance: - target: {fileID: 1330755669629619180, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 12.88041 + value: 12.632788 objectReference: {fileID: 0} - target: {fileID: 1330755669629619180, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.6049972 + value: 0.58890665 objectReference: {fileID: 0} - target: {fileID: 1330755669629619180, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 3.5778992 + value: 3.548537 + objectReference: {fileID: 0} + - target: {fileID: 1339101018200438765, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 1564860333797465651, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 36.404316 + value: 36.157005 objectReference: {fileID: 0} - target: {fileID: 1564860333797465651, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 1.4431683 + value: 1.4192299 objectReference: {fileID: 0} - target: {fileID: 1564860333797465651, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 4.3857803 + value: 4.34583 + objectReference: {fileID: 0} + - target: {fileID: 1711505207429034123, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 1852576806548013000, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -17.093325 + value: -16.945585 objectReference: {fileID: 0} - target: {fileID: 1852576806548013000, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -6.7397947 + value: -6.2092924 objectReference: {fileID: 0} - target: {fileID: 1852576806548013000, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 4.6057963 + value: 5.730829 + objectReference: {fileID: 0} + - target: {fileID: 2158975759703390516, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2334541885690575373, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 2559285840627121667, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -4.7258544 + value: -2.4869711 objectReference: {fileID: 0} - target: {fileID: 2559285840627121667, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -5.7849193 + value: -6.22651 objectReference: {fileID: 0} - target: {fileID: 2559285840627121667, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -126.47922 + value: -178.84671 objectReference: {fileID: 0} - target: {fileID: 2563496969622287784, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0.00023053572 + value: 0.00012243926 objectReference: {fileID: 0} - target: {fileID: 2563496969622287784, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0.0015822343 + value: -0.0016105212 objectReference: {fileID: 0} - target: {fileID: 2563496969622287784, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 14.506036 + value: 13.064403 + objectReference: {fileID: 0} + - target: {fileID: 2586065998465600510, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2715566404302941441, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2898355158428612036, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 2916570863362053800, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 47.103104 + value: 47.124924 objectReference: {fileID: 0} - target: {fileID: 2916570863362053800, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -5.80562 + value: -5.811549 objectReference: {fileID: 0} - target: {fileID: 2916570863362053800, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -3.951395 + value: -3.9556582 + objectReference: {fileID: 0} + - target: {fileID: 3047284246813455858, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3135921509060577837, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 3183749884578473501, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 24.78951 + value: 24.541662 objectReference: {fileID: 0} - target: {fileID: 3183749884578473501, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.6019398 + value: 0.5887373 objectReference: {fileID: 0} - target: {fileID: 3183749884578473501, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 2.7410555 + value: 2.7095728 + objectReference: {fileID: 0} + - target: {fileID: 3588849560313704984, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3614653200513675785, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 3667946887678727147, guid: 4f52f003eca24b843924f016ea500470, type: 3} @@ -654,35 +923,75 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -14.241459 objectReference: {fileID: 0} + - target: {fileID: 3882815353823017779, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3948933247560734027, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3974016661214395164, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4114030615378554161, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4237274458221626025, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4441848305933595309, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4549111882529890269, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 4747904710347621765, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 18.757017 + value: 18.509638 objectReference: {fileID: 0} - target: {fileID: 4747904710347621765, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 1.0257381 + value: 1.0058761 objectReference: {fileID: 0} - target: {fileID: 4747904710347621765, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 4.61585 + value: 4.583698 + objectReference: {fileID: 0} + - target: {fileID: 4936884950917866777, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 5048025441337412694, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 10.056734 + value: 10.055965 objectReference: {fileID: 0} - target: {fileID: 5048025441337412694, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -18.79211 + value: -18.80846 objectReference: {fileID: 0} - target: {fileID: 5048025441337412694, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -18.623432 + value: -18.729767 objectReference: {fileID: 0} - target: {fileID: 5097370190579632962, guid: 4f52f003eca24b843924f016ea500470, type: 3} @@ -699,6 +1008,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -26.023373 objectReference: {fileID: 0} + - target: {fileID: 5120724536234783804, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5372056943023685468, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -717,32 +1031,42 @@ PrefabInstance: - target: {fileID: 5465940246521907071, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -4.6794786 + value: -5.1064534 objectReference: {fileID: 0} - target: {fileID: 5465940246521907071, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -1.7092497 + value: -1.5698754 objectReference: {fileID: 0} - target: {fileID: 5465940246521907071, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0.27375126 + value: -1.2985562 + objectReference: {fileID: 0} + - target: {fileID: 5567237881422871782, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 6000407479487422213, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 57.856754 + value: 57.48826 objectReference: {fileID: 0} - target: {fileID: 6000407479487422213, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -4.7429924 + value: -5.3131566 objectReference: {fileID: 0} - target: {fileID: 6000407479487422213, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -7.073846 + value: -7.1815233 + objectReference: {fileID: 0} + - target: {fileID: 6240733294840144465, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 6341119541397085964, guid: 4f52f003eca24b843924f016ea500470, type: 3} @@ -762,107 +1086,132 @@ PrefabInstance: - target: {fileID: 6502182839619065283, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -2.2784052 + value: -2.1213183 objectReference: {fileID: 0} - target: {fileID: 6502182839619065283, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 23.799194 + value: 24.03912 objectReference: {fileID: 0} - target: {fileID: 6502182839619065283, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 4.3862123 + value: 5.09346 + objectReference: {fileID: 0} + - target: {fileID: 6514210125699187276, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 6515712193588681746, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -5.504001 + value: -5.4161077 objectReference: {fileID: 0} - target: {fileID: 6515712193588681746, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -1.4028769 + value: -1.4146731 objectReference: {fileID: 0} - target: {fileID: 6515712193588681746, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -3.332922 + value: -3.2710824 objectReference: {fileID: 0} - target: {fileID: 6655383506977046455, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 37.672756 + value: 37.425426 objectReference: {fileID: 0} - target: {fileID: 6655383506977046455, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 1.5835503 + value: 1.5581791 objectReference: {fileID: 0} - target: {fileID: 6655383506977046455, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 4.601701 + value: 4.560298 objectReference: {fileID: 0} - target: {fileID: 7078722787440015773, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 64.10246 + value: 63.998062 objectReference: {fileID: 0} - target: {fileID: 7078722787440015773, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -96.532364 + value: -97.01278 objectReference: {fileID: 0} - target: {fileID: 7078722787440015773, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 180.39992 + value: 179.64677 + objectReference: {fileID: 0} + - target: {fileID: 7363479242261063072, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7542137907003004905, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 7666680083751660616, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 10.350635 + value: 10.102561 objectReference: {fileID: 0} - target: {fileID: 7666680083751660616, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.09843706 + value: 0.09355867 objectReference: {fileID: 0} - target: {fileID: 7666680083751660616, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 1.0849587 + value: 1.0583582 + objectReference: {fileID: 0} + - target: {fileID: 7732535366517880319, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7776229726456038893, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 objectReference: {fileID: 0} - target: {fileID: 8169382868667117632, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -6.4148116 + value: -6.5555224 objectReference: {fileID: 0} - target: {fileID: 8169382868667117632, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 15.573551 + value: 15.357347 objectReference: {fileID: 0} - target: {fileID: 8169382868667117632, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -121.26486 + value: -173.74974 objectReference: {fileID: 0} - target: {fileID: 8255111157037086696, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 12.463665 + value: 12.216072 objectReference: {fileID: 0} - target: {fileID: 8255111157037086696, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.5785499 + value: 0.56272656 objectReference: {fileID: 0} - target: {fileID: 8255111157037086696, guid: 4f52f003eca24b843924f016ea500470, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 3.822857 + value: 3.7937038 objectReference: {fileID: 0} - target: {fileID: 8447082967072642302, guid: 4f52f003eca24b843924f016ea500470, type: 3} @@ -879,6 +1228,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 28.400003 objectReference: {fileID: 0} + - target: {fileID: 8817898888258712963, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8953972740105248388, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9037727976738196030, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -911,6 +1275,14 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 2021050794510230391} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + insertIndex: -1 + addedObject: {fileID: 830459960541254450} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 4f52f003eca24b843924f016ea500470, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7905829003486985161} m_SourcePrefab: {fileID: 100100000, guid: 4f52f003eca24b843924f016ea500470, type: 3} --- !u!1 &4663426026667250098 stripped GameObject: @@ -930,7 +1302,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: - GlobalObjectIdHash: 638232703 + GlobalObjectIdHash: 3916998080 AlwaysReplicateAsRoot: 0 SynchronizeTransform: 1 ActiveSceneSynchronization: 0 @@ -948,7 +1320,7 @@ Animator: m_GameObject: {fileID: 4663426026667250098} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 30914248533bfd94caae7d85f239a2bc, type: 2} + m_Controller: {fileID: 9100000, guid: 469b0ff8216d21e44a84438fb82a155f, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -978,13 +1350,13 @@ CharacterController: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Height: 2 - m_Radius: 0.5 + m_Height: 1.47 + m_Radius: 0.35 m_SlopeLimit: 45 - m_StepOffset: 0.3 - m_SkinWidth: 0.08 + m_StepOffset: 0.25 + m_SkinWidth: 0.25 m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 1.05, z: 0} + m_Center: {x: 0, y: 0.9, z: 0} --- !u!114 &3771768284763951197 MonoBehaviour: m_ObjectHideFlags: 0 @@ -992,7 +1364,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4663426026667250098} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} m_Name: @@ -1040,7 +1412,7 @@ MonoBehaviour: JumpTimeout: 0.5 FallTimeout: 0.15 Grounded: 1 - GroundedOffset: 0.13 + GroundedOffset: -0.14 GroundedRadius: 0.28 GroundLayers: serializedVersion: 2 @@ -1069,6 +1441,50 @@ MonoBehaviour: analogMovement: 0 cursorLocked: 1 cursorInputForLook: 1 +--- !u!114 &830459960541254450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4663426026667250098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcbf6eee32d3ec54fa1b9fd9929b7bec, type: 3} + m_Name: + m_EditorClassIdentifier: + SyncPositionX: 1 + SyncPositionY: 1 + SyncPositionZ: 1 + SyncRotAngleX: 0 + SyncRotAngleY: 1 + SyncRotAngleZ: 0 + SyncScaleX: 0 + SyncScaleY: 0 + SyncScaleZ: 0 + PositionThreshold: 0.001 + RotAngleThreshold: 0.01 + ScaleThreshold: 0.01 + UseQuaternionSynchronization: 0 + UseQuaternionCompression: 0 + UseHalfFloatPrecision: 0 + InLocalSpace: 0 + Interpolate: 1 + SlerpPosition: 0 +--- !u!114 &7905829003486985161 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4663426026667250098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b02d2af4a8667b7439dfdd74d286fa7c, type: 3} + m_Name: + m_EditorClassIdentifier: + TransitionStateInfoList: [] + m_Animator: {fileID: 7385380308929055139} --- !u!4 &5475253377034111752 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4f52f003eca24b843924f016ea500470, diff --git a/DarkFlow/Assets/Editor/StartupSceneLoader.cs b/DarkFlow/Assets/Editor/StartupSceneLoader.cs index c19b057..ac50b67 100644 --- a/DarkFlow/Assets/Editor/StartupSceneLoader.cs +++ b/DarkFlow/Assets/Editor/StartupSceneLoader.cs @@ -1,12 +1,29 @@ using UnityEditor; +using UnityEngine; using UnityEditor.SceneManagement; +using Unity.Services.Authentication; +#if UNITY_EDITOR +using ParrelSync; +#endif [InitializeOnLoadAttribute] public static class StartupSceneLoader { static StartupSceneLoader() { + +#if UNITY_EDITOR + if (ParrelSync.ClonesManager.IsClone()) + { + string customArgument = ParrelSync.ClonesManager.GetArgument(); + AuthenticationService.Instance.SwitchProfile($"Clone_{customArgument}_Profile"); + //Debug.Log("_______" + AuthenticationService.Instance.GetPlayerNameAsync()); + } +#endif + EditorApplication.playModeStateChanged += LoadStartupScene; + + } static void LoadStartupScene(PlayModeStateChange state) @@ -18,9 +35,11 @@ static void LoadStartupScene(PlayModeStateChange state) if (state == PlayModeStateChange.EnteredPlayMode) { - if (EditorSceneManager.GetActiveScene().buildIndex != 0 && EditorSceneManager.GetActiveScene().name !="systemTest" ) + if (EditorSceneManager.GetActiveScene().buildIndex != 0 && EditorSceneManager.GetActiveScene().name != "systemTest") { EditorSceneManager.LoadScene(0); + + } } } diff --git a/DarkFlow/Assets/Scenes/Gameplay.unity b/DarkFlow/Assets/Scenes/Gameplay.unity index da9636d..201883c 100644 --- a/DarkFlow/Assets/Scenes/Gameplay.unity +++ b/DarkFlow/Assets/Scenes/Gameplay.unity @@ -270,6 +270,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3178543384667556823, guid: 154519ab488f20d468de4e06396e2441, + type: 3} + propertyPath: m_ShowCameraFrustum + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6818833442393802118, guid: 154519ab488f20d468de4e06396e2441, type: 3} propertyPath: m_Name @@ -308,22 +313,22 @@ PrefabInstance: - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, type: 3} propertyPath: m_LocalPosition.y - value: 112.660286 + value: 2.82 objectReference: {fileID: 0} - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, type: 3} propertyPath: m_LocalPosition.z - value: -1688.0701 + value: -14.1 objectReference: {fileID: 0} - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.9884675 objectReference: {fileID: 0} - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.15143338 objectReference: {fileID: 0} - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, type: 3} @@ -487,6 +492,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 368218139850001400, guid: 773b39ed367c011418f28a8bc3b8ca31, + type: 3} + propertyPath: m_Priority + value: 1 + objectReference: {fileID: 0} - target: {fileID: 368218139850001400, guid: 773b39ed367c011418f28a8bc3b8ca31, type: 3} propertyPath: m_Lens.FieldOfView @@ -520,22 +530,22 @@ PrefabInstance: - target: {fileID: 8854747452121219814, guid: 773b39ed367c011418f28a8bc3b8ca31, type: 3} propertyPath: m_LocalPosition.y - value: 112.660286 + value: 2.82 objectReference: {fileID: 0} - target: {fileID: 8854747452121219814, guid: 773b39ed367c011418f28a8bc3b8ca31, type: 3} propertyPath: m_LocalPosition.z - value: -1688.0701 + value: -14.1 objectReference: {fileID: 0} - target: {fileID: 8854747452121219814, guid: 773b39ed367c011418f28a8bc3b8ca31, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.9884675 objectReference: {fileID: 0} - target: {fileID: 8854747452121219814, guid: 773b39ed367c011418f28a8bc3b8ca31, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.15143338 objectReference: {fileID: 0} - target: {fileID: 8854747452121219814, guid: 773b39ed367c011418f28a8bc3b8ca31, type: 3} @@ -550,7 +560,7 @@ PrefabInstance: - target: {fileID: 8854747452121219814, guid: 773b39ed367c011418f28a8bc3b8ca31, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 17.42 objectReference: {fileID: 0} - target: {fileID: 8854747452121219814, guid: 773b39ed367c011418f28a8bc3b8ca31, type: 3} @@ -613,7 +623,7 @@ PrefabInstance: - target: {fileID: 7539522792964821713, guid: a4c43bf8901061a40a02054aba85ff81, type: 3} propertyPath: m_LocalPosition.y - value: 1.908 + value: 0.56 objectReference: {fileID: 0} - target: {fileID: 7539522792964821713, guid: a4c43bf8901061a40a02054aba85ff81, type: 3} diff --git a/DarkFlow/Assets/Scripts/CameraController.cs b/DarkFlow/Assets/Scripts/CameraController.cs deleted file mode 100644 index 5b9ac4f..0000000 --- a/DarkFlow/Assets/Scripts/CameraController.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Cinemachine; -using UnityEngine; -//using UnityEngine.Assertions; - -public class CameraController : MonoBehaviour -{ - - //private CinemachineVirtualCamera m_MainCamera; - private Transform m_CharFollow; - public CinemachineVirtualCamera m_CamFollow; - - void Start() - { - AttachCamera(); - } - - private void AttachCamera() - { - //m_MainCamera = GameObject.FindObjectOfType(); - //Assert.IsNotNull(m_MainCamera, "Couldn't find gameplay camera"); - - m_CharFollow = GameObject.FindGameObjectWithTag("Player").transform.GetChild(0).transform; - - //if (m_MainCamera) - if (m_CamFollow) - { - //m_MainCamera.Follow = m_CharFollow; - m_CamFollow.Follow = m_CharFollow; - //m_MainCamera.LookAt = m_CharFollow; - m_CamFollow.LookAt = m_CharFollow; - - // camera body / aim - //m_MainCamera.Follow = transform; - //m_MainCamera.LookAt = transform; - // default rotation / zoom - // m_MainCamera.m_Heading.m_Bias = 40f; - //m_MainCamera.m_YAxis.Value = 0.5f; - - } - } -} - diff --git a/DarkFlow/Assets/Scripts/CameraFollow.cs b/DarkFlow/Assets/Scripts/CameraFollow.cs new file mode 100644 index 0000000..b087e49 --- /dev/null +++ b/DarkFlow/Assets/Scripts/CameraFollow.cs @@ -0,0 +1,33 @@ +using Unity.Netcode; +using Cinemachine; +using UnityEngine; +//using UnityEngine.Assertions; + +public class CameraFollow : NetworkBehaviour +{ + + private Transform m_CharFollow; + public CinemachineVirtualCamera m_CamFollow; + + void Start() + { + + if (!IsOwner) { return; } + AttachCamera(); + + } + + private void AttachCamera() + { + + m_CharFollow = GameObject.FindGameObjectWithTag("Player").transform.GetChild(0).transform; + + if (m_CamFollow) + { + m_CamFollow.Follow = m_CharFollow; + m_CamFollow.LookAt = m_CharFollow; + + } + } +} + diff --git a/DarkFlow/Assets/Scripts/CameraController.cs.meta b/DarkFlow/Assets/Scripts/CameraFollow.cs.meta similarity index 100% rename from DarkFlow/Assets/Scripts/CameraController.cs.meta rename to DarkFlow/Assets/Scripts/CameraFollow.cs.meta diff --git a/DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs b/DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs new file mode 100644 index 0000000..39b98f5 --- /dev/null +++ b/DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using Unity.Netcode.Components; +using UnityEngine; + +[DisallowMultipleComponent] +public class ClientNetworkAnimator : NetworkAnimator +{ + + protected override bool OnIsServerAuthoritative() + { + return false; + } +} + diff --git a/DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs.meta b/DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs.meta new file mode 100644 index 0000000..fbd98e8 --- /dev/null +++ b/DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b02d2af4a8667b7439dfdd74d286fa7c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/DarkFlow/Assets/Scripts/ClientNetworkTransform.cs b/DarkFlow/Assets/Scripts/ClientNetworkTransform.cs new file mode 100644 index 0000000..a7793a6 --- /dev/null +++ b/DarkFlow/Assets/Scripts/ClientNetworkTransform.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using Unity.Netcode.Components; +using UnityEngine; + +[DisallowMultipleComponent] +public class ClientNetworkTransform : NetworkTransform +{ + protected override bool OnIsServerAuthoritative() + { + return false; + } +} diff --git a/DarkFlow/Assets/Scripts/ClientNetworkTransform.cs.meta b/DarkFlow/Assets/Scripts/ClientNetworkTransform.cs.meta new file mode 100644 index 0000000..77c5499 --- /dev/null +++ b/DarkFlow/Assets/Scripts/ClientNetworkTransform.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dcbf6eee32d3ec54fa1b9fd9929b7bec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/DarkFlow/Assets/Scripts/InputSystem/ThirdPersonController.cs b/DarkFlow/Assets/Scripts/InputSystem/ThirdPersonController.cs index 6600af0..06dc026 100644 --- a/DarkFlow/Assets/Scripts/InputSystem/ThirdPersonController.cs +++ b/DarkFlow/Assets/Scripts/InputSystem/ThirdPersonController.cs @@ -1,12 +1,14 @@ -using Cinemachine; +using Unity.Netcode; +using Cinemachine; using UnityEngine; #if ENABLE_INPUT_SYSTEM using UnityEngine.InputSystem; #endif -/* Note: animations are called via the controller for both the character and capsule using animator null checks - */ +/* Note: animations are called via the controller for both +the character and capsule using animator null checks +*/ namespace StarterAssets { @@ -14,7 +16,8 @@ namespace StarterAssets #if ENABLE_INPUT_SYSTEM [RequireComponent(typeof(PlayerInput))] #endif - public class ThirdPersonController : MonoBehaviour + //public class ThirdPersonController : MonoBehaviour + public class ThirdPersonController : NetworkBehaviour { [Header("Player")] [Tooltip("Move speed of the character in m/s")] @@ -142,16 +145,17 @@ private void Start() _cinemachineTargetYaw = CinemachineCameraTarget.transform.rotation.eulerAngles.y; - + _hasAnimator = TryGetComponent(out _animator); _controller = GetComponent(); _input = GetComponent(); -#if ENABLE_INPUT_SYSTEM - _playerInput = GetComponent(); -#else - Debug.LogError( "Starter Assets package is missing dependencies. Please use Tools/Starter Assets/Reinstall Dependencies to fix it"); -#endif + //#if ENABLE_INPUT_SYSTEM + //_playerInput = GetComponent(); + //#else + //Debug.LogError( "Starter Assets package is missing dependencies. + // Please use Tools/Starter Assets/Reinstall Dependencies to fix it"); + //#endif AssignAnimationIDs(); @@ -160,12 +164,27 @@ private void Start() _fallTimeoutDelta = FallTimeout; } + public override void OnNetworkSpawn() + { + base.OnNetworkSpawn(); + + if (IsClient && IsOwner) + { + _playerInput = GetComponent(); + _playerInput.enabled = true; + } + } + private void Update() { + + if (!IsOwner) { return; } + _hasAnimator = TryGetComponent(out _animator); JumpAndGravity(); GroundedCheck(); Move(); + } private void LateUpdate() diff --git a/DarkFlow/ProjectSettings/NetcodeForGameObjects.asset b/DarkFlow/ProjectSettings/NetcodeForGameObjects.asset new file mode 100644 index 0000000..37cb2f4 --- /dev/null +++ b/DarkFlow/ProjectSettings/NetcodeForGameObjects.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + 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: 11500000, guid: 2727d53a542a4c1aa312905c3a02d807, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset + TempNetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset + GenerateDefaultNetworkPrefabs: 1 diff --git a/DarkFlow/ProjectSettings/ProjectSettings.asset b/DarkFlow/ProjectSettings/ProjectSettings.asset index fd551b9..fda5f2b 100644 --- a/DarkFlow/ProjectSettings/ProjectSettings.asset +++ b/DarkFlow/ProjectSettings/ProjectSettings.asset @@ -78,7 +78,7 @@ PlayerSettings: androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 0 + runInBackground: 1 captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 @@ -86,7 +86,7 @@ PlayerSettings: deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 - usePlayerLog: 1 + usePlayerLog: 0 dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 @@ -101,7 +101,7 @@ PlayerSettings: xboxEnableKinectAutoTracking: 0 xboxEnableFitness: 0 visibleInBackground: 1 - allowFullscreenSwitch: 1 + allowFullscreenSwitch: 0 fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0