diff --git a/Assets/Baby Parts/baby base1.png b/Assets/Baby Parts/baby base1.png deleted file mode 100644 index 2f904e5..0000000 --- a/Assets/Baby Parts/baby base1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae3c5442cf08a2087063b7afbe18c9b48844ddafadc27572e41afee0a37859a0 -size 26338 diff --git a/Assets/Baby Parts/baby base2.png b/Assets/Baby Parts/baby base2.png deleted file mode 100644 index afad52b..0000000 --- a/Assets/Baby Parts/baby base2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:923de1f21124633c12fa1e7cb89875f2bc746ed371258f81d31e670657c9adfb -size 28143 diff --git a/Assets/Baby Parts/baby base3.png b/Assets/Baby Parts/baby base3.png deleted file mode 100644 index b8733eb..0000000 --- a/Assets/Baby Parts/baby base3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03aa913cfff1afe0335d122937d92299328d515b4890f277c204acfb28889dbe -size 25588 diff --git a/Assets/Baby Parts/baby eye 1 blue.png b/Assets/Baby Parts/baby eye 1 blue.png deleted file mode 100644 index b6060c0..0000000 --- a/Assets/Baby Parts/baby eye 1 blue.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ab23907e4e6779a2de99b9a4f042074acb002742053cc8406094c483a30e305 -size 7428 diff --git a/Assets/Baby Parts/baby eye 1 brown.png b/Assets/Baby Parts/baby eye 1 brown.png deleted file mode 100644 index 0cc2902..0000000 --- a/Assets/Baby Parts/baby eye 1 brown.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1054659d732e4f561c9adc1194e2a7ab424e847df072d27989b7b239cf9c5b52 -size 7840 diff --git a/Assets/Baby Parts/baby eye 1 green.png b/Assets/Baby Parts/baby eye 1 green.png deleted file mode 100644 index 27e68a7..0000000 --- a/Assets/Baby Parts/baby eye 1 green.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d97cf853b0b92e317bcd43819cfe3c0eb3f56f8e0b3303afb6c040869efdddc2 -size 8465 diff --git a/Assets/Baby Parts/baby hat1.png b/Assets/Baby Parts/baby hat1.png deleted file mode 100644 index 6a9e0ba..0000000 --- a/Assets/Baby Parts/baby hat1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3b3b538196b4300a41735e538ccbe20be3393c257ab12d7295b93b4bbf9e7b4 -size 16511 diff --git a/Assets/Baby Parts/baby hat2.png b/Assets/Baby Parts/baby hat2.png deleted file mode 100644 index a657149..0000000 --- a/Assets/Baby Parts/baby hat2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9c60b198c4e1786cdf742f8cae6205c7726c00d6cb3aa14a5b530d17008ab73 -size 12946 diff --git a/Assets/Baby Parts/baby hat3.png b/Assets/Baby Parts/baby hat3.png deleted file mode 100644 index 24e2601..0000000 --- a/Assets/Baby Parts/baby hat3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02ce68161b28d3ec43dd8d76d64655c78952b06df457ff4169ec6a6a19bc6395 -size 17938 diff --git a/Assets/Baby Parts/baby pant 1.png b/Assets/Baby Parts/baby pant 1.png deleted file mode 100644 index c264a0b..0000000 --- a/Assets/Baby Parts/baby pant 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3cc4fe335add6e4759515d3c3649fe42532a681b8ad0d2c842474aff0c9eb464 -size 30189 diff --git a/Assets/Baby Parts/baby pant 2.1.png b/Assets/Baby Parts/baby pant 2.1.png deleted file mode 100644 index 5d62e36..0000000 --- a/Assets/Baby Parts/baby pant 2.1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f622c6738db9c98018b67df6e3148e290c44bf3bf86f0ce5ba17d8c49c11f128 -size 29336 diff --git a/Assets/Baby Parts/baby smile 1.png b/Assets/Baby Parts/baby smile 1.png deleted file mode 100644 index 4d68a4c..0000000 --- a/Assets/Baby Parts/baby smile 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa768308f3bb8737a66d4b7b3508b708b0049f1da0eb9eb075d325dc568618f9 -size 7830 diff --git a/Assets/Baby Parts/baby smile 2.png b/Assets/Baby Parts/baby smile 2.png deleted file mode 100644 index be8ac79..0000000 --- a/Assets/Baby Parts/baby smile 2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be7fc40f2505ffd029bd2224a4ea0b09106472be87300bd2a626699403b82781 -size 13321 diff --git a/Assets/Baby Parts/baby smile 3.png b/Assets/Baby Parts/baby smile 3.png deleted file mode 100644 index b390c37..0000000 --- a/Assets/Baby Parts/baby smile 3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdb649bf9cd08abdd64b01d513e1b16028621cf65f9ed2bb5f0b341038cafd65 -size 9695 diff --git a/Assets/Baby Parts/baby top1.png b/Assets/Baby Parts/baby top1.png deleted file mode 100644 index 2acea1e..0000000 --- a/Assets/Baby Parts/baby top1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:706fc3c856ffe63bac67b0a993cdbba3736b442fe376b26a0c93ae255f42bad5 -size 22865 diff --git a/Assets/Baby Parts/baby top2.png b/Assets/Baby Parts/baby top2.png deleted file mode 100644 index 4615215..0000000 --- a/Assets/Baby Parts/baby top2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f414c6c7e6229f505d4e5f07713ffeeab220cfbedca88d858c93c8e9368bae86 -size 16031 diff --git a/Assets/Baby Parts/baby top3.png b/Assets/Baby Parts/baby top3.png deleted file mode 100644 index 742e0df..0000000 --- a/Assets/Baby Parts/baby top3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c744fcd8c99c07017688a859ca1f5096d959e7f8fca39c93df612f0fbc69816f -size 20523 diff --git a/Assets/ParentBehaviour.cs b/Assets/ParentBehaviour.cs index e70652e..6f1fd55 100644 --- a/Assets/ParentBehaviour.cs +++ b/Assets/ParentBehaviour.cs @@ -16,16 +16,35 @@ public class ParentBehaviour : MonoBehaviour public List order = new List(); + public ParentBehaviour otherParent; + + public Texture2D[] parentBases; + public Texture2D parentFaceNeutral; + public Texture2D parentFaceHappy1; + public Texture2D parentFaceHappy2; + public Texture2D parentFaceAngry; + public Texture2D parentFaceTalk; + [ContextMenu("Get Random Child")] public void GetRandomChild() { - int _childIndex = Random.Range(0, babySpawner.transform.childCount); - - child = babySpawner.transform.GetChild(_childIndex).gameObject; - - //CHECK IF OTHER PARENT WANTS THIS CHILD (if otherParent.child == child) - + bool _validChild = false; + while (!_validChild) + { + int _childIndex = Random.Range(0, babySpawner.transform.childCount); + + child = babySpawner.transform.GetChild(_childIndex).gameObject; + + if (otherParent.child != null) + { + if (child != otherParent.child) + { + //this prevents both parents asking for the same child + _validChild = true; + } + } + } Randomizer _childRandomizer = child.GetComponent(); baseVis = _childRandomizer.baseObj.GetComponent().material.mainTexture; @@ -39,19 +58,76 @@ public class ParentBehaviour : MonoBehaviour order.Insert(Random.Range(0, order.Count), "eye"); order.Insert(Random.Range(0, order.Count), "top"); order.Insert(Random.Range(0, order.Count), "bottom"); + } - foreach (string item in order) + public bool CheckChild(GameObject _child) + { + if (_child == child) { - print(item); + return true; + } + else + { + return false; } - - - } + public Texture GiveDetails(GameObject _child) + { + for (int i = 0; i < order.Count; i++) + { + switch (order[i]){ + case "base": + if (child.GetComponent().baseObj.GetComponent().material.mainTexture != baseVis) + { + return baseVis; + } + break; + case "hat": + if (child.GetComponent().hatObj.GetComponent().material.mainTexture != hatVis) + { + return hatVis; + } + break; + case "eye": + if (child.GetComponent().eyeObj.GetComponent().material.mainTexture != eyeVis) + { + return eyeVis; + } + break; + case "top": + if (child.GetComponent().topObj.GetComponent().material.mainTexture != topVis) + { + return topVis; + } + break; + case "bottom": + if (child.GetComponent().bottomObj.GetComponent().material.mainTexture != bottomVis) + { + return bottomVis; + } + break; + default: + break; + } + } + return null; + } - - - + private void OnTriggerEnter(Collider other) + { + if (other.gameObject.tag == "child") + { + if (CheckChild(other.gameObject)) + { + //this is the correct child + } + else + { + Texture _displayGraphic = GiveDetails(other.gameObject); + //display the display graphic + } + } + } } diff --git a/Assets/Scenes/MainGameplayScene.unity b/Assets/Scenes/MainGameplayScene.unity index dd91a3f..7779a3d 100644 --- a/Assets/Scenes/MainGameplayScene.unity +++ b/Assets/Scenes/MainGameplayScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:879cd3be92bcf57e57a83bcd3a41280eec406bdf9d2774469395afd5b46913c6 -size 652115 +oid sha256:69828bf48a3e1b2ad75c94c5c7920507f8f8d7aa6f5483f47a889a2b527d942b +size 655013 diff --git a/Assets/Scenes/PlayerJoinScene.unity b/Assets/Scenes/PlayerJoinScene.unity index a2d10f9..d5da38f 100644 --- a/Assets/Scenes/PlayerJoinScene.unity +++ b/Assets/Scenes/PlayerJoinScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc8615481614d10a6fbf0d0e29458c5676bbc21338acc548e0c9be44d1946b77 -size 40106 +oid sha256:7bbf138ceeb4fa2cf0afbe0709f0cd128e6f2199a5e6e909864e15c6ffec0a46 +size 40588 diff --git a/Assets/Scenes/Testing Scenes/PlayerTest.unity b/Assets/Scenes/Testing Scenes/PlayerTest.unity index e2ca249..5570b6f 100644 --- a/Assets/Scenes/Testing Scenes/PlayerTest.unity +++ b/Assets/Scenes/Testing Scenes/PlayerTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82a3624880dbdde6439e2199bb7135c2cd2304884e782a5d4ed6dc7eeefbe537 -size 37832 +oid sha256:ca5a18f37f8c37c1b6d8cafd7d2335518a6da3ffa309484650b655398ef01cb0 +size 40318 diff --git a/Assets/Scripts/Behaviours/YeetController.cs b/Assets/Scripts/Behaviours/YeetController.cs index c379355..aa47c65 100644 --- a/Assets/Scripts/Behaviours/YeetController.cs +++ b/Assets/Scripts/Behaviours/YeetController.cs @@ -1,8 +1,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.InputSystem; -public class YeetController : MonoBehaviour +public class YeetController : InputBehaviour { public GameObject parent { get; set; } @@ -10,6 +11,9 @@ public class YeetController : MonoBehaviour public float yeetDuration = 2f; public float windupSpeed = 0.01f; + [SerializeField] + private Animator m_YeetAnimator; + public enum YeetState { Unheld, Held, Yeeting }; public YeetState yeetState { get; private set; } = YeetState.Unheld; @@ -37,10 +41,16 @@ public class YeetController : MonoBehaviour yeetState = YeetState.Held; m_lineRenderer = gameObject.AddComponent(); + + m_YeetAnimator.SetBool("Carry", true); + m_YeetAnimator.SetBool("Yeet", true); } public void Yeet() { + m_YeetAnimator.SetBool("Yeet", false); + m_YeetAnimator.SetBool("Carry", false); + _child.transform.parent = null; _child.transform.rotation = parent.transform.rotation; _child.GetComponent().held = true; @@ -112,7 +122,7 @@ public class YeetController : MonoBehaviour m_child = null; } - private void OnYeet() + private void OnYeet(InputAction.CallbackContext args) { parent = m_body; switch (yeetState) @@ -132,4 +142,13 @@ public class YeetController : MonoBehaviour } } + public override void RegisterInput(PlayerInput playerInput) + { + playerInput.currentActionMap.FindAction("Yeet").performed += OnYeet; + } + + public override void UnregisterInput(PlayerInput playerInput) + { + playerInput.currentActionMap.FindAction("Yeet").performed -= OnYeet; + } } \ No newline at end of file diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index bc68ab3..bb7af02 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -14,6 +14,16 @@ public class GameManager : MonoBehaviour private Camera m_camera; + private void OnEnable() + { + m_PlayerList.OnPlayerJoin += OnPlayerJoin; + } + + private void OnDisable() + { + m_PlayerList.OnPlayerJoin -= OnPlayerJoin; + } + // Start is called before the first frame update void Start() { @@ -25,23 +35,28 @@ public class GameManager : MonoBehaviour { foreach (PlayerData data in m_PlayerList.AllPlayers) { - GameObject newPlayer = Instantiate(m_playerPrefab); + SpawnPlayer(data); + } + } - data.Input.SwitchCurrentActionMap("Gameplay"); - foreach (InputBehaviour input in newPlayer.GetComponentsInChildren()) - input.Initialise(data); + private void SpawnPlayer(PlayerData data) + { + GameObject newPlayer = Instantiate(m_playerPrefab); - newPlayer.GetComponentInChildren().Initalise(data); + data.Input.SwitchCurrentActionMap("Gameplay"); - newPlayer.transform.position += Vector3.ProjectOnPlane(Random.insideUnitSphere, Vector3.up); - } - } + foreach (InputBehaviour input in newPlayer.GetComponentsInChildren()) + input.Initialise(data); + + newPlayer.GetComponentInChildren().Initalise(data); + newPlayer.transform.position += Vector3.ProjectOnPlane(Random.insideUnitSphere, Vector3.up); + } - private void LateUpdate() + private void OnPlayerJoin(object sender, PlayerData data) { - + SpawnPlayer(data); } } diff --git a/Assets/Scripts/Player Scripts/PlayerInputController.cs b/Assets/Scripts/Player Scripts/PlayerInputController.cs index 6885ce0..14eba79 100644 --- a/Assets/Scripts/Player Scripts/PlayerInputController.cs +++ b/Assets/Scripts/Player Scripts/PlayerInputController.cs @@ -21,6 +21,9 @@ public class PlayerInputController : InputBehaviour + "1.0 = forward")] private AnimationCurve m_turnRadius; + [SerializeField] + private Animator m_legAnimator; + private CharacterController m_controller; private Vector3 m_desiredDirection; @@ -55,13 +58,17 @@ public class PlayerInputController : InputBehaviour private void ApplyMovement() { - if (!m_recievedInput) - return; + + + float forwardRatio = (Vector3.Dot(transform.forward, m_desiredDirection.normalized) + 1) / 2; float speed = m_turnRadius.Evaluate(forwardRatio) * m_playerSpeed; + m_legAnimator.SetFloat("Movement", speed); + if (!m_recievedInput) + return; m_controller.Move(transform.forward * speed * Time.deltaTime); } diff --git a/Assets/Scripts/Player Scripts/PlayerManager.cs b/Assets/Scripts/Player Scripts/PlayerManager.cs index 8ea12b5..98764db 100644 --- a/Assets/Scripts/Player Scripts/PlayerManager.cs +++ b/Assets/Scripts/Player Scripts/PlayerManager.cs @@ -8,6 +8,9 @@ using UnityEngine.InputSystem; public class PlayerManager : MonoBehaviour { + private static PlayerManager Instance; + + [SerializeField] private PlayerList m_connectedPlayers; @@ -16,7 +19,7 @@ public class PlayerManager : MonoBehaviour private void OnEnable() { - DontDestroyOnLoad(gameObject); + DoSingleton(); m_playerManager = GetComponent(); } @@ -40,6 +43,19 @@ public class PlayerManager : MonoBehaviour m_playerManager.DisableJoining(); } + private void DoSingleton() + { + + if (Instance == null) + { + Instance = this; + DontDestroyOnLoad(gameObject); + } + else + { + Destroy(gameObject); + } + } } diff --git a/Assets/Scripts/Player Scripts/PlayerVisuals.cs b/Assets/Scripts/Player Scripts/PlayerVisuals.cs index 9c6b40f..b52d3de 100644 --- a/Assets/Scripts/Player Scripts/PlayerVisuals.cs +++ b/Assets/Scripts/Player Scripts/PlayerVisuals.cs @@ -30,7 +30,7 @@ public class PlayerVisuals : MonoBehaviour transform.rotation = m_camera.transform.rotation; transform.Rotate(new Vector3(0, 180, 0)); - float direction = Mathf.Sign(Vector3.Dot(m_moveingObject.transform.forward, -m_camera.transform.right)); + float direction = Mathf.Sign(Vector3.Dot(m_moveingObject.transform.forward, m_camera.transform.right)); transform.localScale = new Vector3(m_startScale.x * direction, m_startScale.y, m_startScale.z); diff --git a/Assets/World Assets/Prefabs/InputManager.prefab b/Assets/World Assets/Prefabs/InputManager.prefab new file mode 100644 index 0000000..14b01a3 --- /dev/null +++ b/Assets/World Assets/Prefabs/InputManager.prefab @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6929064296049357302 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6929064296049357301} + - component: {fileID: 6929064296049357300} + - component: {fileID: 6929064296049357303} + m_Layer: 0 + m_Name: InputManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6929064296049357301 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6929064296049357302} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 688.96094, y: 341.05954, z: -20.100098} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6929064296049357300 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6929064296049357302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 621567455fd1c4ceb811cc8a00b6a1a5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NotificationBehavior: 0 + m_MaxPlayerCount: -1 + m_AllowJoining: 1 + m_JoinBehavior: 0 + m_PlayerJoinedEvent: + m_PersistentCalls: + m_Calls: [] + m_PlayerLeftEvent: + m_PersistentCalls: + m_Calls: [] + m_JoinAction: + m_UseReference: 0 + m_Action: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Reference: {fileID: 0} + m_PlayerPrefab: {fileID: 58898615521178267, guid: a6e856a6c9908294097d6caf773187cf, type: 3} + m_SplitScreen: 0 + m_MaintainAspectRatioInSplitScreen: 0 + m_FixedNumberOfSplitScreens: -1 + m_SplitScreenRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &6929064296049357303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6929064296049357302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b239f355fc6175e4dbe9a26698704b06, type: 3} + m_Name: + m_EditorClassIdentifier: + m_connectedPlayers: {fileID: 11400000, guid: fed0cedb50710c846b7007e6032b8a2c, type: 2} diff --git a/Assets/World Assets/Prefabs/InputManager.prefab.meta b/Assets/World Assets/Prefabs/InputManager.prefab.meta new file mode 100644 index 0000000..6c3ccc1 --- /dev/null +++ b/Assets/World Assets/Prefabs/InputManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3192e0591f18de14db022cdb627f5017 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/World Assets/Prefabs/Player.prefab b/Assets/World Assets/Prefabs/Player.prefab index 03b1623..df8222a 100644 --- a/Assets/World Assets/Prefabs/Player.prefab +++ b/Assets/World Assets/Prefabs/Player.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2643327028999286732 +--- !u!1 &2725293205319018834 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,37 +8,165 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1167696238296845307} - - component: {fileID: 1341142098817708722} + - component: {fileID: 2725293205319018844} + - component: {fileID: 2725293205319018846} + - component: {fileID: 2725293205319018847} + - component: {fileID: -6157332607153341915} + - component: {fileID: 4872809617701416922} m_Layer: 0 - m_Name: Player_prototype + m_Name: Player m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1167696238296845307 +--- !u!4 &2725293205319018844 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2643327028999286732} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.11, y: 6.13, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 2725293205319018834} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 10} m_Children: - - {fileID: 5965212798371097713} - m_Father: {fileID: 2725293204815276925} + - {fileID: 7280267804154012179} + m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1341142098817708722 +--- !u!143 &2725293205319018846 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2725293205319018834} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Height: 1.14 + m_Radius: 0.23 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0.57, z: 0} +--- !u!114 &2725293205319018847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2725293205319018834} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 513431a08a8506242ba8fc3919ccf76e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_playerSpeed: 20 + m_rotationSpeed: 10 + m_turnRadius: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.0041656494 + value: -0.030670166 + inSlope: 0.025728988 + outSlope: 0.025728988 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.49194917 + - serializedVersion: 3 + time: 0.8174471 + value: 0.3057876 + inSlope: 1.5812289 + outSlope: 1.5812289 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.12696037 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_legAnimator: {fileID: 7280267804702354912} +--- !u!114 &-6157332607153341915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2725293205319018834} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8fa05fb7e07cd834287b7e97ac2f7576, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4872809617701416922 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2725293205319018834} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 188bb300967eea14fb681a94fc31f911, type: 3} + m_Name: + m_EditorClassIdentifier: + yeetVelocity: 20 + yeetDuration: 2 + windupSpeed: 0.05 + m_YeetAnimator: {fileID: 7280267804803618209} +--- !u!1 &6496616781582263990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5965212798371097713} + - component: {fileID: 9135536610966766493} + m_Layer: 0 + m_Name: player_apron + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5965212798371097713 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6496616781582263990} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 6.12, z: 0.01} + m_LocalScale: {x: -1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7280267804154012179} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &9135536610966766493 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2643327028999286732} + m_GameObject: {fileID: 6496616781582263990} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -72,7 +200,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: b8f8aafc0bafaec4aa9ffc439415ce9f, type: 3} + m_Sprite: {fileID: 21300000, guid: 92c5da83b31a4504b93abd518db4f89a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -83,7 +211,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2725293204815276914 +--- !u!1 &7280267804154012178 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -91,294 +219,98 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2725293204815276925} - - component: {fileID: 2725293204815276921} - - component: {fileID: 2725293204815276926} - - component: {fileID: 2725293204815276927} - - component: {fileID: 2725293204815276924} - - component: {fileID: 8744383078323344904} + - component: {fileID: 7280267804154012179} + - component: {fileID: 6010903807752901786} m_Layer: 0 - m_Name: Player_Object + m_Name: PlayerVisuals m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2725293204815276925 +--- !u!4 &7280267804154012179 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293204815276914} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 7280267804154012178} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.27916, y: 0.27916, z: 0.27916} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: - - {fileID: 1167696238296845307} + - {fileID: 7280267804702354914} + - {fileID: 7280267804803618211} + - {fileID: 5965212798371097713} m_Father: {fileID: 2725293205319018844} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2725293204815276921 +--- !u!114 &6010903807752901786 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293204815276914} + m_GameObject: {fileID: 7280267804154012178} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} + m_Script: {fileID: 11500000, guid: f1c5224ac04236e479fb805642e4f051, type: 3} m_Name: m_EditorClassIdentifier: - m_MeshFormatVersion: 1 - m_Faces: - - m_Indexes: 000000000100000002000000010000000300000002000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 040000000500000006000000050000000700000006000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 08000000090000000a000000090000000b0000000a000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 0c0000000d0000000e0000000d0000000f0000000e000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 100000001100000012000000110000001300000012000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 140000001500000016000000150000001700000016000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - m_SharedVertices: - - m_Vertices: 000000000d00000016000000 - - m_Vertices: 010000000400000017000000 - - m_Vertices: 020000000f00000010000000 - - m_Vertices: 030000000600000011000000 - - m_Vertices: 050000000800000015000000 - - m_Vertices: 070000000a00000013000000 - - m_Vertices: 090000000c00000014000000 - - m_Vertices: 0b0000000e00000012000000 - m_SharedTextures: [] - m_Positions: - - {x: -0.25, y: 0, z: 0.25} - - {x: 0.25, y: 0, z: 0.25} - - {x: -0.25, y: 0.5, z: 0.25} - - {x: 0.25, y: 0.5, z: 0.25} - - {x: 0.25, y: 0, z: 0.25} - - {x: 0.25, y: 0, z: -0.25} - - {x: 0.25, y: 0.5, z: 0.25} - - {x: 0.25, y: 0.5, z: -0.25} - - {x: 0.25, y: 0, z: -0.25} - - {x: -0.25, y: 0, z: -0.25} - - {x: 0.25, y: 0.5, z: -0.25} - - {x: -0.25, y: 0.5, z: -0.25} - - {x: -0.25, y: 0, z: -0.25} - - {x: -0.25, y: 0, z: 0.25} - - {x: -0.25, y: 0.5, z: -0.25} - - {x: -0.25, y: 0.5, z: 0.25} - - {x: -0.25, y: 0.5, z: 0.25} - - {x: 0.25, y: 0.5, z: 0.25} - - {x: -0.25, y: 0.5, z: -0.25} - - {x: 0.25, y: 0.5, z: -0.25} - - {x: -0.25, y: 0, z: -0.25} - - {x: 0.25, y: 0, z: -0.25} - - {x: -0.25, y: 0, z: 0.25} - - {x: 0.25, y: 0, z: 0.25} - m_Textures0: - - {x: 0.25, y: 0} - - {x: -0.25, y: 0} - - {x: 0.25, y: 0.5} - - {x: -0.25, y: 0.5} - - {x: 0.25, y: 0} - - {x: -0.25, y: 0} - - {x: 0.25, y: 0.5} - - {x: -0.25, y: 0.5} - - {x: 0.25, y: 0} - - {x: -0.25, y: 0} - - {x: 0.25, y: 0.5} - - {x: -0.25, y: 0.5} - - {x: 0.25, y: 0} - - {x: -0.25, y: 0} - - {x: 0.25, y: 0.5} - - {x: -0.25, y: 0.5} - - {x: -0.25, y: 0.25} - - {x: 0.25, y: 0.25} - - {x: -0.25, y: -0.25} - - {x: 0.25, y: -0.25} - - {x: 0.25, y: -0.25} - - {x: -0.25, y: -0.25} - - {x: 0.25, y: 0.25} - - {x: -0.25, y: 0.25} - m_Textures2: [] - m_Textures3: [] - m_Tangents: - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: 0, y: 0, z: 1, w: -1} - - {x: 0, y: 0, z: 1, w: -1} - - {x: 0, y: 0, z: 1, w: -1} - - {x: 0, y: 0, z: 1, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 0, y: 0, z: -1, w: -1} - - {x: 0, y: 0, z: -1, w: -1} - - {x: 0, y: 0, z: -1, w: -1} - - {x: 0, y: 0, z: -1, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - m_Colors: - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - - {r: 0.21219465, g: 0.70870423, b: 1, a: 1} - m_UnwrapParameters: - m_HardAngle: 88 - m_PackMargin: 20 - m_AngleError: 8 - m_AreaError: 15 - m_PreserveMeshAssetOnDestroy: 0 - assetGuid: - m_Mesh: {fileID: 0} - m_IsSelectable: 1 - m_SelectedFaces: - m_SelectedEdges: [] - m_SelectedVertices: ---- !u!23 &2725293204815276926 -MeshRenderer: + m_apron: {fileID: 9135536610966766493} + m_moveingObject: {fileID: 2725293205319018844} +--- !u!1 &7280267804702354919 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7280267804702354914} + - component: {fileID: 7280267804702354913} + - component: {fileID: 7280267804702354912} + m_Layer: 0 + m_Name: Leggies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7280267804702354914 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7280267804702354919} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 6.12, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7280267804154012179} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7280267804702354913 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293204815276914} + m_GameObject: {fileID: 7280267804702354919} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 + m_RayTracingMode: 0 m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: cf090111a0629e140ac2e501d96af05f, type: 2} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -391,7 +323,7 @@ MeshRenderer: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 2 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -399,44 +331,37 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &2725293204815276927 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293204815276914} - m_Mesh: {fileID: 0} ---- !u!64 &2725293204815276924 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293204815276914} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 0} ---- !u!114 &8744383078323344904 -MonoBehaviour: + m_Sprite: {fileID: 21300000, guid: b249bf06e141ffb45946004dda1c875d, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9, y: 12.75} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &7280267804702354912 +Animator: + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293204815276914} + m_GameObject: {fileID: 7280267804702354919} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1c5224ac04236e479fb805642e4f051, type: 3} - m_Name: - m_EditorClassIdentifier: - m_apron: {fileID: 9135536610966766493} - m_moveingObject: {fileID: 2725293205319018844} ---- !u!1 &2725293205319018834 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: bedbeaccb77baa348a06697fa90713e0, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &7280267804803618208 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -444,147 +369,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2725293205319018844} - - component: {fileID: 2725293205319018846} - - component: {fileID: 2725293205319018847} - - component: {fileID: -6157332607153341915} + - component: {fileID: 7280267804803618211} + - component: {fileID: 7280267804803618210} + - component: {fileID: 7280267804803618209} m_Layer: 0 - m_Name: Player + m_Name: Body m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2725293205319018844 +--- !u!4 &7280267804803618211 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293205319018834} + m_GameObject: {fileID: 7280267804803618208} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2725293204815276925} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!143 &2725293205319018846 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293205319018834} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 1.8 - m_Radius: 0.5 - m_SlopeLimit: 45 - m_StepOffset: 0.3 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 0.9, z: 0} ---- !u!114 &2725293205319018847 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293205319018834} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 513431a08a8506242ba8fc3919ccf76e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_playerSpeed: 5 - m_rotationSpeed: 10 - m_turnRadius: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.0041656494 - value: -0.030670166 - inSlope: 0.025728988 - outSlope: 0.025728988 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0.49194917 - - serializedVersion: 3 - time: 0.8174471 - value: 0.3057876 - inSlope: 1.5812289 - outSlope: 1.5812289 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.12696037 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!114 &-6157332607153341915 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293205319018834} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8fa05fb7e07cd834287b7e97ac2f7576, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &6496616781582263990 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5965212798371097713} - - component: {fileID: 9135536610966766493} - m_Layer: 0 - m_Name: player_apron - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5965212798371097713 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6496616781582263990} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 6.12, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1167696238296845307} - m_RootOrder: 0 + m_Father: {fileID: 7280267804154012179} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &9135536610966766493 +--- !u!212 &7280267804803618210 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6496616781582263990} + m_GameObject: {fileID: 7280267804803618208} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -618,9 +433,9 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 92c5da83b31a4504b93abd518db4f89a, type: 3} + m_Sprite: {fileID: 21300000, guid: 7828493adb9df0c4dba3507fc5d88543, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 + m_FlipX: 1 m_FlipY: 0 m_DrawMode: 0 m_Size: {x: 9, y: 12.75} @@ -629,3 +444,22 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &7280267804803618209 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7280267804803618208} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 13a2a9f986badba459f5a1e1eb21ab34, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c3df0dd..2676c4a 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b860e60a2c05ee077303c4a200ab9c3192b4f54776c0dee7e78b846b41dffd4e -size 463 +oid sha256:edd4fcab3ab45f6bd4bbc4193ce3e12e36123e183ac011a15afb24b3f70433e5 +size 569 diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index b75a80b..e23edbb 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4057c0c98a8017b1346eab48b1e2929bdcda4ba9d1834dfbeb732262bd29d17a -size 1453 +oid sha256:b286851b15416b9eaf1e26119cc9f5fdb63ec6d4df95104bf01f269266694c41 +size 1445