ugynok kocka valasztas, nev valasztas kotelezo, kezdohely csapat megjelenes, bugfix
This commit is contained in:
@@ -4427,6 +4427,7 @@ MonoBehaviour:
|
||||
- {fileID: 889062367}
|
||||
- {fileID: 1970422692}
|
||||
elet: 2
|
||||
elet_vesztve: 0
|
||||
--- !u!114 &197904232
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4440,6 +4441,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
szoveg: {fileID: 0}
|
||||
osszpont: 0
|
||||
--- !u!114 &197904234
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4519,7 +4521,6 @@ MonoBehaviour:
|
||||
droidagyuAktivalva: 0
|
||||
canKill: 0
|
||||
canShoot: 0
|
||||
maincamera: {fileID: 519420031}
|
||||
--- !u!114 &197904236
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4642,6 +4643,7 @@ MonoBehaviour:
|
||||
vanertelme: 1
|
||||
State: 0
|
||||
helyszinaktivalasBtn: {fileID: 824033280}
|
||||
nev: {fileID: 1509580805}
|
||||
--- !u!114 &197904238
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -8311,7 +8313,7 @@ MonoBehaviour:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 197904230}
|
||||
m_TargetAssemblyTypeName: Elet, Assembly-CSharp
|
||||
m_MethodName: Eletvesztes
|
||||
m_MethodName: Eletplusz
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
@@ -15707,7 +15709,19 @@ MonoBehaviour:
|
||||
m_CharacterLimit: 0
|
||||
m_OnEndEdit:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 197904237}
|
||||
m_TargetAssemblyTypeName: jatekmanager, Assembly-CSharp
|
||||
m_MethodName: NevValasztasUtan
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_OnSubmit:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@@ -31913,7 +31927,7 @@ MonoBehaviour:
|
||||
- m_Target: {fileID: 197904220}
|
||||
m_TargetAssemblyTypeName: Dice, Assembly-CSharp
|
||||
m_MethodName: CallRenderDice
|
||||
m_Mode: 1
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
|
||||
@@ -406,6 +406,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
szoveg: {fileID: 1041644989}
|
||||
osszpont: 0
|
||||
--- !u!1 &1041644987
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -441,8 +442,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: 25.02, y: -145.89}
|
||||
m_SizeDelta: {x: 200, y: 50}
|
||||
m_AnchoredPosition: {x: -0, y: -66.600006}
|
||||
m_SizeDelta: {x: 342.6646, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1041644989
|
||||
MonoBehaviour:
|
||||
@@ -578,7 +579,7 @@ 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: -72.19}
|
||||
m_AnchoredPosition: {x: 0, y: 6.2100067}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1127070446
|
||||
@@ -791,7 +792,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_UiScaleMode: 1
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
@@ -881,7 +882,7 @@ 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: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 78.4}
|
||||
m_SizeDelta: {x: 200, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1956911020
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -13,6 +13,8 @@ public class Dice : MonoBehaviour {
|
||||
private Akciopont ap;
|
||||
private Energia energiasav;
|
||||
private Targyak targyak;
|
||||
private Ugynok ugynok;
|
||||
private movement movement;
|
||||
public int[] diceResult = { 0, 0 };
|
||||
public List<int> ujertek = new List<int>();
|
||||
public int valasztottErtek; //a jatekos altal valasztott dobott ertek helye
|
||||
@@ -34,11 +36,15 @@ public class Dice : MonoBehaviour {
|
||||
public bool dobottEgyszer = false; //tudjon ujra dobni vagy nem
|
||||
public int ujradobasszamlalo;
|
||||
|
||||
private bool ugynokDobasErtek = false; //ertek valasztashoz hogy tudja az ugynok csapat miatt lett meghivva
|
||||
private bool elsoDobas = true;
|
||||
private void Awake() {
|
||||
upgrade = FindObjectOfType<Upgrade>();
|
||||
ap = FindObjectOfType<Akciopont>();
|
||||
energiasav = FindObjectOfType<Energia>();
|
||||
targyak = FindObjectOfType<Targyak>();
|
||||
ugynok = FindObjectOfType<Ugynok>();
|
||||
movement = FindObjectOfType<movement>();
|
||||
}
|
||||
|
||||
public void ertekValasztas(GameObject gomb) {
|
||||
@@ -46,28 +52,67 @@ public class Dice : MonoBehaviour {
|
||||
if (gomb.name == "dice1btn") {
|
||||
valasztottErtek = diceResult[0];
|
||||
if (diceResult[0] < diceResult[1]) {
|
||||
if(!ugynokDobasErtek){
|
||||
upgrade.canUpgrade = true; //kisebb szam valasztasa eseten fejlesztes egyszer
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes);
|
||||
}else{
|
||||
//ugynok csapat szama
|
||||
ugynok.UgynokSorsolas(movement.jelenlegi_x, movement.jelenlegi_y, valasztottErtek);
|
||||
|
||||
//-1 energia
|
||||
energiasav.csokkenEnergia(1);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio);
|
||||
}
|
||||
} else {
|
||||
if(!ugynokDobasErtek){
|
||||
energiasav.csokkenEnergia(1); //nagyobb szam valasztasa eseten -1 energia
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio);
|
||||
}else{
|
||||
//ugynok csapat szama
|
||||
ugynok.UgynokSorsolas(movement.jelenlegi_x, movement.jelenlegi_y, valasztottErtek);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio);
|
||||
}
|
||||
}
|
||||
|
||||
locked = true;
|
||||
} else if (gomb.name == "dice2btn") {
|
||||
valasztottErtek = diceResult[1];
|
||||
if (diceResult[1] < diceResult[0]) {
|
||||
upgrade.canUpgrade = true;
|
||||
if(!ugynokDobasErtek){
|
||||
upgrade.canUpgrade = true; //kisebb szam valasztasa eseten fejlesztes egyszer
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes);
|
||||
} else {
|
||||
}else{
|
||||
//ugynok csapat szama
|
||||
ugynok.UgynokSorsolas(movement.jelenlegi_x, movement.jelenlegi_y, valasztottErtek);
|
||||
|
||||
//-1 energia
|
||||
energiasav.csokkenEnergia(1);
|
||||
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio);
|
||||
}
|
||||
} else {
|
||||
if(!ugynokDobasErtek){
|
||||
energiasav.csokkenEnergia(1); //nagyobb szam valasztasa eseten -1 energia
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio);
|
||||
}else{
|
||||
//ugynok csapat szama
|
||||
ugynok.UgynokSorsolas(movement.jelenlegi_x, movement.jelenlegi_y, valasztottErtek);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio);
|
||||
}
|
||||
}
|
||||
|
||||
locked = true;
|
||||
}
|
||||
|
||||
if(!ugynokDobasErtek)
|
||||
ap.UpdateAkciopont(getValasztottErtek() + upgrade.akcio[upgrade.getAkcioIndex()]);
|
||||
|
||||
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);
|
||||
@@ -82,11 +127,12 @@ public class Dice : MonoBehaviour {
|
||||
return finalSide;
|
||||
}
|
||||
|
||||
public void CallRenderDice() => StartCoroutine(renderDice());
|
||||
public void CallRenderDice(bool ugynokDobas) => StartCoroutine(renderDice(ugynokDobas));
|
||||
|
||||
public IEnumerator renderDice() {
|
||||
public IEnumerator renderDice(bool ugynokDobas) {
|
||||
//ha zarolva van akkor ne tudjon ujra dobni / csak egyszer dobhasson (amig nincs feloldva a kovetkezo dobashoz)
|
||||
if(dobottEgyszer) yield break;
|
||||
//ha ugynok miatt kell dobni mikor mar nincs ujradobas tudjon dobni
|
||||
if(dobottEgyszer && !ugynokDobas) yield break;
|
||||
|
||||
//dice gombok kikapcsolasa hogy amig nem vegez ne tudjon erteket valasztani
|
||||
dice1btnBtn.enabled = false;
|
||||
@@ -97,7 +143,6 @@ public class Dice : MonoBehaviour {
|
||||
diceResult[1] = RollDice();
|
||||
} while (diceResult[0] == diceResult[1]);
|
||||
|
||||
|
||||
//lassa a jatekos mit dobott
|
||||
hely1.sprite = diceSides[diceResult[0]-1];
|
||||
hely1.size = new Vector2(38, 38);
|
||||
@@ -105,12 +150,12 @@ public class Dice : MonoBehaviour {
|
||||
hely2.sprite = diceSides[diceResult[1]-1];
|
||||
hely2.size = new Vector2(38, 38);
|
||||
|
||||
ujradobasszamlalo--;
|
||||
Debug.Log("ujradobasszamlalo: " + ujradobasszamlalo);
|
||||
if(ujradobasszamlalo == 0){
|
||||
dobottEgyszer = true;
|
||||
if(ugynokDobas){
|
||||
ugynokDobasErtek = true;
|
||||
setLocked(false);
|
||||
}
|
||||
|
||||
|
||||
//ha megvan a targy
|
||||
if(targyak.adrenalinloket > 0) {
|
||||
//helyszin collider kikapcsolas a gomb miatt
|
||||
@@ -181,6 +226,9 @@ public class Dice : MonoBehaviour {
|
||||
diceResult[0] = targyak.ujertek1;
|
||||
diceResult[1] = targyak.ujertek2;
|
||||
dobottEgyszer = true;
|
||||
|
||||
if(!ugynokDobas) //ha ugynok miatt van dobas ne vonjon le
|
||||
ujradobasszamlalo++; //elhasznal egyet fent
|
||||
}
|
||||
}
|
||||
//deaktivalas
|
||||
@@ -197,6 +245,14 @@ public class Dice : MonoBehaviour {
|
||||
//ha vegzett mindennel kapcsolja vissza az ertekvalasztast
|
||||
dice1btnBtn.enabled = true;
|
||||
dice2btnBtn.enabled = true;
|
||||
|
||||
if(!ugynokDobas){ //ha ugynok miatt van dobas ne vonjon le
|
||||
ujradobasszamlalo--;
|
||||
Debug.Log("ujradobasszamlalo: " + ujradobasszamlalo);
|
||||
if(ujradobasszamlalo == 0){
|
||||
dobottEgyszer = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void HelyszinKiBekapcs(bool kikapcsolas){
|
||||
|
||||
@@ -7,7 +7,7 @@ public class Elet : MonoBehaviour
|
||||
{
|
||||
public TMP_Text[] elet_text;
|
||||
public int elet = 2;
|
||||
private int elet_vesztve = 0;
|
||||
[SerializeField] private int elet_vesztve = 0;
|
||||
private int elet_megszerezve = 2;
|
||||
private jatekmanager jatekmanager;
|
||||
|
||||
@@ -49,7 +49,7 @@ public class Elet : MonoBehaviour
|
||||
//jatekmanager.jatekosvesztett = true;
|
||||
return;
|
||||
}
|
||||
if (elet_megszerezve > elet +1) return;
|
||||
//if (elet_megszerezve > elet +1) return;
|
||||
//if(elet < 0) return;
|
||||
|
||||
elet_vesztve++;
|
||||
|
||||
@@ -19,6 +19,7 @@ public class Source : MonoBehaviour
|
||||
private void Awake() {
|
||||
movement = FindObjectOfType<movement>();
|
||||
ugynok = FindObjectOfType<Ugynok>();
|
||||
jatekmanager = FindObjectOfType<jatekmanager>();
|
||||
}
|
||||
|
||||
private void Start() {
|
||||
|
||||
@@ -13,40 +13,25 @@ public class Ugynok : MonoBehaviour
|
||||
private movement movement;
|
||||
|
||||
public TMP_Text[] oneone;
|
||||
//public BoxCollider2D[] oneoneCollider;
|
||||
public TMP_Text[] twoone;
|
||||
//public BoxCollider2D[] twooneCollider;
|
||||
public TMP_Text[] threeone;
|
||||
//public BoxCollider2D[] threeoneCollider;
|
||||
public TMP_Text[] onetwo;
|
||||
//public BoxCollider2D[] onetwoCollider;
|
||||
public TMP_Text[] twotwo;
|
||||
//public BoxCollider2D[] twotwoCollider;
|
||||
public TMP_Text[] threetwo;
|
||||
//public BoxCollider2D[] threetwoCollider;
|
||||
public TMP_Text[] onethree;
|
||||
//public BoxCollider2D[] onethreeCollider;
|
||||
public TMP_Text[] twothree;
|
||||
//public BoxCollider2D[] twothreeCollider;
|
||||
public TMP_Text[] threethree;
|
||||
//public BoxCollider2D[] threethreeCollider;
|
||||
public TMP_Text[] onefour;
|
||||
//public BoxCollider2D[] onefourCollider;
|
||||
public TMP_Text[] twofour;
|
||||
//public BoxCollider2D[] twofourCollider;
|
||||
public TMP_Text[] threefour;
|
||||
//public BoxCollider2D[] threefourCollider;
|
||||
|
||||
public bool droidagyuAktivalva = false;
|
||||
|
||||
public bool canKill = false;
|
||||
public bool canShoot = false; //harchoz bool
|
||||
public void setCanKillTrue(){ canKill = true; }
|
||||
public Camera maincamera;
|
||||
|
||||
private string[] previus_ugynok_csapatok;
|
||||
private int elozo_x;
|
||||
private int elozo_y ;
|
||||
public void setCanKillTrue(){ canKill = true; }
|
||||
|
||||
private void Awake() {
|
||||
akciok = FindObjectOfType<Akciok>();
|
||||
@@ -56,10 +41,8 @@ public class Ugynok : MonoBehaviour
|
||||
elet = FindObjectOfType<Elet>();
|
||||
|
||||
previus_ugynok_csapatok = new string[3];
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
//ugynok csapat mezo szoveg kiurites
|
||||
for (int i = 0; i < oneone.Length; i++)
|
||||
{
|
||||
oneone[i].text = "";
|
||||
@@ -110,188 +93,194 @@ public class Ugynok : MonoBehaviour
|
||||
{
|
||||
threefour[i].text = "";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void UgynokSorsolas(int x, int y){
|
||||
public void UgynokSorsolas(int x, int y, int ugynokSzam = 0){
|
||||
int random;
|
||||
if(ugynokSzam == 0){
|
||||
random = UnityEngine.Random.Range(1,7);
|
||||
}else{
|
||||
random = ugynokSzam;
|
||||
}
|
||||
|
||||
if (x == 1 && y == 1)
|
||||
{
|
||||
if (oneone[0].text.Equals(""))
|
||||
{
|
||||
oneone[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
oneone[0].text = random.ToString();
|
||||
}
|
||||
else if (oneone[1].text.Equals(""))
|
||||
{
|
||||
oneone[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
oneone[1].text = random.ToString();
|
||||
}
|
||||
else if (oneone[2].text.Equals(""))
|
||||
{
|
||||
oneone[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
oneone[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
else if (x == 1 && y == 2)
|
||||
{
|
||||
if (onetwo[0].text.Equals(""))
|
||||
{
|
||||
onetwo[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
onetwo[0].text = random.ToString();
|
||||
}
|
||||
else if (onetwo[1].text.Equals(""))
|
||||
{
|
||||
onetwo[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
onetwo[1].text = random.ToString();
|
||||
}
|
||||
else if (onetwo[2].text.Equals(""))
|
||||
{
|
||||
onetwo[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
onetwo[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
else if (x == 1 && y == 3)
|
||||
{
|
||||
if (onethree[0].text.Equals(""))
|
||||
{
|
||||
onethree[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
onethree[0].text = random.ToString();
|
||||
}
|
||||
else if (onethree[1].text.Equals(""))
|
||||
{
|
||||
onethree[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
onethree[1].text = random.ToString();
|
||||
}
|
||||
else if (onethree[2].text.Equals(""))
|
||||
{
|
||||
onethree[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
onethree[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
else if (x == 1 && y == 4)
|
||||
{
|
||||
if (onefour[0].text.Equals(""))
|
||||
{
|
||||
onefour[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
onefour[0].text = random.ToString();
|
||||
}
|
||||
else if (onefour[1].text.Equals(""))
|
||||
{
|
||||
onefour[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
onefour[1].text = random.ToString();
|
||||
}
|
||||
else if (onefour[2].text.Equals(""))
|
||||
{
|
||||
onefour[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
onefour[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
else if (x == 2 && y == 1)
|
||||
{
|
||||
if (twoone[0].text.Equals(""))
|
||||
{
|
||||
twoone[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twoone[0].text = random.ToString();
|
||||
}
|
||||
else if (twoone[1].text.Equals(""))
|
||||
{
|
||||
twoone[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twoone[1].text = random.ToString();
|
||||
}
|
||||
else if (twoone[2].text.Equals(""))
|
||||
{
|
||||
twoone[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twoone[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
else if (x == 2 && y == 2)
|
||||
{
|
||||
if (twotwo[0].text.Equals(""))
|
||||
{
|
||||
twotwo[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twotwo[0].text = random.ToString();
|
||||
}
|
||||
else if (twotwo[1].text.Equals(""))
|
||||
{
|
||||
twotwo[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twotwo[1].text = random.ToString();
|
||||
}
|
||||
else if (twotwo[2].text.Equals(""))
|
||||
{
|
||||
twotwo[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twotwo[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
else if (x == 2 && y == 3)
|
||||
{
|
||||
if (twothree[0].text.Equals(""))
|
||||
{
|
||||
twothree[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twothree[0].text = random.ToString();
|
||||
}
|
||||
else if (twothree[1].text.Equals(""))
|
||||
{
|
||||
twothree[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twothree[1].text = random.ToString();
|
||||
}
|
||||
else if (twothree[2].text.Equals(""))
|
||||
{
|
||||
twothree[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twothree[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
else if (x == 2 && y == 4)
|
||||
{
|
||||
if (twofour[0].text.Equals(""))
|
||||
{
|
||||
twofour[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twofour[0].text = random.ToString();
|
||||
}
|
||||
else if (twofour[1].text.Equals(""))
|
||||
{
|
||||
twofour[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twofour[1].text = random.ToString();
|
||||
}
|
||||
else if (twofour[2].text.Equals(""))
|
||||
{
|
||||
twofour[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
twofour[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
else if (x == 3 && y == 1)
|
||||
{
|
||||
if (threeone[0].text.Equals(""))
|
||||
{
|
||||
threeone[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threeone[0].text = random.ToString();
|
||||
}
|
||||
else if (threeone[1].text.Equals(""))
|
||||
{
|
||||
threeone[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threeone[1].text = random.ToString();
|
||||
}
|
||||
else if (threeone[2].text.Equals(""))
|
||||
{
|
||||
threeone[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threeone[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
else if (x == 3 && y == 2)
|
||||
{
|
||||
if (threetwo[0].text.Equals(""))
|
||||
{
|
||||
threetwo[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threetwo[0].text = random.ToString();
|
||||
}
|
||||
else if (threetwo[1].text.Equals(""))
|
||||
{
|
||||
threetwo[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threetwo[1].text = random.ToString();
|
||||
}
|
||||
else if (threetwo[2].text.Equals(""))
|
||||
{
|
||||
threetwo[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threetwo[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
else if (x == 3 && y == 3)
|
||||
{
|
||||
if (threethree[0].text.Equals(""))
|
||||
{
|
||||
threethree[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threethree[0].text = random.ToString();
|
||||
}
|
||||
else if (threethree[1].text.Equals(""))
|
||||
{
|
||||
threethree[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threethree[1].text = random.ToString();
|
||||
}
|
||||
else if (threethree[2].text.Equals(""))
|
||||
{
|
||||
threethree[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threethree[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
else if (x == 3 && y == 4)
|
||||
{
|
||||
if (threefour[0].text.Equals(""))
|
||||
{
|
||||
threefour[0].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threefour[0].text = random.ToString();
|
||||
}
|
||||
else if (threefour[1].text.Equals(""))
|
||||
{
|
||||
threefour[1].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threefour[1].text = random.ToString();
|
||||
}
|
||||
else if (threefour[2].text.Equals(""))
|
||||
{
|
||||
threefour[2].text = UnityEngine.Random.Range(1, 7).ToString();
|
||||
threefour[2].text = random.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -353,7 +342,7 @@ public class Ugynok : MonoBehaviour
|
||||
foreach(var item in previus_ugynok_csapatok){
|
||||
if(!item.Equals("")){
|
||||
//ha nem ures a text vagyis volt atirva szamra nezze meg hogy X-e
|
||||
if(!item.Equals("x")){
|
||||
if(!item.Equals("x") ||!item.Equals("X")){
|
||||
//vonjon le egy eletet
|
||||
elet.Eletvesztes();
|
||||
break;
|
||||
|
||||
@@ -59,6 +59,8 @@ public class jatekmanager : MonoBehaviour
|
||||
public static event Action<GameState> OnGameStateChanged;
|
||||
public Button helyszinaktivalasBtn;
|
||||
|
||||
public TMP_Text nev;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
Instance = this;
|
||||
@@ -77,7 +79,11 @@ public class jatekmanager : MonoBehaviour
|
||||
source = FindObjectOfType<Source>();
|
||||
vegpontozas = FindObjectOfType<vegpontozas>();
|
||||
|
||||
UpdateGameState(GameState.KorKezdet);
|
||||
UpdateGameState(GameState.Nev);
|
||||
|
||||
#if !UNITY_EDITOR
|
||||
test.SetActive(false);
|
||||
#endif
|
||||
}
|
||||
|
||||
public void UpdateGameState(GameState newState)
|
||||
@@ -101,6 +107,12 @@ public class jatekmanager : MonoBehaviour
|
||||
case GameState.Vesztette:
|
||||
HandleVesztette();
|
||||
break;
|
||||
case GameState.UgynokValasztas:
|
||||
HandleUgynokValasztas();
|
||||
break;
|
||||
case GameState.Nev:
|
||||
HandleUgynokNev();
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException(nameof(newState), newState, null);
|
||||
}
|
||||
@@ -114,7 +126,9 @@ public class jatekmanager : MonoBehaviour
|
||||
Akcio,
|
||||
Fejlesztes,
|
||||
Ugynok,
|
||||
Vesztette
|
||||
Vesztette,
|
||||
UgynokValasztas,
|
||||
Nev
|
||||
}
|
||||
|
||||
private async void HandleKorkezdet()
|
||||
@@ -161,6 +175,55 @@ public class jatekmanager : MonoBehaviour
|
||||
Debug.Log((upgrade.getUjradobasIndex() + 1) + " ; ennyi dobásod van összesen");
|
||||
}
|
||||
|
||||
private async void HandleUgynokValasztas(){
|
||||
//kapcsolja ki addig a mezoket amig nem valasztott ugynokcsapat szamot
|
||||
movement.oneone_Collider.gameObject.SetActive(false);
|
||||
movement.onetwo_Collider.gameObject.SetActive(false);
|
||||
movement.onethree_Collider.gameObject.SetActive(false);
|
||||
movement.onefour_Collider.gameObject.SetActive(false);
|
||||
movement.twoone_Collider.gameObject.SetActive(false);
|
||||
movement.twotwo_Collider.gameObject.SetActive(false);
|
||||
movement.twothree_Collider.gameObject.SetActive(false);
|
||||
movement.twofour_Collider.gameObject.SetActive(false);
|
||||
movement.threeone_Collider.gameObject.SetActive(false);
|
||||
movement.threetwo_Collider.gameObject.SetActive(false);
|
||||
movement.threethree_Collider.gameObject.SetActive(false);
|
||||
movement.threefour_Collider.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public void NevValasztasUtan(){
|
||||
if(!nev.text.Equals(""))
|
||||
Instance.UpdateGameState(GameState.KorKezdet);
|
||||
}
|
||||
|
||||
private async void HandleUgynokNev(){
|
||||
movement.oneone_Collider.gameObject.SetActive(false);
|
||||
movement.onetwo_Collider.gameObject.SetActive(false);
|
||||
movement.onethree_Collider.gameObject.SetActive(false);
|
||||
movement.onefour_Collider.gameObject.SetActive(false);
|
||||
movement.twoone_Collider.gameObject.SetActive(false);
|
||||
movement.twotwo_Collider.gameObject.SetActive(false);
|
||||
movement.twothree_Collider.gameObject.SetActive(false);
|
||||
movement.twofour_Collider.gameObject.SetActive(false);
|
||||
movement.threeone_Collider.gameObject.SetActive(false);
|
||||
movement.threetwo_Collider.gameObject.SetActive(false);
|
||||
movement.threethree_Collider.gameObject.SetActive(false);
|
||||
movement.threefour_Collider.gameObject.SetActive(false);
|
||||
|
||||
energiafejlesztés.SetActive(false);
|
||||
akciofejlesztés.SetActive(false);
|
||||
harcfejlesztés.SetActive(false);
|
||||
ujradobasfejlesztés.SetActive(false);
|
||||
hackfejlesztés.SetActive(false);
|
||||
kovetkezokor.SetActive(false);
|
||||
betarazas.SetActive(false);
|
||||
nyomozas.SetActive(false);
|
||||
hackeles.SetActive(false);
|
||||
helyszinaktivalasBtn.gameObject.SetActive(false);
|
||||
//test.SetActive(false);
|
||||
rolldice.SetActive(false);
|
||||
}
|
||||
|
||||
|
||||
private async void HandleFejlesztes()
|
||||
{
|
||||
@@ -194,6 +257,20 @@ public class jatekmanager : MonoBehaviour
|
||||
|
||||
kovetkezokor.SetActive(true);
|
||||
|
||||
//ha ugynok valasztasbol jon kapcsolaja vissza a collidereket
|
||||
movement.oneone_Collider.gameObject.SetActive(true);
|
||||
movement.onetwo_Collider.gameObject.SetActive(true);
|
||||
movement.onethree_Collider.gameObject.SetActive(true);
|
||||
movement.onefour_Collider.gameObject.SetActive(true);
|
||||
movement.twoone_Collider.gameObject.SetActive(true);
|
||||
movement.twotwo_Collider.gameObject.SetActive(true);
|
||||
movement.twothree_Collider.gameObject.SetActive(true);
|
||||
movement.twofour_Collider.gameObject.SetActive(true);
|
||||
movement.threeone_Collider.gameObject.SetActive(true);
|
||||
movement.threetwo_Collider.gameObject.SetActive(true);
|
||||
movement.threethree_Collider.gameObject.SetActive(true);
|
||||
movement.threefour_Collider.gameObject.SetActive(true);
|
||||
|
||||
//rolldice.SetActive(false);
|
||||
}
|
||||
|
||||
@@ -256,96 +333,6 @@ public class jatekmanager : MonoBehaviour
|
||||
dice.dice2btnBtn.gameObject.SetActive(bekapcsolas);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
|
||||
// Update is called once per frame
|
||||
IEnumerator MyCoroutine()
|
||||
{
|
||||
//amig a játékos vesztett bool nem egyenlo true-val vagy a nyert bool nem egyenlo true-val
|
||||
//while (jatekosnyert != true || jatekosvesztett != true)
|
||||
//{
|
||||
//a jatekos mikor belép semmit ne tudjon csinálni csak dobni a kockával, hogy elkezdje a játékot
|
||||
energiafejlesztés.SetActive(false);
|
||||
akciofejlesztés.SetActive(false);
|
||||
harcfejlesztés.SetActive(false);
|
||||
ujradobasfejlesztés.SetActive(false);
|
||||
hackfejlesztés.SetActive(false);
|
||||
kovetkezokor.SetActive(false);
|
||||
betarazas.SetActive(false);
|
||||
nyomozas.SetActive(false);
|
||||
hackeles.SetActive(false);
|
||||
//test.SetActive(false);
|
||||
|
||||
|
||||
|
||||
|
||||
//&& dice.getLocked() != true
|
||||
|
||||
//ez rossz!!!!
|
||||
//while (dice.dobott < upgrade.getUjradobasIndex() + 1 )
|
||||
//{
|
||||
|
||||
//eddig újradobhat
|
||||
//}
|
||||
|
||||
|
||||
yield return new WaitUntil(() => dice.getLocked() == true);
|
||||
|
||||
|
||||
while (vanertelme == true)
|
||||
{
|
||||
//a játékos választ a két érték között
|
||||
if (upgrade.canUpgrade == true)
|
||||
{
|
||||
//ha a kisebbet választotta akkor jelennek meg a fejlesztés gombjai
|
||||
energiafejlesztés.SetActive(true);
|
||||
akciofejlesztés.SetActive(true);
|
||||
harcfejlesztés.SetActive(true);
|
||||
ujradobasfejlesztés.SetActive(true);
|
||||
hackfejlesztés.SetActive(true);
|
||||
kovetkezokor.SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
//ha a nagyobbat választotta akkor jelennek meg az akciók gombjai
|
||||
|
||||
//itt a movement bekapcsol
|
||||
kovetkezokor.SetActive(true);
|
||||
betarazas.SetActive(true);
|
||||
nyomozas.SetActive(true);
|
||||
hackeles.SetActive(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//itt az akciopont elérte a 0-át
|
||||
//movement kikapcs
|
||||
energiafejlesztés.SetActive(false);
|
||||
akciofejlesztés.SetActive(false);
|
||||
harcfejlesztés.SetActive(false);
|
||||
ujradobasfejlesztés.SetActive(false);
|
||||
hackfejlesztés.SetActive(false);
|
||||
//rolldice.SetActive(false);
|
||||
betarazas.SetActive(false);
|
||||
nyomozas.SetActive(false);
|
||||
hackeles.SetActive(false);
|
||||
//test.SetActive(false);
|
||||
kovetkezokor.SetActive(true);
|
||||
|
||||
//amint rányom a kör vége gombra 0 legyen az akciópont és megint csak a dobás legyen elérhető
|
||||
|
||||
|
||||
|
||||
//}
|
||||
|
||||
//JatekosNyert();
|
||||
//JatekosVesztett();
|
||||
|
||||
} */
|
||||
|
||||
public void JatekosNyert()
|
||||
{
|
||||
Debug.Log("Játékos nyerésének vizsgálata.");
|
||||
|
||||
@@ -75,6 +75,7 @@ public class movement : MonoBehaviour
|
||||
private Ugynok ugynok;
|
||||
private Targyak targyak;
|
||||
private jatekmanager jatekmanager;
|
||||
private Dice dice;
|
||||
|
||||
private int oneonecount = 0;
|
||||
private int twoonecount = 0;
|
||||
@@ -112,6 +113,7 @@ public class movement : MonoBehaviour
|
||||
ugynok = FindObjectOfType<Ugynok>();
|
||||
targyak = FindObjectOfType<Targyak>();
|
||||
jatekmanager = FindObjectOfType<jatekmanager>();
|
||||
dice = FindObjectOfType<Dice>();
|
||||
}
|
||||
|
||||
void Start()
|
||||
@@ -167,7 +169,6 @@ public class movement : MonoBehaviour
|
||||
eromulepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 1;
|
||||
jelenlegi_y = 1;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
else if (random == 2)
|
||||
{
|
||||
@@ -176,7 +177,6 @@ public class movement : MonoBehaviour
|
||||
feketepiaclepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 2;
|
||||
jelenlegi_y = 1;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
else if (random == 3)
|
||||
{
|
||||
@@ -185,7 +185,6 @@ public class movement : MonoBehaviour
|
||||
metrolepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 3;
|
||||
jelenlegi_y = 1;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
else if (random == 4)
|
||||
{
|
||||
@@ -194,7 +193,6 @@ public class movement : MonoBehaviour
|
||||
szervereklepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 1;
|
||||
jelenlegi_y = 2;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
else if (random == 5)
|
||||
{
|
||||
@@ -203,7 +201,6 @@ public class movement : MonoBehaviour
|
||||
kingcasinolepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 2;
|
||||
jelenlegi_y = 2;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
else if (random == 6)
|
||||
{
|
||||
@@ -212,7 +209,6 @@ public class movement : MonoBehaviour
|
||||
feltoltolepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 3;
|
||||
jelenlegi_y = 2;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
else if (random == 7)
|
||||
{
|
||||
@@ -221,7 +217,6 @@ public class movement : MonoBehaviour
|
||||
kutatolaborlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 1;
|
||||
jelenlegi_y = 3;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
else if (random == 8)
|
||||
{
|
||||
@@ -230,7 +225,6 @@ public class movement : MonoBehaviour
|
||||
kriptoklublepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 2;
|
||||
jelenlegi_y = 3;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
else if (random == 9)
|
||||
{
|
||||
@@ -239,7 +233,6 @@ public class movement : MonoBehaviour
|
||||
cyberplazalepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 3;
|
||||
jelenlegi_y = 3;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
else if (random == 10)
|
||||
{
|
||||
@@ -248,7 +241,6 @@ public class movement : MonoBehaviour
|
||||
hadiuzemlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 1;
|
||||
jelenlegi_y = 4;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
else if (random == 11)
|
||||
{
|
||||
@@ -257,7 +249,6 @@ public class movement : MonoBehaviour
|
||||
konyvtarlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 2;
|
||||
jelenlegi_y = 4;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
else if (random == 12)
|
||||
{
|
||||
@@ -266,9 +257,9 @@ public class movement : MonoBehaviour
|
||||
korhazlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
|
||||
jelenlegi_x = 3;
|
||||
jelenlegi_y = 4;
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
ugynok.setElozoHelyszin(jelenlegi_x, jelenlegi_y);
|
||||
}
|
||||
|
||||
@@ -825,6 +816,7 @@ public class movement : MonoBehaviour
|
||||
public void Update()
|
||||
{
|
||||
tavolsag = math.abs(tavolsag);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
|
||||
// player mozgatasa es konzolra iratas
|
||||
if (Input.GetKeyDown(KeyCode.Mouse0) && oneone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition)))
|
||||
@@ -862,7 +854,9 @@ public class movement : MonoBehaviour
|
||||
oneonecount = oneonecount + 1;
|
||||
Debug.Log(ap.akciopont);
|
||||
Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
if (eromulepes1.activeSelf == true)
|
||||
{
|
||||
@@ -926,7 +920,9 @@ public class movement : MonoBehaviour
|
||||
}
|
||||
twoonecount = twoonecount + 1;
|
||||
Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
if (feketepiaclepes1.activeSelf == true)
|
||||
{
|
||||
@@ -993,7 +989,9 @@ public class movement : MonoBehaviour
|
||||
threeonecount++;
|
||||
Debug.Log(ap.akciopont);
|
||||
Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
if (metrolepes1.activeSelf == true)
|
||||
{
|
||||
@@ -1064,7 +1062,9 @@ public class movement : MonoBehaviour
|
||||
onetwocount++;
|
||||
Debug.Log(ap.akciopont);
|
||||
Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
if (szervereklepes1.activeSelf == true)
|
||||
{
|
||||
@@ -1130,7 +1130,9 @@ public class movement : MonoBehaviour
|
||||
}
|
||||
Debug.Log(ap.akciopont);
|
||||
Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
twotwocount++;
|
||||
if (kingcasinolepes1.activeSelf == true)
|
||||
@@ -1202,7 +1204,9 @@ public class movement : MonoBehaviour
|
||||
}
|
||||
Debug.Log(ap.akciopont);
|
||||
Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
threetwocount++;
|
||||
if (feltoltolepes1.activeSelf == true)
|
||||
@@ -1270,7 +1274,9 @@ public class movement : MonoBehaviour
|
||||
}
|
||||
Debug.Log(ap.akciopont);
|
||||
Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
onethreecount++;
|
||||
if (kutatolaborlepes1.activeSelf == true)
|
||||
@@ -1342,7 +1348,9 @@ public class movement : MonoBehaviour
|
||||
}
|
||||
Debug.Log(ap.akciopont);
|
||||
Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
twothreecount++;
|
||||
if (kriptoklublepes1.activeSelf == true)
|
||||
@@ -1411,7 +1419,9 @@ public class movement : MonoBehaviour
|
||||
}
|
||||
Debug.Log(ap.akciopont);
|
||||
Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
threethreecount++;
|
||||
if (cyberplazalepes1.activeSelf == true)
|
||||
@@ -1479,7 +1489,9 @@ public class movement : MonoBehaviour
|
||||
}
|
||||
Debug.Log(ap.akciopont);
|
||||
Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
onefourcount++;
|
||||
if (hadiuzemlepes1.activeSelf == true)
|
||||
@@ -1547,7 +1559,9 @@ public class movement : MonoBehaviour
|
||||
}
|
||||
Debug.Log(ap.akciopont);
|
||||
Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
twofourcount++;
|
||||
if (konyvtarlepes1.activeSelf == true)
|
||||
@@ -1615,7 +1629,9 @@ public class movement : MonoBehaviour
|
||||
}
|
||||
Debug.Log(ap.akciopont);
|
||||
Debug.Log("ugynok sorsolas");
|
||||
ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
//ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
|
||||
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott
|
||||
dice.CallRenderDice(true);
|
||||
ugynok.ugynokMegolveElozoHelyen();
|
||||
threefourcount++;
|
||||
if (korhazlepes1.activeSelf == true)
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
"com.unity.textmeshpro": "3.0.6",
|
||||
"com.unity.timeline": "1.6.4",
|
||||
"com.unity.toolchain.linux-x86_64": "2.0.4",
|
||||
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4",
|
||||
"com.unity.ugui": "1.0.0",
|
||||
"com.unity.visualscripting": "1.7.8",
|
||||
"com.unity.modules.ai": "1.0.0",
|
||||
|
||||
@@ -260,6 +260,16 @@
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.toolchain.win-x86_64-linux-x86_64": {
|
||||
"version": "2.0.4",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.sysroot": "2.0.5",
|
||||
"com.unity.sysroot.linux-x86_64": "2.0.4"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.ugui": {
|
||||
"version": "1.0.0",
|
||||
"depth": 0,
|
||||
|
||||
@@ -134,7 +134,7 @@ PlayerSettings:
|
||||
16:10: 1
|
||||
16:9: 1
|
||||
Others: 1
|
||||
bundleVersion: 0.8
|
||||
bundleVersion: 0.9.1
|
||||
preloadedAssets: []
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
|
||||
@@ -6,7 +6,7 @@ EditorUserSettings:
|
||||
serializedVersion: 4
|
||||
m_ConfigSettings:
|
||||
RecentlyUsedSceneGuid-0:
|
||||
value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d
|
||||
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-1:
|
||||
value: 0200045e07010a5f5d5c542341765d4213164a7f797d7e347c7e1c60bab7656a
|
||||
@@ -15,7 +15,7 @@ EditorUserSettings:
|
||||
value: 07040753500359095b580a2641275e41444f19297c2d2363752d4a35b1b46339
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-3:
|
||||
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
|
||||
value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d
|
||||
flags: 0
|
||||
UnityRemoteCompression:
|
||||
value: 29617121
|
||||
|
||||
@@ -19,7 +19,7 @@ MonoBehaviour:
|
||||
width: 1920
|
||||
height: 997
|
||||
m_ShowMode: 4
|
||||
m_Title: Hierarchy
|
||||
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: 1269
|
||||
x: 1414
|
||||
y: 0
|
||||
width: 651
|
||||
width: 506
|
||||
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: 17}
|
||||
m_Panes:
|
||||
- {fileID: 17}
|
||||
@@ -145,7 +145,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 300, y: 200}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 110
|
||||
controlID: 94
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -165,12 +165,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1269
|
||||
width: 1414
|
||||
height: 947
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 111
|
||||
controlID: 82
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -190,12 +190,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1269
|
||||
height: 534
|
||||
width: 1414
|
||||
height: 617
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 112
|
||||
controlID: 83
|
||||
--- !u!114 &9
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -213,8 +213,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 237
|
||||
height: 534
|
||||
width: 205
|
||||
height: 617
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 13}
|
||||
@@ -237,12 +237,12 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 237
|
||||
x: 205
|
||||
y: 0
|
||||
width: 1032
|
||||
height: 534
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
width: 1209
|
||||
height: 617
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 14}
|
||||
m_Panes:
|
||||
- {fileID: 14}
|
||||
@@ -265,9 +265,9 @@ MonoBehaviour:
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 534
|
||||
width: 1269
|
||||
height: 413
|
||||
y: 617
|
||||
width: 1414
|
||||
height: 330
|
||||
m_MinSize: {x: 101, y: 121}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 16}
|
||||
@@ -296,10 +296,10 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 237
|
||||
x: 205
|
||||
y: 73
|
||||
width: 1030
|
||||
height: 513
|
||||
width: 1207
|
||||
height: 596
|
||||
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: 1030, y: 492}
|
||||
m_TargetSize: {x: 1207, y: 575}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
@@ -325,10 +325,10 @@ MonoBehaviour:
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -515
|
||||
m_HBaseRangeMax: 515
|
||||
m_VBaseRangeMin: -246
|
||||
m_VBaseRangeMax: 246
|
||||
m_HBaseRangeMin: -603.5
|
||||
m_HBaseRangeMax: 603.5
|
||||
m_VBaseRangeMin: -287.5
|
||||
m_VBaseRangeMax: 287.5
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
@@ -346,23 +346,23 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 1030
|
||||
height: 492
|
||||
width: 1207
|
||||
height: 575
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Translation: {x: 515, y: 246}
|
||||
m_Translation: {x: 603.5, y: 287.5}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -515
|
||||
y: -246
|
||||
width: 1030
|
||||
height: 492
|
||||
x: -603.5
|
||||
y: -287.5
|
||||
width: 1207
|
||||
height: 575
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 1
|
||||
m_LastWindowPixelSize: {x: 1030, y: 513}
|
||||
m_LastWindowPixelSize: {x: 1207, y: 596}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
@@ -390,8 +390,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 73
|
||||
width: 236
|
||||
height: 513
|
||||
width: 204
|
||||
height: 596
|
||||
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: 12fbffff
|
||||
m_ExpandedIDs: 6a9afeff0c9bfeffe69cfefff09cfeffe49efeffee9efeffbca2feff5ea3feff38a5feff42a5feff36a7feff40a7feff3eabfeffe0abfeffbaadfeffc4adfeff8caffeff96affeffccb2feffd6b2feff56b6fefff8b6feff10b7feff1ab7feffe2b8feffecb8feff7cbafeff1ebbfeff00bdfeff0abdfefffebefeff08bffeff9ec2feff40c3feff1ac5feff24c5feff18c7feff22c7feff3ccbfeffdecbfeffc0cdfeffcacdfeffbecffeffc8cffeff6ad3feff0cd4feff1cd4feff26d4feffeed5fefff8d5feff0cd7feffd2d8feff74d9feff84d9feff8ed9feff56dbfeff60dbfeff18ddfeffbaddfeffcaddfeffd4ddfeff9cdffeffa6dffeff8ae2feff36e6feff82e9feff24eafefffeebfeff08ecfeffd0edfeffeeedfeff563fffff6e46ffff1647ffffe048ffffdc4bffff804effff2c4fffffc258ffff7c59ffff785cffff6465ffffe26bffffd46cffff206effff28fbfffffa6b00009c700000567300003075000010780000b88a0100a28c0100c48c0100389b010062aa010054ab010056af0100c8b20100ce6e02008e6f0200
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -417,7 +417,7 @@ MonoBehaviour:
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 0
|
||||
m_ClientGUIView: {fileID: 0}
|
||||
m_ClientGUIView: {fileID: 9}
|
||||
m_SearchString:
|
||||
m_ExpandedScenes: []
|
||||
m_CurrenRootInstanceID: 0
|
||||
@@ -445,10 +445,10 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 237
|
||||
x: 205
|
||||
y: 73
|
||||
width: 1030
|
||||
height: 513
|
||||
width: 1207
|
||||
height: 596
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -705,9 +705,9 @@ MonoBehaviour:
|
||||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
m_Target: {x: -4.3600006, y: 0, z: -10}
|
||||
m_Target: {x: 721.455, y: 264.75873, z: -3.1850817}
|
||||
speed: 2
|
||||
m_Value: {x: -4.3600006, y: 0, z: -10}
|
||||
m_Value: {x: 721.455, y: 264.75873, z: -3.1850817}
|
||||
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: 12.124355
|
||||
m_Target: 421.58566
|
||||
speed: 2
|
||||
m_Value: 12.124355
|
||||
m_Value: 421.58566
|
||||
m_Ortho:
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
@@ -806,9 +806,9 @@ MonoBehaviour:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 607
|
||||
width: 1268
|
||||
height: 392
|
||||
y: 690
|
||||
width: 1413
|
||||
height: 309
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -826,22 +826,22 @@ MonoBehaviour:
|
||||
m_SkipHidden: 0
|
||||
m_SearchArea: 1
|
||||
m_Folders:
|
||||
- Assets/Scripts
|
||||
- Assets/Scenes
|
||||
m_Globs: []
|
||||
m_OriginalText:
|
||||
m_ViewMode: 1
|
||||
m_StartGridSize: 64
|
||||
m_LastFolders:
|
||||
- Assets/Scripts
|
||||
- Assets/Scenes
|
||||
m_LastFoldersGridSize: -1
|
||||
m_LastProjectPath: E:\dev\find the source\projekt\FindTheSource
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 3e7a0000
|
||||
m_LastClickedID: 31294
|
||||
m_ExpandedIDs: 000000001e7a0000
|
||||
m_SelectedIDs: 547a0000
|
||||
m_LastClickedID: 31316
|
||||
m_ExpandedIDs: 00000000187a0000567a0000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -869,7 +869,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 000000001e7a0000
|
||||
m_ExpandedIDs: 00000000187a0000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -894,8 +894,8 @@ MonoBehaviour:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_ListAreaState:
|
||||
m_SelectedInstanceIDs: ac6c0000
|
||||
m_LastClickedInstanceID: 27820
|
||||
m_SelectedInstanceIDs:
|
||||
m_LastClickedInstanceID: 0
|
||||
m_HadKeyboardFocusLastEvent: 1
|
||||
m_ExpandedInstanceIDs: c6230000
|
||||
m_RenameOverlay:
|
||||
@@ -913,7 +913,7 @@ MonoBehaviour:
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_ClientGUIView: {fileID: 0}
|
||||
m_ClientGUIView: {fileID: 11}
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
@@ -946,9 +946,9 @@ MonoBehaviour:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 607
|
||||
width: 1268
|
||||
height: 392
|
||||
y: 690
|
||||
width: 1413
|
||||
height: 309
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -973,9 +973,9 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 1269
|
||||
x: 1414
|
||||
y: 73
|
||||
width: 650
|
||||
width: 505
|
||||
height: 926
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
|
||||
Reference in New Issue
Block a user