diff --git a/Assets/Prefabs/King/King.prefab b/Assets/Prefabs/King/King.prefab index a9c7390..6990b04 100644 --- a/Assets/Prefabs/King/King.prefab +++ b/Assets/Prefabs/King/King.prefab @@ -32,10 +32,10 @@ RectTransform: m_Father: {fileID: 3173415395030910393} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 257.10004, y: 427.50037} - m_SizeDelta: {x: 575, y: -854.99927} + m_AnchoredPosition: {x: 257.10004, y: -112.49963} + m_SizeDelta: {x: 575, y: 225.00073} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6673008730120561264 CanvasRenderer: @@ -294,10 +294,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -597,6 +597,7 @@ GameObject: - component: {fileID: 3173415396083440355} - component: {fileID: 3173415396083440353} - component: {fileID: 3173415396083440352} + - component: {fileID: 800369901022370546} m_Layer: 0 m_Name: PlayerCam m_TagString: PlayerCam @@ -669,6 +670,20 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3173415396083440366} m_Enabled: 0 +--- !u!114 &800369901022370546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3173415396083440366} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 513ef02ab3cad964683609b4c344cfd3, type: 3} + m_Name: + m_EditorClassIdentifier: + Panel: {fileID: 2874167961789946757} + Text: {fileID: 3173415396260468954} --- !u!1 &3173415396104633710 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Demos/KingImpGraybox.unity b/Assets/Scenes/Demos/KingImpGraybox.unity index 409eb86..7b4b65c 100644 --- a/Assets/Scenes/Demos/KingImpGraybox.unity +++ b/Assets/Scenes/Demos/KingImpGraybox.unity @@ -10258,6 +10258,7 @@ MonoBehaviour: dashItem: {fileID: 0} nitroItem: {fileID: 0} kickItem: {fileID: 0} + slide: {fileID: 0} grapple: {fileID: 0} Glide: {fileID: 0} boxHighlight: {fileID: 0} @@ -23593,6 +23594,11 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 875501760} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &884284910 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2874167961789946757, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + m_PrefabInstance: {fileID: 3173415395841196137} + m_PrefabAsset: {fileID: 0} --- !u!1 &884767691 GameObject: m_ObjectHideFlags: 0 @@ -33729,6 +33735,11 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1209583623} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1212541735 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3173415396260468954, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + m_PrefabInstance: {fileID: 3173415395841196137} + m_PrefabAsset: {fileID: 0} --- !u!1 &1213788331 GameObject: m_ObjectHideFlags: 0 @@ -35926,7 +35937,7 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3173415396260468956, guid: d23bf55f2a40d494487eb188930f895d, type: 3} m_PrefabInstance: {fileID: 3173415395841196137} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1212541735} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -63797,6 +63808,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 800369901022370546, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: Text + value: + objectReference: {fileID: 1212541735} + - target: {fileID: 800369901022370546, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: Panel + value: + objectReference: {fileID: 884284910} - target: {fileID: 3173415395027047143, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_Text value: Thunder @@ -63873,6 +63892,26 @@ PrefabInstance: propertyPath: near clip plane value: 1 objectReference: {fileID: 0} + - target: {fileID: 3173415396083440355, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.8849877 + objectReference: {fileID: 0} + - target: {fileID: 3173415396083440355, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.46561444 + objectReference: {fileID: 0} + - target: {fileID: 3173415396083440355, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3173415396083440355, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3173415396083440355, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3173415396104633697, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_Enabled value: 0 diff --git a/Assets/Scripts/KingScripts/KingPlace.cs b/Assets/Scripts/KingScripts/KingPlace.cs index 640c289..51669bd 100644 --- a/Assets/Scripts/KingScripts/KingPlace.cs +++ b/Assets/Scripts/KingScripts/KingPlace.cs @@ -43,7 +43,7 @@ public class KingPlace : NetworkBehaviour private KingAbility KABump = new KingAbility(6, 10); - private float[] MountPlats = { 303.41f, 315.5f, 330.5f, 345.5f, 360.5f, 400.5f, 415.5f, 430.5f, 470.5f, 485.5f, 500.5f }; + private float[] MountPlats = { 302f, 314f, 329f, 344f, 359f, 399f, 414f, 429f, 469f, 484f, 499f, 514f}; private float[] MountxOffsets = { -50f, -73.4f, -100f, -127f, -134.7f, -130f, -34f, 14.5f, 91.2f, 129f, 129.5f }; private float[] MountzOffsets = { 130f, 120f, 97f, 56.6f, 32f, -50f, -135.5f, -138.5f, -105f, -52.5f, 50f }; @@ -186,8 +186,8 @@ public class KingPlace : NetworkBehaviour if (PlaceTemp.transform.position.x < MontStr.x) {//King is trying to place on the mountain Platform = null; bool found = false; - for(int i = 0; i < MountPlats.Length; i++) { - if (MountPlats[i] == PlaceTemp.transform.position.y) {//Finds the platform by comparing y values + for(int i = 0; i < MountPlats.Length-1; i++) { + if (MountPlats[i] <= PlaceTemp.transform.position.y && MountPlats[i+1] >= PlaceTemp.transform.position.y) {//Finds the platform by comparing y values Platform = MountGrid.transform.Find("Platform" + i).gameObject;//Sets the platform and offsets for that platform MountxOffset = MountxOffsets[i]; MountzOffset = MountzOffsets[i]; @@ -299,9 +299,8 @@ public class KingPlace : NetworkBehaviour {//King is trying to place on the mountain Platform = null; bool found = false; - for (int i = 0; i < MountPlats.Length; i++) - { - if (MountPlats[i] == PlaceTemp.transform.position.y) + for (int i = 0; i < MountPlats.Length-1; i++) { + if (MountPlats[i] <= PlaceTemp.transform.position.y && MountPlats[i + 1] >= PlaceTemp.transform.position.y) {//Finds the platform by comparing y values Platform = MountGrid.transform.Find("Platform" + i).gameObject;//Sets the platform and offsets for that platform MountxOffset = MountxOffsets[i]; @@ -397,7 +396,7 @@ public class KingPlace : NetworkBehaviour Arrow.SetActive(true); SlimeBody.transform.LookAt(Arrow.transform); - SlimeBody.transform.Rotate(0, -90, 0); + SlimeBody.transform.Rotate(0, -90, -5); return DirNumber; } diff --git a/Assets/Scripts/KingScripts/KingZoom.cs b/Assets/Scripts/KingScripts/KingZoom.cs index 005c5f8..ab90347 100644 --- a/Assets/Scripts/KingScripts/KingZoom.cs +++ b/Assets/Scripts/KingScripts/KingZoom.cs @@ -4,15 +4,64 @@ using UnityEngine; public class KingZoom : MonoBehaviour { + + Camera cam; + Quaternion BaseRot; + + public GameObject Panel; + public GameObject Text; // Start is called before the first frame update void Start() { - + cam = gameObject.GetComponent();//Gets the camera and its rotation + BaseRot = transform.rotation; } + bool Zoomed = false; + float RotSpeed = .5f; + float minXAngle = 40f; + float maxXAngle = 70f; + float minYAngle = -45f; + float maxYAngle = 45f; + + float XAng, YAng; // Update is called once per frame void Update() { - + if (Input.GetKeyUp(KeyCode.W))//Switches in and out of zoom + { + if (Zoomed == false) + { + cam.fieldOfView = 15;//Zooms in + Panel.transform.localPosition = new Vector3(Panel.transform.localPosition.x, Panel.transform.localPosition.y, 4150f);//Moves the UI Text in with the zoom + Text.transform.localPosition = new Vector3(Text.transform.localPosition.x, Text.transform.localPosition.y, 4150f); + Zoomed = true; + } + else if (Zoomed == true) + { + cam.fieldOfView = 40;//Zooms out + Panel.transform.localPosition = new Vector3(Panel.transform.localPosition.x, Panel.transform.localPosition.y, 1510f);//Moves the UI Text out with the zoom + Text.transform.localPosition = new Vector3(Text.transform.localPosition.x, Text.transform.localPosition.y, 1510f); + transform.rotation = BaseRot; + Zoomed = false; + } + } + if(Zoomed == true)//If Zoomed in allows the King to rotate their veiw up and down + { + Vector3 MosPos = Input.mousePosition; + if (MosPos.y < 100)//Looks down + { + transform.Rotate(RotSpeed, 0, 0); + XAng = Mathf.Clamp(cam.transform.localEulerAngles.x, minXAngle, maxXAngle); + cam.transform.localEulerAngles = new Vector3(XAng, cam.transform.localEulerAngles.y, cam.transform.localEulerAngles.z); + } + if (MosPos.y > 1000)//Looks up + { + transform.Rotate(-RotSpeed, 0, 0); + XAng = Mathf.Clamp(cam.transform.localEulerAngles.x, minXAngle, maxXAngle); + cam.transform.localEulerAngles = new Vector3(XAng, cam.transform.localEulerAngles.y, cam.transform.localEulerAngles.z); + } + } + } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index c2e4f86..a77927c 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a + value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a + value: 22424703114646680e0b0227036c7b151b180b6519016b0515163936efef2776f7e93ffdfe flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a + value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 + value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c7b151b180b65072128370c2b143febf4312bd6e225fda92f31352d1b flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b180b65072128370c2b143febf4312bd6e225fda92f31352d1b flags: 0 vcSharedLogLevel: value: 0d5e400f0650