htamas1210/findthesource
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

targy update

Browse Source
This commit is contained in:
playmaker1210
2023-02-09 13:38:54 +01:00
parent ea470bb1d7
commit 169a2c12b0
4 changed files with 122 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/Scenes/Jatek.unity
View File

@@ -3362,6 +3362,7 @@ GameObject:
- component: {fileID: 197904217}
- component: {fileID: 197904218}
- component: {fileID: 197904220}
- component: {fileID: 197904236}
- component: {fileID: 197904222}
- component: {fileID: 197904223}
- component: {fileID: 197904224}
@@ -3375,7 +3376,6 @@ GameObject:
- component: {fileID: 197904233}
- component: {fileID: 197904234}
- component: {fileID: 197904235}
- component: {fileID: 197904236}
- component: {fileID: 197904237}
m_Layer: 0
m_Name: Mangager
@@ -3440,7 +3440,8 @@ MonoBehaviour:
adrenalinMegerosites: 0
adrenalinHasznalat: {fileID: 274472943}
confirm: {fileID: 1617719567}
cancel: {fileID: 0}
cancel: {fileID: 16285951}
mehet: 0
colliders:
- {fileID: 987029841}
- {fileID: 1580358512}
@@ -3913,8 +3914,6 @@ MonoBehaviour:
kocka2ertek: {fileID: 762817987}
ujertek1: 0
ujertek2: 0
confirmNewValue: {fileID: 815764584}
cancelNewValue: {fileID: 628297615}
targy_szamlalo: 0
adrenalinloket: 0
hackercsatlakozo: 0
@@ -3924,6 +3923,8 @@ MonoBehaviour:
fustgranat: 0
lathatatlanOltozetAktivalva: 0
matavtaviranyitoAktivalva: 0
confirmNewValue: {fileID: 815764584}
cancelNewValue: {fileID: 628297615}
--- !u!114 &197904237
MonoBehaviour:
m_ObjectHideFlags: 0

15
Assets/Scripts/Dice.cs
View File

