diff --git a/Assets/Player/Body.prefab b/Assets/Player/Body.prefab new file mode 100644 index 0000000..0875995 --- /dev/null +++ b/Assets/Player/Body.prefab @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2218554982969044169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2218554982969044170} + - component: {fileID: 2218554982969044171} + - component: {fileID: 2218554982969044168} + m_Layer: 0 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2218554982969044170 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2218554982969044169} + m_LocalRotation: {x: -0.3666959, y: -0, z: -0, w: 0.93034095} + m_LocalPosition: {x: -2.89, y: 7.221, z: 1.695} + m_LocalScale: {x: 0.09, y: 0.1275, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -43.024, y: 0, z: 0} +--- !u!212 &2218554982969044171 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2218554982969044169} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 7828493adb9df0c4dba3507fc5d88543, 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 &2218554982969044168 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2218554982969044169} + 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/Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab.meta b/Assets/Player/Body.prefab.meta similarity index 74% rename from Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab.meta rename to Assets/Player/Body.prefab.meta index f280892..a3ed727 100644 --- a/Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab.meta +++ b/Assets/Player/Body.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c3cc089e72190e74aab4c6592121b553 +guid: 7e6ed1101a908b248991fcc5ce3eb9ad PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Player/Leggies.prefab b/Assets/Player/Leggies.prefab new file mode 100644 index 0000000..0e58920 --- /dev/null +++ b/Assets/Player/Leggies.prefab @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2287730672849659586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2287730672849659591} + - component: {fileID: 2287730672849659588} + - component: {fileID: 2287730672849659589} + m_Layer: 0 + m_Name: Leggies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2287730672849659591 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2287730672849659586} + m_LocalRotation: {x: -0.3666959, y: -0, z: -0, w: 0.93034095} + m_LocalPosition: {x: -2.89, y: 7.221, z: 1.695} + m_LocalScale: {x: 0.09, y: 0.1275, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -43.024, y: 0, z: 0} +--- !u!212 &2287730672849659588 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2287730672849659586} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + 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 &2287730672849659589 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2287730672849659586} + m_Enabled: 1 + 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 diff --git a/Assets/Player/Leggies.prefab.meta b/Assets/Player/Leggies.prefab.meta new file mode 100644 index 0000000..6537086 --- /dev/null +++ b/Assets/Player/Leggies.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f5fa65482b8fe54ca6255359adffdc8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainGameplayScene.unity b/Assets/Scenes/MainGameplayScene.unity index dd91a3f..30a44b4 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:cff5435899d1eccf8fbba0724eed7fbf71d4920bbf35bd4168af93cb0918d851 +size 657501 diff --git a/Assets/Scenes/PlayerJoinScene.unity b/Assets/Scenes/PlayerJoinScene.unity index a2d10f9..3410be3 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:50ef57180cb7e056bf7a20f27eada4434bdd64e9bb7120f0509ba56cdfd503e1 +size 40595 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..7fce9b9 100644 --- a/Assets/Scripts/Behaviours/YeetController.cs +++ b/Assets/Scripts/Behaviours/YeetController.cs @@ -1,16 +1,24 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.InputSystem; -public class YeetController : MonoBehaviour +public class YeetController : InputBehaviour { + [Tooltip("This is where the babies are held")] + public GameObject handCarryingPosition; public GameObject parent { get; set; } public float yeetVelocity = 5f; public float yeetDuration = 2f; public float windupSpeed = 0.01f; - public enum YeetState { Unheld, Held, Yeeting }; + [SerializeField] + private Animator m_YeetAnimator; + + public Material trajectoryLineMaterial; + + public enum YeetState { Unheld, Held, Preyeet, Yeeting }; public YeetState yeetState { get; private set; } = YeetState.Unheld; private GameObject _child; @@ -23,6 +31,8 @@ public class YeetController : MonoBehaviour private LineRenderer m_lineRenderer; + private Vector3 preyeetPosition; + private void Awake() { m_body = this.gameObject; @@ -33,19 +43,33 @@ public class YeetController : MonoBehaviour _child = child; _child.transform.parent = parent.transform; _child.GetComponent().held = true; + _child.GetComponent().lastHeld = parent; yeetState = YeetState.Held; + m_YeetAnimator.SetBool("Carry", true); + m_YeetAnimator.SetBool("Yeet", true); + } + + public void Preyeet() + { + preyeetPosition = parent.transform.position; m_lineRenderer = gameObject.AddComponent(); + m_lineRenderer.material = trajectoryLineMaterial; + + yeetState = YeetState.Preyeet; } 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; + _child.GetComponent().held = false; - _child.GetComponent().velocity = _child.transform.forward * m_velocityWindup + _child.transform.up * m_velocityWindup; + _child.GetComponent().velocity = calculateVelocityVector(); yeetState = YeetState.Yeeting; m_time = yeetDuration; m_velocityWindup = 0; @@ -71,15 +95,18 @@ public class YeetController : MonoBehaviour yeetState = YeetState.Unheld; } break; - case YeetState.Held: - // draw yeet lines + case YeetState.Preyeet: + //TODO: Stop player + parent.transform.position = preyeetPosition; - if(m_velocityWindup < yeetVelocity) + _child.transform.position = handCarryingPosition.transform.position; + + if (m_velocityWindup < yeetVelocity) { m_velocityWindup += windupSpeed; } - Vector3 velocity = parent.transform.forward * m_velocityWindup + parent.transform.up * m_velocityWindup; + Vector3 velocity = calculateVelocityVector(); float t; t = (-1f * velocity.y) / Physics.gravity.y; @@ -95,12 +122,23 @@ public class YeetController : MonoBehaviour m_lineRenderer.SetPosition(i, trajectoryPoint); } break; + case YeetState.Held: + //TODO: slow player + + // Stop child from wriggling + _child.transform.position = handCarryingPosition.transform.position; + break; case YeetState.Unheld: _child = null; break; } } + private Vector3 calculateVelocityVector() + { + return parent.transform.forward * m_velocityWindup + parent.transform.up * m_velocityWindup; + } + private void OnTriggerEnter(Collider collider) { Debug.Log("PlayerInputController.OnTriggerEnter: arrived"); @@ -112,7 +150,7 @@ public class YeetController : MonoBehaviour m_child = null; } - private void OnYeet() + private void OnYeet(InputAction.CallbackContext args) { parent = m_body; switch (yeetState) @@ -122,9 +160,12 @@ public class YeetController : MonoBehaviour Hold(m_child); // Grab nearest baby break; - case YeetController.YeetState.Held: + case YeetState.Preyeet: Yeet(); + break; + case YeetController.YeetState.Held: // Yeet baby + Preyeet(); break; case YeetController.YeetState.Yeeting: // Cooldown? @@ -132,4 +173,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/Behaviours/YeetHandle.cs b/Assets/Scripts/Behaviours/YeetHandle.cs index e8165ce..0300fb9 100644 --- a/Assets/Scripts/Behaviours/YeetHandle.cs +++ b/Assets/Scripts/Behaviours/YeetHandle.cs @@ -8,6 +8,8 @@ public class YeetHandle : MonoBehaviour public bool held { get; set; } + public GameObject lastHeld { get; set; } + // Start is called before the first frame update void Start() { 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/Speechbubble.png b/Assets/Speechbubble.png new file mode 100644 index 0000000..f2d8e0c --- /dev/null +++ b/Assets/Speechbubble.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5daf4d802a69c6d5f15b3206bdcbdc4286015b16308bbd1e9c830c3cd956cd5a +size 4669 diff --git a/Assets/Speechbubble.png.meta b/Assets/Speechbubble.png.meta new file mode 100644 index 0000000..4d41f82 --- /dev/null +++ b/Assets/Speechbubble.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: df9725fd82ab2c4458c4c22153defabd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 30, y: 65, z: 121, w: 38} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: 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..d882e4a 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,167 @@ 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: + handCarryingPosition: {fileID: 6686278636936064271} + yeetVelocity: 20 + yeetDuration: 2 + windupSpeed: 0.05 + m_YeetAnimator: {fileID: 7280267804803618209} + trajectoryLineMaterial: {fileID: 10301, guid: 0000000000000000f000000000000000, type: 0} +--- !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: 3 + 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 +202,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 +213,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2725293204815276914 +--- !u!1 &6686278636936064271 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -91,344 +221,70 @@ 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: 6137936579796069125} m_Layer: 0 - m_Name: Player_Object + m_Name: HandCarryingPosition m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2725293204815276925 +--- !u!4 &6137936579796069125 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293204815276914} + m_GameObject: {fileID: 6686278636936064271} 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_Children: - - {fileID: 1167696238296845307} - m_Father: {fileID: 2725293205319018844} + m_LocalPosition: {x: 0, y: 12.99, z: 0} + m_LocalScale: {x: 10, y: 10, z: 10} + m_Children: [] + m_Father: {fileID: 7280267804154012179} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2725293204815276921 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293204815276914} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, 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_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293204815276914} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: cf090111a0629e140ac2e501d96af05f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 2 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &2725293204815276927 -MeshFilter: +--- !u!1 &7280267804154012178 +GameObject: 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: + serializedVersion: 6 + m_Component: + - component: {fileID: 7280267804154012179} + - component: {fileID: 6010903807752901786} + m_Layer: 0 + m_Name: PlayerVisuals + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7280267804154012179 +Transform: 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 + 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.1, y: 0.1, z: 0.1} + m_Children: + - {fileID: 6137936579796069125} + - {fileID: 7280267804702354914} + - {fileID: 7280267804803618211} + - {fileID: 5965212798371097713} + m_Father: {fileID: 2725293205319018844} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !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: f1c5224ac04236e479fb805642e4f051, type: 3} @@ -436,7 +292,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_apron: {fileID: 9135536610966766493} m_moveingObject: {fileID: 2725293205319018844} ---- !u!1 &2725293205319018834 +--- !u!1 &7280267804702354919 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -444,110 +300,101 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2725293205319018844} - - component: {fileID: 2725293205319018846} - - component: {fileID: 2725293205319018847} - - component: {fileID: -6157332607153341915} + - component: {fileID: 7280267804702354914} + - component: {fileID: 7280267804702354913} + - component: {fileID: 7280267804702354912} m_Layer: 0 - m_Name: Player + m_Name: Leggies m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2725293205319018844 +--- !u!4 &7280267804702354914 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293205319018834} + m_GameObject: {fileID: 7280267804702354919} 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: - - {fileID: 2725293204815276925} - m_Father: {fileID: 0} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 7280267804154012179} + m_RootOrder: 1 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: +--- !u!212 &7280267804702354913 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2725293205319018834} + m_GameObject: {fileID: 7280267804702354919} 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_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + 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: 2725293205319018834} + m_GameObject: {fileID: 7280267804702354919} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8fa05fb7e07cd834287b7e97ac2f7576, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &6496616781582263990 + 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} @@ -555,36 +402,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5965212798371097713} - - component: {fileID: 9135536610966766493} + - component: {fileID: 7280267804803618211} + - component: {fileID: 7280267804803618210} + - component: {fileID: 7280267804803618209} m_Layer: 0 - m_Name: player_apron + m_Name: Body m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5965212798371097713 +--- !u!4 &7280267804803618211 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_GameObject: {fileID: 7280267804803618208} + 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: 1167696238296845307} - m_RootOrder: 0 + m_Father: {fileID: 7280267804154012179} + m_RootOrder: 2 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 +466,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 +477,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/Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab b/Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab deleted file mode 100644 index f15e3be..0000000 --- a/Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab +++ /dev/null @@ -1,135 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &1051237570 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 33932531309654967} - 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 ---- !u!1001 &2714160732044909285 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2725293204815276921, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 0} - - target: {fileID: 2725293204815276924, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 0} - - target: {fileID: 2725293204815276924, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_Convex - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2725293204815276924, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_IsTrigger - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293204815276927, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018834, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_Name - value: YeetyPlayer Variant - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalScale.y - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalScale.z - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalPosition.x - value: 1.2684288 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalPosition.z - value: -6.7718506 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018845, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_DefaultActionMap - value: 63e31309-151e-48ff-854a-81cb2511f050 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018846, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_SlopeLimit - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018847, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: body - value: - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018847, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: testChild - value: - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018847, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_playerSpeed - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018847, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_rotationSpeed - value: 10 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 47d3f018734864140ba302f6972ba575, type: 3} ---- !u!1 &33932531309654967 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2725293205319018834, guid: 47d3f018734864140ba302f6972ba575, type: 3} - m_PrefabInstance: {fileID: 2714160732044909285} - m_PrefabAsset: {fileID: 0} diff --git a/Packages/manifest.json b/Packages/manifest.json index a3e7e69..338b987 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,6 +2,7 @@ "dependencies": { "com.dbrizov.naughtyattributes": "2.0.8", "com.jreason.scriptablevariables": "0.2.1", + "com.unity.2d.sprite": "1.0.0", "com.unity.collab-proxy": "1.3.9", "com.unity.ide.rider": "1.2.1", "com.unity.ide.visualstudio": "2.0.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index ccc7dcb..533f841 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -14,6 +14,12 @@ "dependencies": {}, "url": "https://package.openupm.com" }, + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.collab-proxy": { "version": "1.3.9", "depth": 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