diff --git a/Assets/Scripts/Dice.cs b/Assets/Scripts/Dice.cs index 15774c9..ef8a164 100644 --- a/Assets/Scripts/Dice.cs +++ b/Assets/Scripts/Dice.cs @@ -36,7 +36,7 @@ public class Dice : MonoBehaviour { if (diceResult[0] < diceResult[1]) { upgrade.canUpgrade = true; //kisebb szam valasztasa eseten fejlesztes egyszer } else { - energiasav.csokkenEnergia(); //nagyobb szam valasztasa eseten -1 energia + energiasav.csokkenEnergia(1); //nagyobb szam valasztasa eseten -1 energia } //a valasztott szam atirasa az akcio mezobe @@ -49,7 +49,7 @@ public class Dice : MonoBehaviour { if (diceResult[1] < diceResult[0]) { upgrade.canUpgrade = true; } else { - energiasav.csokkenEnergia(); + energiasav.csokkenEnergia(1); } //a valasztott szam atirasa az akcio mezobe diff --git a/Assets/Scripts/Energia.cs b/Assets/Scripts/Energia.cs index f5b5cb5..f28a0d8 100644 --- a/Assets/Scripts/Energia.cs +++ b/Assets/Scripts/Energia.cs @@ -6,28 +6,25 @@ using TMPro; public class Energia : MonoBehaviour { public TMP_Text[] energiasav_text; - private int enegiasav_index = 0; + private int energiasav_index = 0; - public int getEnergiasavIndex() { return enegiasav_index; } - public void setEnegiasavIndex(int ertek) { enegiasav_index = ertek; } + public int getEnergiasavIndex() { return energiasav_index; } + public void setEnegiasavIndex(int ertek) { energiasav_index = ertek; } - // Start is called before the first frame update - void Start() - { + public void csokkenEnergia(int number) { + if (energiasav_index > 30) return; + + for (int i = 0; i < number; i++) { + //if (number + enegiasav_index > energiasav_text.Length) break; + if (energiasav_index >= 30) { + energiasav_index = 29; + break; + } + + energiasav_text[getEnergiasavIndex()].text = "X"; + setEnegiasavIndex(getEnergiasavIndex() + 1); + } - } - - // Update is called once per frame - void Update() - { - - } - - public void csokkenEnergia() { - if (enegiasav_index > 29) return; - - energiasav_text[getEnergiasavIndex()].text = "X"; - setEnegiasavIndex(getEnergiasavIndex() + 1); Debug.Log("energia csokkent"); } diff --git a/Assets/Scripts/TurnManager.cs b/Assets/Scripts/TurnManager.cs index 91698e6..a973390 100644 --- a/Assets/Scripts/TurnManager.cs +++ b/Assets/Scripts/TurnManager.cs @@ -6,6 +6,8 @@ public class TurnManager : MonoBehaviour { private Dice dice; private Akciopont akciopont; + private Energia energia; + private Upgrade upgrade; public int turnCounter = 1; @@ -13,16 +15,17 @@ public class TurnManager : MonoBehaviour { dice = FindObjectOfType(); akciopont = FindObjectOfType(); - + energia = FindObjectOfType(); + upgrade = FindObjectOfType(); } public void nextTurn() { dice.setLocked(false); akciopont.resetAkciopont(); + energia.csokkenEnergia(upgrade.energia[upgrade.getEnergiaIndex()]); turnCounter++; dice.hely1.sprite = null; dice.hely2.sprite = null; Debug.Log("kovetkezo kor " + turnCounter); } - } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index be9e9e6..bfdce21 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 2670 + controlID: 2441 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 2625 + controlID: 2442 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 2626 + controlID: 2443 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.22078298, y: 0.3557275, z: -0.5135746} + m_Target: {x: -3.1082315, y: 0.3504266, z: -0.47566897} speed: 2 - m_Value: {x: -0.22078298, y: 0.3557275, z: -0.5135746} + m_Value: {x: -3.1082315, y: 0.3504266, z: -0.47566897} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -610,9 +610,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 14.710003 + m_Target: 11.590663 speed: 2 - m_Value: 14.710003 + m_Value: 11.590663 m_Ortho: m_Target: 1 speed: 2 @@ -661,7 +661,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 2589 + controlID: 2399 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -681,8 +681,8 @@ MonoBehaviour: y: 0 width: 803 height: 355 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 11} m_Panes: - {fileID: 11} @@ -742,8 +742,8 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: d2760000 - m_LastClickedID: 30418 + m_SelectedIDs: e6760000 + m_LastClickedID: 30438 m_ExpandedIDs: 00000000c4760000c6760000c8760000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -797,8 +797,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: f86b0000 - m_LastClickedInstanceID: 27640 + m_SelectedInstanceIDs: cc1d0000 + m_LastClickedInstanceID: 7628 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: @@ -942,7 +942,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 27640 + m_LastInspectedObjectInstanceID: 7628 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index ec36569..669ce33 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Scene m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 421} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 3084 + controlID: 2554 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 3085 + controlID: 2559 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 3086 + controlID: 2560 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -247,7 +247,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 3251 + controlID: 2651 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -319,8 +319,8 @@ MonoBehaviour: y: 0 width: 459 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -346,8 +346,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 286 - y: 19 + x: 285 + y: 73 width: 1174 height: 571 m_ViewDataDictionary: {fileID: 0} @@ -364,7 +364,7 @@ MonoBehaviour: m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 1 + m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -449,9 +449,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f86b0000 - m_LastClickedID: 27640 - m_ExpandedIDs: 28fbffffc26e0000 + m_SelectedIDs: 626b0000 + m_LastClickedID: 27490 + m_ExpandedIDs: 28fbffffc26e0000ca740000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -755,9 +755,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.22078298, y: 0.3557275, z: -0.5135746} + m_Target: {x: -6.295707, y: -0.30118555, z: -0.49746647} speed: 2 - m_Value: {x: -0.22078298, y: 0.3557275, z: -0.5135746} + m_Value: {x: -5.7913537, y: 0.117702305, z: -0.491716} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -808,9 +808,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 14.710003 + m_Target: 13.353886 speed: 2 - m_Value: 14.710003 + m_Value: 12.778838 m_Ortho: m_Target: 1 speed: 2 @@ -876,21 +876,21 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 55 m_LastFolders: - - Assets/Scripts + - Assets m_LastFoldersGridSize: 55 m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: d2760000 - m_LastClickedID: 30418 + m_SelectedIDs: c4760000 + m_LastClickedID: 30404 m_ExpandedIDs: 00000000c4760000c6760000c8760000 m_RenameOverlay: m_UserAcceptedRename: 0