@@ -14,7 +14,7 @@ public class Dice : MonoBehaviour {
private Targyak targyak;
public int[] diceResult = { 0, 0 };
public int[] ujertek;
public int[] ujertek = {0,0};
public int valasztottErtek; //a jatekos altal valasztott dobott ertek helye
private bool locked = false; //ne lehessen ujra kivalasztani a masikat ha mar tortent egy valasztas
@@ -22,6 +22,7 @@ public class Dice : MonoBehaviour {
public GameObject adrenalinHasznalat;
public Button confirm;
public Button cancel;
public bool mehet = false;
public BoxCollider2D[] colliders;
@@ -95,6 +96,7 @@ public class Dice : MonoBehaviour {
hely2.sprite = diceSides[diceResult[1]-1];
hely2.size = new Vector2(38, 38);
//ha megvan a targy
if(targyak.adrenalinloket > 0) {
//helyszin collider kikapcsolas a gomb miatt
HelyszinKiBekapcs(true);
@@ -114,15 +116,18 @@ public class Dice : MonoBehaviour {
adrenalinHasznalat.gameObject.SetActive(false);
if (adrenalinMegerosites) {
Debug.Log("belep");
//Debug.Log("belep");
targyak.CallAdrenalinLoket();
diceResult[0] = ujertek[0];
diceResult[1] = ujertek[1];
if(mehet){
Debug.Log("belep mehet");
diceResult[0] = targyak.ujertek1;
diceResult[1] = targyak.ujertek2;
}
}
//deaktivalas
Debug.Log("belep2");
adrenalinMegerosites = false;
HelyszinKiBekapcs(false);
//HelyszinKiBekapcs(false);
}

27
Assets/Scripts/Targyak.cs
View File

@@ -18,8 +18,6 @@ public class Targyak : MonoBehaviour
public TMP_InputField kocka2ertek;
public int ujertek1;
public int ujertek2;
public Button confirmNewValue;
public Button cancelNewValue;
public int targy_szamlalo = 0;
public int adrenalinloket = 0;
@@ -32,6 +30,10 @@ public class Targyak : MonoBehaviour
public bool matavtaviranyitoAktivalva = false;
private int randomszam;
public Button confirmNewValue;
public Button cancelNewValue;
private void Start() {
akciok = FindObjectOfType<Akciok>();
elet = FindObjectOfType<Elet>();
@@ -102,20 +104,27 @@ public class Targyak : MonoBehaviour
confirmNewValue.gameObject.SetActive(true);//aktivalja a gombot hozza
cancelNewValue.gameObject.SetActive(true);
//VARNIA KELL A GOMBRA || itt folytatja
var waitForButton = new WaitForUIButtons(confirmNewValue, cancelNewValue);
yield return waitForButton.Reset();
ujertek1 = int.Parse(kocka1ertek.text);
ujertek2 = int.Parse(kocka2ertek.text); //hogy tunik el az elozo? || egymas melle kerul a ket input vagy gomb ami deaktivalja a inputot
//VARNIA KELL A GOMBRA
var waitForButton = new WaitForUIButtons(confirmNewValue, cancelNewValue);
yield return waitForButton.Reset();
if(waitForButton.PressedButton == confirmNewValue){
deactivateInputOk(true);
dice.ujertek[0] = ujertek1; //csak akkor adja at ha leokezta
dice.ujertek[1] = ujertek2;
//dice.ujertek[0] = ujertek1; //csak akkor adja at ha leokezta
//dice.ujertek[1] = ujertek2; //uj adat amit a user adott meg
dice.mehet = true;
dice.HelyszinKiBekapcs(false);
yield break; //kilepeshez
}else{
deactivateInputOk(false);
}
}
//ha nem lepett ki eddig
dice.ujertek[0] = dice.getDices()[0];
dice.ujertek[1] = dice.getDices()[1]; //regi adat, hogy ne legyen hibas
}
public void deactivateInputOk(bool targyelvesztes) {

178
UserSettings/Layouts/default-2021.dwlt
View File

@@ -15,11 +15,11 @@ MonoBehaviour:
m_PixelRect:
serializedVersion: 2
x: 0
y: 43
width: 1920
height: 997
y: 28
width: 1366
height: 672
m_ShowMode: 4
m_Title: Console
m_Title: Hierarchy
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -44,8 +44,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1920
height: 997
width: 1366
height: 672
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
@@ -69,7 +69,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1920
width: 1366
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -90,8 +90,8 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 977
width: 1920
y: 652
width: 1366
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -114,12 +114,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 30
width: 1920
height: 947
width: 1366
height: 622
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 39
controlID: 28
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -139,12 +139,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1421
height: 947
width: 1011
height: 622
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 40
controlID: 29
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -164,12 +164,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1421
height: 574
width: 1011
height: 377
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 41
controlID: 30
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -187,8 +187,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 311
height: 574
width: 221
height: 377
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13}
@@ -206,23 +206,23 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: SceneView
m_Name: GameView
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 311
x: 221
y: 0
width: 1110
height: 574
width: 790
height: 377
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 14}
m_ActualView: {fileID: 12}
m_Panes:
- {fileID: 14}
- {fileID: 12}
m_Selected: 0
m_LastSelected: 1
m_Selected: 1
m_LastSelected: 0
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -239,11 +239,11 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 574
width: 1421
height: 373
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
y: 377
width: 1011
height: 245
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 15}
@@ -265,12 +265,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1421
x: 1011
y: 0
width: 499
height: 947
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
width: 355
height: 622
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 17}
@@ -296,10 +296,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 311
y: 73
width: 1108
height: 553
x: 221
y: 86
width: 788
height: 356
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -310,7 +310,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 1108, y: 532}
m_TargetSize: {x: 788, y: 335}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -325,10 +325,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -554
m_HBaseRangeMax: 554
m_VBaseRangeMin: -266
m_VBaseRangeMax: 266
m_HBaseRangeMin: -394
m_HBaseRangeMax: 394
m_VBaseRangeMin: -167.5
m_VBaseRangeMax: 167.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -337,7 +337,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0
m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@@ -346,23 +346,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 1108
height: 532
width: 788
height: 335
m_Scale: {x: 1, y: 1}
m_Translation: {x: 554, y: 266}
m_Translation: {x: 394, y: 167.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -554
y: -266
width: 1108
height: 532
x: -394
y: -167.5
width: 788
height: 335
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 1108, y: 553}
m_LastWindowPixelSize: {x: 788, y: 356}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -389,19 +389,19 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 73
width: 310
height: 553
y: 86
width: 220
height: 356
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 32}
m_SelectedIDs: a86e0000
m_LastClickedID: 28328
m_ExpandedIDs: 1cfbffffca6b0000fe6b0000fe6c0000786d0000b66e00001c700000a8710000c47100005072000062720000b47200003c73000082740000cc74000062750000a0750000da750000e275000024770000
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 8c6d0000
m_LastClickedID: 28044
m_ExpandedIDs: 1afbfffff66c000014700000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -445,10 +445,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 311
y: 73
width: 1108
height: 553
x: 221
y: 86
width: 788
height: 356
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -698,16 +698,16 @@ MonoBehaviour:
m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
m_Gizmos: 1
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_SceneIsLit: 0
m_SceneLighting: 1
m_2DMode: 1
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 1.3503404, y: -0.2882778, z: -0.13493726}
m_Target: {x: -2.9889002, y: 0.2662518, z: 0.06300003}
speed: 2
m_Value: {x: 1.3503404, y: -0.2882778, z: -0.13493726}
m_Value: {x: -2.9889002, y: 0.2662518, z: 0.06300003}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -758,9 +758,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 14.579869
m_Target: 6.8079257
speed: 2
m_Value: 14.579869
m_Value: 6.8079257
m_Ortho:
m_Target: 1
speed: 2
@@ -806,9 +806,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 647
width: 1420
height: 352
y: 463
width: 1010
height: 224
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -834,14 +834,14 @@ MonoBehaviour:
m_LastFolders:
- Assets/Scripts
m_LastFoldersGridSize: 66
m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource
m_LastProjectPath: /home/tom/Documents/dev/find the source
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 48790000
m_LastClickedID: 31048
m_ExpandedIDs: 0000000028790000
m_SelectedIDs: 42790000
m_LastClickedID: 31042
m_ExpandedIDs: 000000001e79000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -869,7 +869,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 0000000028790000
m_ExpandedIDs: 000000001e790000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -894,8 +894,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: fc2d0000
m_LastClickedInstanceID: 11772
m_SelectedInstanceIDs: 7c6c0000
m_LastClickedInstanceID: 27772
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c623000000000000
m_RenameOverlay:
@@ -921,7 +921,7 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0}
m_ScrollPosition: {x: 0, y: 91}
m_GridSize: 66
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 193
@@ -946,9 +946,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 647
width: 1420
height: 352
y: 463
width: 1010
height: 224
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -973,10 +973,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1421
y: 73
width: 498
height: 926
x: 1011
y: 86
width: 354
height: 601
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default