diff --git a/Assets/Scripts/Dice.cs b/Assets/Scripts/Dice.cs index bde67d3..a350328 100644 --- a/Assets/Scripts/Dice.cs +++ b/Assets/Scripts/Dice.cs @@ -56,6 +56,7 @@ public class Dice : MonoBehaviour { if (diceResult[0] < diceResult[1]) { if(!ugynokDobasErtek){ upgrade.canUpgrade = true; //kisebb szam valasztasa eseten fejlesztes egyszer + //locked = true; jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes); }else{ //ugynok csapat szama @@ -69,19 +70,22 @@ public class Dice : MonoBehaviour { if(!ugynokDobasErtek){ energiasav.csokkenEnergia(1); //nagyobb szam valasztasa eseten -1 energia jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); + //locked = true; }else{ //ugynok csapat szama ugynok.UgynokSorsolas(movement.jelenlegi_x, movement.jelenlegi_y, valasztottErtek); jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); } } + //if(!ugynokDobasErtek) + locked = true; - locked = true; } else if (gomb.name == "dice2btn") { valasztottErtek = diceResult[1]; if (diceResult[1] < diceResult[0]) { if(!ugynokDobasErtek){ upgrade.canUpgrade = true; //kisebb szam valasztasa eseten fejlesztes egyszer + //locked = true; jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes); }else{ //ugynok csapat szama @@ -95,26 +99,28 @@ public class Dice : MonoBehaviour { } else { if(!ugynokDobasErtek){ energiasav.csokkenEnergia(1); //nagyobb szam valasztasa eseten -1 energia + //locked = true; jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); }else{ //ugynok csapat szama - ugynok.UgynokSorsolas(movement.jelenlegi_x, movement.jelenlegi_y, valasztottErtek); + ugynok.UgynokSorsolas(movement.jelenlegi_x, movement.jelenlegi_y, valasztottErtek); jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); } } - locked = true; + //if(!ugynokDobasErtek) + locked = true; } if(!ugynokDobasErtek) ap.UpdateAkciopont(getValasztottErtek() + upgrade.akcio[upgrade.getAkcioIndex()]); - /*if(elsoDobas){ + if(elsoDobas){ //jatek kezdeskor elso dobas ugynok csapat meghatarozas kezdo helyszinen jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); CallRenderDice(true); elsoDobas = false; - }*/ + } } Debug.Log("valasztott ertek: " + valasztottErtek + " locked status: " + locked); @@ -161,7 +167,6 @@ public class Dice : MonoBehaviour { setLocked(false); } - //ha megvan a targy if(targyak.adrenalinloket > 0) { //helyszin collider kikapcsolas a gomb miatt @@ -283,8 +288,7 @@ public class Dice : MonoBehaviour { while(fusson){ time += Time.time; - Debug.Log("time: " + time); - + //Debug.Log("time: " + time); if(time >= 200f) fusson = false; diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index 97ef216..6514dd5 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -227,8 +227,8 @@ public class jatekmanager : MonoBehaviour public void NevValasztasUtan(){ if(!nev.text.Equals("")){ - UpdateGameState(GameState.UgynokValasztas); - dice.CallRenderDice(true); + UpdateGameState(GameState.KorKezdet); + //dice.CallRenderDice(true); } } diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 9ed5bbb..09fb39d 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,11 +15,11 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 28 - width: 1366 - height: 680 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: Project + m_Title: Console m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -39,12 +39,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 979 + x: 1421 y: 0 - width: 387 - height: 630 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + width: 499 + height: 947 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -70,8 +70,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 - height: 680 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -95,7 +95,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -116,8 +116,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 660 - width: 1366 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1366 - height: 630 + width: 1920 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 49 + controlID: 91 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 979 - height: 630 + width: 1421 + height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 50 + controlID: 96 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -190,8 +190,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 979 - height: 388 + width: 1421 + height: 583 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 @@ -213,8 +213,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 263 - height: 388 + width: 246 + height: 583 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -232,23 +232,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 263 + x: 246 y: 0 - width: 716 - height: 388 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} + width: 1175 + height: 583 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - {fileID: 13} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -259,24 +259,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 388 - width: 979 - height: 242 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 16} + y: 583 + width: 1421 + height: 364 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 16} - {fileID: 17} - {fileID: 12} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -298,17 +298,17 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 474 - width: 978 - height: 221 + y: 656 + width: 1420 + height: 343 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_MixersTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 60780000 - m_LastClickedID: 30816 + m_SelectedIDs: 3a790000 + m_LastClickedID: 31034 m_ExpandedIDs: 12eb343c m_RenameOverlay: m_UserAcceptedRename: 0 @@ -424,12 +424,12 @@ MonoBehaviour: oldMaxSizes: oldSplitSize: 0 m_HorizontalSplitter: - ID: 325 + ID: 9121 splitterInitialOffset: 0 currentActiveSplitter: -1 realSizes: - - 293 - - 685 + - 426 + - 994 relativeSizes: - 0.3 - 0.7 @@ -439,7 +439,7 @@ MonoBehaviour: maxSizes: - 0 - 0 - lastTotalSize: 978 + lastTotalSize: 1420 splitSize: 6 xOffset: 0 m_Version: 1 @@ -473,10 +473,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 263 - y: 86 - width: 714 - height: 367 + x: 246 + y: 73 + width: 1173 + height: 562 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -487,7 +487,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 714, y: 346} + m_TargetSize: {x: 962, y: 541} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -496,16 +496,16 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -357 - m_HBaseRangeMax: 357 - m_VBaseRangeMin: -173 - m_VBaseRangeMax: 173 + m_HBaseRangeMin: -481 + m_HBaseRangeMax: 481 + m_VBaseRangeMin: -270.5 + m_VBaseRangeMax: 270.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -514,7 +514,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -523,23 +523,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 714 - height: 346 + width: 1173 + height: 541 m_Scale: {x: 1, y: 1} - m_Translation: {x: 357, y: 173} + m_Translation: {x: 586.5, y: 270.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -357 - y: -173 - width: 714 - height: 346 + x: -586.5 + y: -270.5 + width: 1173 + height: 541 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 714, y: 367} + m_LastWindowPixelSize: {x: 1173, y: 562} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -566,9 +566,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 86 - width: 262 - height: 367 + y: 73 + width: 245 + height: 562 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -576,25 +576,25 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 467a0000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ecc5ffff32c6ffff10cbffffa6cfffff0cd6ffff70d6ffff22efffffc4efffff9ef1ffffa8f1ffff72f3ffff92f3ffff28fbffff6ec000007ec70000 + m_ExpandedIDs: 3083fffffea1ffff80a2ffff90a2ffff9aa2ffff64a4ffff70a4ffff42a8ffffc0a8ffff9aaaffffa4aaffff6eacffff8cacffffe6eeffff14fbffffa86e00001271000002760000987600008a8101008c860100228701008c890100 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Main Camera + m_OriginalName: Main Camera m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 83486 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -622,10 +622,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 263 - y: 86 - width: 714 - height: 367 + x: 246 + y: 73 + width: 1173 + height: 562 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -875,16 +875,16 @@ MonoBehaviour: m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 0 + m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.28075045, y: -0.64408726, z: 0.015206538} + m_Target: {x: -5.2513833, y: 1.164647, z: 0.02436734} speed: 2 - m_Value: {x: 0.28075045, y: -0.64408726, z: 0.015206538} + m_Value: {x: -5.2513833, y: 1.164647, z: 0.02436734} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -935,9 +935,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.497973 + m_Target: 12.756741 speed: 2 - m_Value: 12.497973 + m_Value: 12.756741 m_Ortho: m_Target: 1 speed: 2 @@ -983,9 +983,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 474 - width: 978 - height: 221 + y: 656 + width: 1420 + height: 343 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1003,22 +1003,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Scripts m_LastFoldersGridSize: -1 - m_LastProjectPath: /home/tom/Documents/dev/find the source + m_LastProjectPath: E:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 467a0000 - m_LastClickedID: 31302 - m_ExpandedIDs: 00000000467a00005e7a000000ca9a3b + m_SelectedIDs: 287b0000 + m_LastClickedID: 31528 + m_ExpandedIDs: 000000001c7b0000247b0000287b0000847d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1046,7 +1046,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000467a0000 + m_ExpandedIDs: 000000001c7b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1073,8 +1073,8 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000687a0000 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c6230000687a00003a790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1123,9 +1123,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 474 - width: 978 - height: 221 + y: 656 + width: 1420 + height: 343 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1150,10 +1150,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 979 - y: 86 - width: 386 - height: 609 + x: 1421 + y: 73 + width: 498 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default