diff --git a/Assets/Prefabs/King/King.prefab b/Assets/Prefabs/King/King.prefab index 3e28167..027f66a 100644 --- a/Assets/Prefabs/King/King.prefab +++ b/Assets/Prefabs/King/King.prefab @@ -67,7 +67,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 10 + m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -356,8 +356,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 45, y: 45} + m_AnchoredPosition: {x: 0, y: -110} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3173415395512048815 CanvasRenderer: @@ -489,8 +489,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: 0} - m_SizeDelta: {x: 45, y: 45} + m_AnchoredPosition: {x: 110, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3173415395658836172 CanvasRenderer: @@ -653,10 +653,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -720,7 +720,7 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 120 + near clip plane: 1 far clip plane: 3000 field of view: 40 orthographic: 0 @@ -775,7 +775,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3173415396104633710} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1513} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3173415395512048810} @@ -910,10 +910,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -948,7 +948,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3173415396260468954} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1513} + m_LocalPosition: {x: 0, y: 0, z: 1500} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3173415395030910393} @@ -1037,8 +1037,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: 45, y: 45} + m_AnchoredPosition: {x: 0, y: 110} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3173415396865756789 CanvasRenderer: @@ -1201,10 +1201,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1249,8 +1249,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -50, y: 0} - m_SizeDelta: {x: 45, y: 45} + m_AnchoredPosition: {x: -110, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3173415397010263562 CanvasRenderer: diff --git a/Assets/Prefabs/King/KingGrid.prefab b/Assets/Prefabs/King/KingGrid.prefab index 63e3750..44fd0d1 100644 --- a/Assets/Prefabs/King/KingGrid.prefab +++ b/Assets/Prefabs/King/KingGrid.prefab @@ -309343,6 +309343,7 @@ Transform: - {fileID: 2879175009711542516} - {fileID: 703957704678148043} - {fileID: 7860323274346430103} + - {fileID: 8450506077131514903} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} @@ -380195,6 +380196,36 @@ Transform: m_Father: {fileID: 5923592731438575550} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8488236490961927371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8450506077131514903} + m_Layer: 8 + m_Name: BufferRow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8450506077131514903 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8488236490961927371} + 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: [] + m_Father: {fileID: 292792145040222136} + m_RootOrder: 177 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8488949377293424720 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Demos/KingImpGraybox.unity b/Assets/Scenes/Demos/KingImpGraybox.unity index 1647970..25c183e 100644 --- a/Assets/Scenes/Demos/KingImpGraybox.unity +++ b/Assets/Scenes/Demos/KingImpGraybox.unity @@ -10218,7 +10218,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Goo: {fileID: 9109488354154531999, guid: e0a933a7f4d98134ea0c045fabc6a6a0, type: 3} - Folder: {fileID: 497375465} LayerMask: serializedVersion: 2 m_Bits: 64 @@ -63934,6 +63933,10 @@ PrefabInstance: propertyPath: HailSprite value: objectReference: {fileID: 454718203} + - target: {fileID: 3173415396083440353, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: near clip plane + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3173415396104633698, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: UItext value: diff --git a/Assets/Scripts/KingScripts/GridReveal.cs b/Assets/Scripts/KingScripts/GridReveal.cs index 8dcc167..2d4bf11 100644 --- a/Assets/Scripts/KingScripts/GridReveal.cs +++ b/Assets/Scripts/KingScripts/GridReveal.cs @@ -7,10 +7,10 @@ public class GridReveal : MonoBehaviour private GameObject[] Rows; private float TempKingPos = 0; private int Index = 0; - private int ROSCount = 105; + private int ROSCount = 110; private int BoxSize = 20; private int ValleyStr = -670; - private int MountainStr = -3700; + private int MountainStr = -2640; void Start() { List RowsList = new List(); @@ -30,7 +30,7 @@ public class GridReveal : MonoBehaviour //A function for enabling and disabalimg the Visability of the King's Grid as the King Moves public void DynGridReveal(float KingPos, float MovDir) { - if(KingPos > ValleyStr || KingPos < MountainStr) { //Cancels out the function if the King is in the valley or the mountain + if(KingPos > ValleyStr || KingPos <= MountainStr) { //Cancels out the function if the King is in the valley or the mountain return; } if(TempKingPos >= KingPos + BoxSize || TempKingPos <= KingPos - BoxSize) { //Moves the Grid Everytime is King has moved 20 Units @@ -40,7 +40,7 @@ public class GridReveal : MonoBehaviour } else if (MovDir >= 0) { //Moving Right Rows[Index].SetActive(false);//Deactivates Leftmost - if (Index <= (Rows.Length) - ROSCount) {//Prevents OfB error + if (Index <= (Rows.Length - 1) - ROSCount) {//Prevents OfB error Rows[Index + ROSCount].SetActive(true);//Activates Rightmost Index++; } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 9456d1b..b6807b5 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,28 +9,28 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25 flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb