tagyak kesz + adrenalin levedes
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -137,6 +137,14 @@ public class Dice : MonoBehaviour {
|
||||
targyak.ujertek1 = 1;
|
||||
}else if(targyak.ujertek1 < 1 && (diceResult[1] == 1 || targyak.ujertek2 == 1)){
|
||||
targyak.ujertek1 = 2;
|
||||
}else if(targyak.ujertek1 == targyak.ujertek2 || targyak.ujertek1 == diceResult[1]){ //ha egyenlo a ket uj ertek vagy az elso egyenlo a mar meglevo masodik kockaval
|
||||
if(targyak.ujertek1 == 1){
|
||||
targyak.ujertek1++;
|
||||
}else if(targyak.ujertek1 == 6){
|
||||
targyak.ujertek1--;
|
||||
}else{
|
||||
targyak.ujertek1--;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
@@ -150,7 +158,15 @@ public class Dice : MonoBehaviour {
|
||||
targyak.ujertek2 = 1;
|
||||
}else if(targyak.ujertek2 < 1 && (diceResult[0] == 1 || targyak.ujertek1 == 1)){
|
||||
targyak.ujertek2 = 2;
|
||||
}
|
||||
}/*else if(targyak.ujertek1 == targyak.ujertek2 || targyak.ujertek2 == diceResult[0]){ //ha egyenlo a ket uj ertek vagy a masodik egyenlo a mar meglevo elso kockaval
|
||||
if(targyak.ujertek2 == 1){
|
||||
targyak.ujertek2++;
|
||||
}else if(targyak.ujertek2 == 6){
|
||||
targyak.ujertek2--;
|
||||
}else{
|
||||
targyak.ujertek2--;
|
||||
}
|
||||
} */
|
||||
|
||||
diceResult[0] = targyak.ujertek1;
|
||||
diceResult[1] = targyak.ujertek2;
|
||||
|
||||
@@ -31,6 +31,24 @@ public class Targyak : MonoBehaviour
|
||||
public Button confirmNewValue;
|
||||
public Button cancelNewValue;
|
||||
|
||||
//targy megszerezve ui
|
||||
public TMP_Text adrenalinMegszerezve;
|
||||
public TMP_Text hackerMegszerezve;
|
||||
public TMP_Text lathatatlanMegszerezve;
|
||||
public TMP_Text droidMegszerezve;
|
||||
public TMP_Text matavMegszerezve;
|
||||
public TMP_Text alomhozoMegszerezve;
|
||||
|
||||
//targy felhasznalva ui
|
||||
public TMP_Text adrenalinFelhasznalva;
|
||||
public TMP_Text hackerFelhasznalva;
|
||||
public TMP_Text lathatatlanFelhasznalva;
|
||||
public TMP_Text droidFelhasznalva;
|
||||
public TMP_Text matavFelhasznalva;
|
||||
public TMP_Text alomhozoFelhasznalva;
|
||||
|
||||
public List<string> elerheto_targyak = new List<string>{"Adrenalinloket", "Hacker csatlakozo", "Lathatatlan oltozet", "Droid agyu", "Matav taviranyito", "Alomhozo fustgranat"};
|
||||
|
||||
private void Awake() {
|
||||
akciok = FindObjectOfType<Akciok>();
|
||||
elet = FindObjectOfType<Elet>();
|
||||
@@ -39,63 +57,56 @@ public class Targyak : MonoBehaviour
|
||||
energia = FindObjectOfType<Energia>();
|
||||
ugynok = FindObjectOfType<Ugynok>();
|
||||
dice = FindObjectOfType<Dice>();
|
||||
|
||||
}
|
||||
|
||||
public void RandomTargy()
|
||||
{
|
||||
string[] elerheto_targyak = {"Adrenalinloket", "Hacker csatlakozo", "Lathatatlan oltozet", "Droid agyu", "Matav taviranyito", "Alomhozo fustgranat"} ;
|
||||
|
||||
do{
|
||||
randomszam = UnityEngine.Random.Range(0, elerheto_targyak.Length);
|
||||
}while(!elerheto_targyak[randomszam].Equals(""));
|
||||
if(elerheto_targyak.Count == 0) return;
|
||||
|
||||
randomszam = UnityEngine.Random.Range(0, elerheto_targyak.Count);
|
||||
|
||||
elerheto_targyak[randomszam] = "";
|
||||
|
||||
if (randomszam == 0)
|
||||
{
|
||||
//megszerezve ui es beaddolas
|
||||
if(elerheto_targyak[randomszam].Equals("Adrenalinloket")){
|
||||
adrenalinMegszerezve.text = "X";
|
||||
adrenalinloket++;
|
||||
Debug.Log("Kaptal egy AdrenalinLoketet!");
|
||||
}
|
||||
else if (randomszam == 1)
|
||||
{
|
||||
}else if(elerheto_targyak[randomszam].Equals("Hacker csatlakozo")){
|
||||
hackerMegszerezve.text = "X";
|
||||
hackercsatlakozo++;
|
||||
Debug.Log("Kaptal egy Hacker Csatlakozot!");
|
||||
}
|
||||
else if (randomszam == 2)
|
||||
{
|
||||
}else if(elerheto_targyak[randomszam].Equals("Lathatatlan oltozet")){
|
||||
lathatatlanMegszerezve.text = "X";
|
||||
lathatatlanoltozet++;
|
||||
Debug.Log("Kaptal egy Lathatatlan oltozetet!");
|
||||
}
|
||||
else if (randomszam == 3)
|
||||
{
|
||||
}else if(elerheto_targyak[randomszam].Equals("Droid agyu")){
|
||||
droidMegszerezve.text = "X";
|
||||
droidgepagyu++;
|
||||
Debug.Log("Kaptal egy Droid-X2 Gepagyut!");
|
||||
}
|
||||
else if (randomszam == 4)
|
||||
{
|
||||
}else if(elerheto_targyak[randomszam].Equals("Matav taviranyito")){
|
||||
matavMegszerezve.text = "X";
|
||||
matavtaviranyito++;
|
||||
Debug.Log("Kaptal egy Matav Taviranyitot!");
|
||||
}
|
||||
else if (randomszam == 5)
|
||||
{
|
||||
}else if(elerheto_targyak[randomszam].Equals("Alomhozo fustgranat")){
|
||||
alomhozoMegszerezve.text = "X";
|
||||
fustgranat++;
|
||||
Debug.Log("Kaptal egy Alomhozo Fustgranatot!");
|
||||
}
|
||||
|
||||
elerheto_targyak.RemoveAt(randomszam); //szedje ki a listabol
|
||||
}
|
||||
|
||||
public void addAdrenalin() {
|
||||
adrenalinloket = 1;
|
||||
}
|
||||
|
||||
private void Update() {
|
||||
private void Update() {
|
||||
//betu kitorlese
|
||||
if(!kocka1ertek.text.Equals("")){ //megnezzuk hogy van e mar valami a szovegben
|
||||
for(int i = 0; i < kocka1ertek.text.Length; i++) //vegig megyunk a szovegen
|
||||
{
|
||||
if(!Char.IsDigit(kocka1ertek.text[i])){ //ha a betu nem szam torolje
|
||||
Debug.Log("updaate");
|
||||
kocka1ertek.text.Remove(i);
|
||||
kocka1ertek.text = kocka1ertek.text.Remove(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -104,7 +115,7 @@ public class Targyak : MonoBehaviour
|
||||
for(int i = 0; i < kocka2ertek.text.Length; i++) //vegig megyunk a szovegen
|
||||
{
|
||||
if(!Char.IsDigit(kocka2ertek.text[i])){ //ha a betu nem szam torolje
|
||||
kocka2ertek.text.Remove(i);
|
||||
kocka2ertek.text = kocka2ertek.text.Remove(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -141,6 +152,7 @@ public class Targyak : MonoBehaviour
|
||||
dice.ujertek.Add(ujertek2); //uj adat amit a user adott meg
|
||||
dice.mehet = true;
|
||||
dice.HelyszinKiBekapcs(false);
|
||||
adrenalinFelhasznalva.text = "X";
|
||||
yield break; //kilepeshez
|
||||
}else{
|
||||
deactivateInputOk(false);
|
||||
@@ -169,28 +181,42 @@ public class Targyak : MonoBehaviour
|
||||
//+1 akcio
|
||||
akciopont.akciopont++;
|
||||
|
||||
hackercsatlakozo = 0; //targy elvesztese
|
||||
hackercsatlakozo = 0; //targy elvesztese
|
||||
|
||||
//felhasznalva ui
|
||||
hackerFelhasznalva.text = "X";
|
||||
}
|
||||
|
||||
public void LathatatlanOltozek() { //kesz
|
||||
//movement.mozgasHelyre(2, 2); //megadni inkabb a hely nevet ahova menni akar? | input field es nev megadas
|
||||
lathatatlanOltozetAktivalva = true;
|
||||
lathatatlanoltozet = 0; //targy elvesztese
|
||||
lathatatlanoltozet = 0; //targy elvesztese
|
||||
|
||||
//felhasznalva ui
|
||||
lathatatlanFelhasznalva.text = "X";
|
||||
}
|
||||
|
||||
public void DroidGepagyu() { //kesz
|
||||
//ugynok cucc
|
||||
ugynok.canKill = true; //barhol meg tud olni ha kattint
|
||||
droidgepagyu = 0; //targy elvesztese
|
||||
|
||||
//felhasznalva ui
|
||||
droidFelhasznalva.text = "X";
|
||||
}
|
||||
|
||||
public void MatavTaviranyito() {
|
||||
matavtaviranyitoAktivalva = true;
|
||||
matavtaviranyito = 0; //targy elvesztese
|
||||
|
||||
//felhasznalva ui
|
||||
matavFelhasznalva.text = "X";
|
||||
}
|
||||
|
||||
public void FustGranat() {
|
||||
energia.granatAktivalva = true;
|
||||
fustgranat = 0; //targy elvesztese
|
||||
fustgranat = 0; //targy elvesztese
|
||||
//felhasznalva ui
|
||||
alomhozoFelhasznalva.text = "X";
|
||||
}
|
||||
}
|
||||
@@ -15,15 +15,15 @@ MonoBehaviour:
|
||||
m_PixelRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 28
|
||||
width: 1366
|
||||
height: 672
|
||||
y: 43
|
||||
width: 1920
|
||||
height: 997
|
||||
m_ShowMode: 4
|
||||
m_Title: Hierarchy
|
||||
m_RootView: {fileID: 2}
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_Maximized: 0
|
||||
m_Maximized: 1
|
||||
--- !u!114 &2
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -44,8 +44,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1366
|
||||
height: 672
|
||||
width: 1920
|
||||
height: 997
|
||||
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: 1366
|
||||
width: 1920
|
||||
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: 652
|
||||
width: 1366
|
||||
y: 977
|
||||
width: 1920
|
||||
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: 1366
|
||||
height: 622
|
||||
width: 1920
|
||||
height: 947
|
||||
m_MinSize: {x: 300, y: 200}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 302
|
||||
controlID: 15
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -139,12 +139,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1058
|
||||
height: 622
|
||||
width: 1487
|
||||
height: 947
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 303
|
||||
controlID: 16
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -164,12 +164,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1058
|
||||
height: 377
|
||||
width: 1487
|
||||
height: 574
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 304
|
||||
controlID: 17
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -187,8 +187,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 225
|
||||
height: 377
|
||||
width: 316
|
||||
height: 574
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 13}
|
||||
@@ -211,12 +211,12 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 225
|
||||
x: 316
|
||||
y: 0
|
||||
width: 833
|
||||
height: 377
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
width: 1171
|
||||
height: 574
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 12}
|
||||
m_Panes:
|
||||
- {fileID: 14}
|
||||
@@ -239,9 +239,9 @@ MonoBehaviour:
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 377
|
||||
width: 1058
|
||||
height: 245
|
||||
y: 574
|
||||
width: 1487
|
||||
height: 373
|
||||
m_MinSize: {x: 101, y: 121}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 16}
|
||||
@@ -265,10 +265,10 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 1058
|
||||
x: 1487
|
||||
y: 0
|
||||
width: 308
|
||||
height: 622
|
||||
width: 433
|
||||
height: 947
|
||||
m_MinSize: {x: 275, y: 50}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 17}
|
||||
@@ -296,10 +296,10 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 225
|
||||
y: 86
|
||||
width: 831
|
||||
height: 356
|
||||
x: 316
|
||||
y: 73
|
||||
width: 1169
|
||||
height: 553
|
||||
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: 831, y: 335}
|
||||
m_TargetSize: {x: 1169, y: 532}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
@@ -325,10 +325,10 @@ MonoBehaviour:
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -415.5
|
||||
m_HBaseRangeMax: 415.5
|
||||
m_VBaseRangeMin: -167.5
|
||||
m_VBaseRangeMax: 167.5
|
||||
m_HBaseRangeMin: -584.5
|
||||
m_HBaseRangeMax: 584.5
|
||||
m_VBaseRangeMin: -266
|
||||
m_VBaseRangeMax: 266
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
@@ -346,23 +346,23 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 831
|
||||
height: 335
|
||||
width: 1169
|
||||
height: 532
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Translation: {x: 415.5, y: 167.5}
|
||||
m_Translation: {x: 584.5, y: 266}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -415.5
|
||||
y: -167.5
|
||||
width: 831
|
||||
height: 335
|
||||
x: -584.5
|
||||
y: -266
|
||||
width: 1169
|
||||
height: 532
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 1
|
||||
m_LastWindowPixelSize: {x: 831, y: 356}
|
||||
m_LastWindowPixelSize: {x: 1169, y: 553}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
@@ -389,9 +389,9 @@ MonoBehaviour:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 86
|
||||
width: 224
|
||||
height: 356
|
||||
y: 73
|
||||
width: 315
|
||||
height: 553
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -401,7 +401,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 58faffff
|
||||
m_ExpandedIDs: 28fbffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -698,16 +698,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: -4.4946966, y: 0.05774405, z: -2.1177318}
|
||||
m_Target: {x: -5.8545575, y: 0.042868778, z: -0.020339571}
|
||||
speed: 2
|
||||
m_Value: {x: -4.4946966, y: 0.05774405, z: -2.1177318}
|
||||
m_Value: {x: -5.8545575, y: 0.042868778, z: -0.020339571}
|
||||
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: 10.402437
|
||||
m_Target: 12.330687
|
||||
speed: 2
|
||||
m_Value: 10.402437
|
||||
m_Value: 12.330687
|
||||
m_Ortho:
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
@@ -841,7 +841,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: bc690000
|
||||
m_LastClickedID: 27068
|
||||
m_ExpandedIDs: 00000000b669000000ca9a3b
|
||||
m_ExpandedIDs: 00000000a0790000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -869,7 +869,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 00000000b669000000ca9a3b
|
||||
m_ExpandedIDs: 00000000a0790000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -946,9 +946,9 @@ MonoBehaviour:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 463
|
||||
width: 1057
|
||||
height: 224
|
||||
y: 647
|
||||
width: 1486
|
||||
height: 352
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -973,10 +973,10 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 1058
|
||||
y: 86
|
||||
width: 307
|
||||
height: 601
|
||||
x: 1487
|
||||
y: 73
|
||||
width: 432
|
||||
height: 926
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
|
||||
Reference in New Issue
Block a user