dice bugfixes
This commit is contained in:
@@ -198,7 +198,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &16285950
|
--- !u!224 &16285950
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -3434,6 +3434,8 @@ MonoBehaviour:
|
|||||||
- {fileID: 21300000, guid: 8d8a82287846c3d4892b15d8ab640d68, type: 3}
|
- {fileID: 21300000, guid: 8d8a82287846c3d4892b15d8ab640d68, type: 3}
|
||||||
hely1: {fileID: 1620774317}
|
hely1: {fileID: 1620774317}
|
||||||
hely2: {fileID: 921900544}
|
hely2: {fileID: 921900544}
|
||||||
|
dice1btnBtn: {fileID: 1620774314}
|
||||||
|
dice2btnBtn: {fileID: 921900541}
|
||||||
diceResult: 0000000000000000
|
diceResult: 0000000000000000
|
||||||
ujertek:
|
ujertek:
|
||||||
valasztottErtek: 0
|
valasztottErtek: 0
|
||||||
@@ -3456,6 +3458,7 @@ MonoBehaviour:
|
|||||||
- {fileID: 710452256}
|
- {fileID: 710452256}
|
||||||
- {fileID: 255844036}
|
- {fileID: 255844036}
|
||||||
dobott: 0
|
dobott: 0
|
||||||
|
dobottEgyszer: 0
|
||||||
--- !u!114 &197904222
|
--- !u!114 &197904222
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -5242,7 +5245,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 0
|
m_IsActive: 0
|
||||||
--- !u!224 &274472944
|
--- !u!224 &274472944
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -5322,7 +5325,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &278097272
|
--- !u!224 &278097272
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -5932,7 +5935,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &305492121
|
--- !u!224 &305492121
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -5986,7 +5989,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &305972457
|
--- !u!224 &305972457
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -9986,7 +9989,7 @@ Transform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 519420028}
|
m_GameObject: {fileID: 519420028}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: -4, y: 0, z: -10}
|
m_LocalPosition: {x: -4, y: 0, z: -10}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
@@ -11399,7 +11402,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 0
|
m_IsActive: 0
|
||||||
--- !u!224 &628297614
|
--- !u!224 &628297614
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -13965,7 +13968,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 0
|
m_IsActive: 0
|
||||||
--- !u!224 &762817986
|
--- !u!224 &762817986
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -15334,7 +15337,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 0
|
m_IsActive: 0
|
||||||
--- !u!224 &815764583
|
--- !u!224 &815764583
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -17048,7 +17051,7 @@ Canvas:
|
|||||||
m_SortingBucketNormalizedSize: 0
|
m_SortingBucketNormalizedSize: 0
|
||||||
m_AdditionalShaderChannelsFlag: 25
|
m_AdditionalShaderChannelsFlag: 25
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingOrder: 0
|
m_SortingOrder: 2
|
||||||
m_TargetDisplay: 0
|
m_TargetDisplay: 0
|
||||||
--- !u!224 &891272366
|
--- !u!224 &891272366
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -17853,7 +17856,7 @@ SpriteRenderer:
|
|||||||
m_LightmapParameters: {fileID: 0}
|
m_LightmapParameters: {fileID: 0}
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: 2
|
m_SortingOrder: 3
|
||||||
m_Sprite: {fileID: 0}
|
m_Sprite: {fileID: 0}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_FlipX: 0
|
m_FlipX: 0
|
||||||
@@ -20828,7 +20831,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &1006554990
|
--- !u!224 &1006554990
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -23656,7 +23659,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &1155991840
|
--- !u!224 &1155991840
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -24471,7 +24474,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &1188450186
|
--- !u!224 &1188450186
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -27202,7 +27205,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &1345558467
|
--- !u!224 &1345558467
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -32129,7 +32132,7 @@ SpriteRenderer:
|
|||||||
m_LightmapParameters: {fileID: 0}
|
m_LightmapParameters: {fileID: 0}
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: 2
|
m_SortingOrder: 1
|
||||||
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
|
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
|
||||||
m_Color: {r: 1, g: 0, b: 0, a: 1}
|
m_Color: {r: 1, g: 0, b: 0, a: 1}
|
||||||
m_FlipX: 0
|
m_FlipX: 0
|
||||||
@@ -32236,7 +32239,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 0
|
m_IsActive: 0
|
||||||
--- !u!224 &1569152954
|
--- !u!224 &1569152954
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -33676,7 +33679,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &1617719566
|
--- !u!224 &1617719566
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -34126,7 +34129,7 @@ SpriteRenderer:
|
|||||||
m_LightmapParameters: {fileID: 0}
|
m_LightmapParameters: {fileID: 0}
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: 2
|
m_SortingOrder: 3
|
||||||
m_Sprite: {fileID: 0}
|
m_Sprite: {fileID: 0}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_FlipX: 0
|
m_FlipX: 0
|
||||||
@@ -34867,7 +34870,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &1657431395
|
--- !u!224 &1657431395
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -36188,7 +36191,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &1705902974
|
--- !u!224 &1705902974
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -38017,7 +38020,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &1794797041
|
--- !u!224 &1794797041
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -39991,7 +39994,7 @@ SpriteRenderer:
|
|||||||
m_LightmapParameters: {fileID: 0}
|
m_LightmapParameters: {fileID: 0}
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: 2
|
m_SortingOrder: 1
|
||||||
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
|
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
|
||||||
m_Color: {r: 0, g: 0.011921406, b: 1, a: 1}
|
m_Color: {r: 0, g: 0.011921406, b: 1, a: 1}
|
||||||
m_FlipX: 0
|
m_FlipX: 0
|
||||||
@@ -40787,7 +40790,7 @@ GameObject:
|
|||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 2147483647
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &1958549383
|
--- !u!224 &1958549383
|
||||||
RectTransform:
|
RectTransform:
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using TMPro;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
@@ -8,24 +7,21 @@ public class Dice : MonoBehaviour {
|
|||||||
public Sprite[] diceSides = new Sprite[6];
|
public Sprite[] diceSides = new Sprite[6];
|
||||||
public SpriteRenderer hely1;
|
public SpriteRenderer hely1;
|
||||||
public SpriteRenderer hely2;
|
public SpriteRenderer hely2;
|
||||||
|
public Button dice1btnBtn;
|
||||||
|
public Button dice2btnBtn;
|
||||||
private Upgrade upgrade;
|
private Upgrade upgrade;
|
||||||
private Akciopont ap;
|
private Akciopont ap;
|
||||||
private Energia energiasav;
|
private Energia energiasav;
|
||||||
private Targyak targyak;
|
private Targyak targyak;
|
||||||
|
|
||||||
public int[] diceResult = { 0, 0 };
|
public int[] diceResult = { 0, 0 };
|
||||||
public List<int> ujertek = new List<int>();
|
public List<int> ujertek = new List<int>();
|
||||||
public int valasztottErtek; //a jatekos altal valasztott dobott ertek helye
|
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
|
private bool locked = false; //ne lehessen ujra kivalasztani a masikat ha mar tortent egy valasztas
|
||||||
|
|
||||||
public bool adrenalinMegerosites = false;
|
public bool adrenalinMegerosites = false;
|
||||||
public GameObject adrenalinHasznalat;
|
public GameObject adrenalinHasznalat;
|
||||||
public Button confirm;
|
public Button confirm;
|
||||||
public Button cancel;
|
public Button cancel;
|
||||||
public bool mehet = false;
|
public bool mehet = false;
|
||||||
|
|
||||||
|
|
||||||
public BoxCollider2D[] colliders;
|
public BoxCollider2D[] colliders;
|
||||||
|
|
||||||
//getters setters
|
//getters setters
|
||||||
@@ -34,21 +30,16 @@ public class Dice : MonoBehaviour {
|
|||||||
public void setValasztottErtek(int ujErtek) { valasztottErtek = ujErtek; }
|
public void setValasztottErtek(int ujErtek) { valasztottErtek = ujErtek; }
|
||||||
public bool getLocked() { return locked; }
|
public bool getLocked() { return locked; }
|
||||||
public void setLocked(bool locked) { this.locked = locked; }
|
public void setLocked(bool locked) { this.locked = locked; }
|
||||||
|
|
||||||
public int dobott = 0;
|
public int dobott = 0;
|
||||||
|
public bool dobottEgyszer = false; //tudjon ujra dobni vagy nem
|
||||||
|
|
||||||
private void Awake() {
|
private void Awake() {
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Start() {
|
|
||||||
upgrade = FindObjectOfType<Upgrade>();
|
upgrade = FindObjectOfType<Upgrade>();
|
||||||
ap = FindObjectOfType<Akciopont>();
|
ap = FindObjectOfType<Akciopont>();
|
||||||
energiasav = FindObjectOfType<Energia>();
|
energiasav = FindObjectOfType<Energia>();
|
||||||
targyak = FindObjectOfType<Targyak>();
|
targyak = FindObjectOfType<Targyak>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void ertekValasztas(GameObject gomb) {
|
public void ertekValasztas(GameObject gomb) {
|
||||||
if (diceResult[0] != 0 && diceResult[1] != 0 && !locked) { //megnezzuk hogy lett e mar dobva es nem valasztott meg a jatekos
|
if (diceResult[0] != 0 && diceResult[1] != 0 && !locked) { //megnezzuk hogy lett e mar dobva es nem valasztott meg a jatekos
|
||||||
if (gomb.name == "dice1btn") {
|
if (gomb.name == "dice1btn") {
|
||||||
@@ -89,11 +80,19 @@ public class Dice : MonoBehaviour {
|
|||||||
public void CallRenderDice() => StartCoroutine(renderDice());
|
public void CallRenderDice() => StartCoroutine(renderDice());
|
||||||
|
|
||||||
public IEnumerator renderDice() {
|
public IEnumerator renderDice() {
|
||||||
|
//ha zarolva van akkor ne tudjon ujra dobni / csak egyszer dobhasson (amig nincs feloldva a kovetkezo dobashoz)
|
||||||
|
if(dobottEgyszer) yield break;
|
||||||
|
|
||||||
|
//dice gombok kikapcsolasa hogy amig nem vegez ne tudjon erteket valasztani
|
||||||
|
dice1btnBtn.enabled = false;
|
||||||
|
dice2btnBtn.enabled = false;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
diceResult[0] = RollDice();
|
diceResult[0] = RollDice();
|
||||||
diceResult[1] = RollDice();
|
diceResult[1] = RollDice();
|
||||||
} while (diceResult[0] == diceResult[1]);
|
} while (diceResult[0] == diceResult[1]);
|
||||||
|
|
||||||
|
|
||||||
//lassa a jatekos mit dobott
|
//lassa a jatekos mit dobott
|
||||||
hely1.sprite = diceSides[diceResult[0]-1];
|
hely1.sprite = diceSides[diceResult[0]-1];
|
||||||
hely1.size = new Vector2(38, 38);
|
hely1.size = new Vector2(38, 38);
|
||||||
@@ -101,6 +100,8 @@ public class Dice : MonoBehaviour {
|
|||||||
hely2.sprite = diceSides[diceResult[1]-1];
|
hely2.sprite = diceSides[diceResult[1]-1];
|
||||||
hely2.size = new Vector2(38, 38);
|
hely2.size = new Vector2(38, 38);
|
||||||
|
|
||||||
|
dobottEgyszer = true;
|
||||||
|
|
||||||
//ha megvan a targy
|
//ha megvan a targy
|
||||||
if(targyak.adrenalinloket > 0) {
|
if(targyak.adrenalinloket > 0) {
|
||||||
//helyszin collider kikapcsolas a gomb miatt
|
//helyszin collider kikapcsolas a gomb miatt
|
||||||
@@ -121,12 +122,12 @@ public class Dice : MonoBehaviour {
|
|||||||
adrenalinHasznalat.gameObject.SetActive(false);
|
adrenalinHasznalat.gameObject.SetActive(false);
|
||||||
|
|
||||||
if (adrenalinMegerosites) {
|
if (adrenalinMegerosites) {
|
||||||
//Debug.Log("belep");
|
|
||||||
targyak.CallAdrenalinLoket();
|
targyak.CallAdrenalinLoket();
|
||||||
yield return new WaitUntil(() => ujertek.Count > 0);
|
yield return new WaitUntil(() => ujertek.Count > 0);
|
||||||
if(mehet){
|
if(mehet){
|
||||||
Debug.Log("belep mehet");
|
Debug.Log("belep mehet");
|
||||||
Debug.Log("List: 0: " + ujertek[0] + " 1: " + ujertek[1]);
|
Debug.Log("List: 0: " + ujertek[0] + " 1: " + ujertek[1]);
|
||||||
|
//EGYENLO ERTEKEK VIZSGALATA
|
||||||
//ha tul nagy vagy tul kicsi erteket ad meg az elso kockanak valtsa at az erteket
|
//ha tul nagy vagy tul kicsi erteket ad meg az elso kockanak valtsa at az erteket
|
||||||
if(targyak.ujertek1 > 6 && diceResult[1] != 6 && targyak.ujertek2 != 6){ //ha tul nagy szamot adott meg legyen 6 az ertek
|
if(targyak.ujertek1 > 6 && diceResult[1] != 6 && targyak.ujertek2 != 6){ //ha tul nagy szamot adott meg legyen 6 az ertek
|
||||||
targyak.ujertek1 = 6;
|
targyak.ujertek1 = 6;
|
||||||
@@ -149,18 +150,15 @@ public class Dice : MonoBehaviour {
|
|||||||
targyak.ujertek2 = 1;
|
targyak.ujertek2 = 1;
|
||||||
}else if(targyak.ujertek2 < 1 && (diceResult[0] == 1 || targyak.ujertek1 == 1)){
|
}else if(targyak.ujertek2 < 1 && (diceResult[0] == 1 || targyak.ujertek1 == 1)){
|
||||||
targyak.ujertek2 = 2;
|
targyak.ujertek2 = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
diceResult[0] = targyak.ujertek1;
|
diceResult[0] = targyak.ujertek1;
|
||||||
diceResult[1] = targyak.ujertek2;
|
diceResult[1] = targyak.ujertek2;
|
||||||
|
dobottEgyszer = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//deaktivalas
|
//deaktivalas
|
||||||
Debug.Log("belep2");
|
|
||||||
adrenalinMegerosites = false;
|
adrenalinMegerosites = false;
|
||||||
//HelyszinKiBekapcs(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
hely1.sprite = diceSides[diceResult[0]-1];
|
hely1.sprite = diceSides[diceResult[0]-1];
|
||||||
@@ -169,6 +167,10 @@ public class Dice : MonoBehaviour {
|
|||||||
hely2.sprite = diceSides[diceResult[1]-1];
|
hely2.sprite = diceSides[diceResult[1]-1];
|
||||||
hely2.size = new Vector2(38, 38);
|
hely2.size = new Vector2(38, 38);
|
||||||
dobott++;
|
dobott++;
|
||||||
|
|
||||||
|
//ha vegzett mindennel kapcsolja vissza az ertekvalasztast
|
||||||
|
dice1btnBtn.enabled = true;
|
||||||
|
dice2btnBtn.enabled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void HelyszinKiBekapcs(bool kikapcsolas){
|
public void HelyszinKiBekapcs(bool kikapcsolas){
|
||||||
|
|||||||
@@ -121,11 +121,12 @@ public class Targyak : MonoBehaviour
|
|||||||
yield break; //kilepeshez
|
yield break; //kilepeshez
|
||||||
}else{
|
}else{
|
||||||
deactivateInputOk(false);
|
deactivateInputOk(false);
|
||||||
|
dice.HelyszinKiBekapcs(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
//ha nem lepett ki eddig
|
//ha nem lepett ki eddig
|
||||||
dice.ujertek[0] = dice.getDices()[0];
|
//dice.ujertek[0] = dice.getDices()[0];
|
||||||
dice.ujertek[1] = dice.getDices()[1]; //regi adat, hogy ne legyen hibas
|
//dice.ujertek[1] = dice.getDices()[1]; //regi adat, hogy ne legyen hibas
|
||||||
}
|
}
|
||||||
|
|
||||||
public void deactivateInputOk(bool targyelvesztes) {
|
public void deactivateInputOk(bool targyelvesztes) {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 300, y: 200}
|
m_MinSize: {x: 300, y: 200}
|
||||||
m_MaxSize: {x: 24288, y: 16192}
|
m_MaxSize: {x: 24288, y: 16192}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 13575
|
controlID: 103
|
||||||
--- !u!114 &2
|
--- !u!114 &2
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@@ -141,7 +141,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 200, y: 200}
|
m_MinSize: {x: 200, y: 200}
|
||||||
m_MaxSize: {x: 16192, y: 16192}
|
m_MaxSize: {x: 16192, y: 16192}
|
||||||
vertical: 1
|
vertical: 1
|
||||||
controlID: 13576
|
controlID: 54
|
||||||
--- !u!114 &4
|
--- !u!114 &4
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@@ -166,7 +166,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 200, y: 100}
|
m_MinSize: {x: 200, y: 100}
|
||||||
m_MaxSize: {x: 16192, y: 8096}
|
m_MaxSize: {x: 16192, y: 8096}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 13537
|
controlID: 29
|
||||||
--- !u!114 &5
|
--- !u!114 &5
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@@ -186,8 +186,8 @@ MonoBehaviour:
|
|||||||
y: 0
|
y: 0
|
||||||
width: 311
|
width: 311
|
||||||
height: 574
|
height: 574
|
||||||
m_MinSize: {x: 200, y: 200}
|
m_MinSize: {x: 201, y: 221}
|
||||||
m_MaxSize: {x: 4000, y: 4000}
|
m_MaxSize: {x: 4001, y: 4021}
|
||||||
m_ActualView: {fileID: 6}
|
m_ActualView: {fileID: 6}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 6}
|
- {fileID: 6}
|
||||||
@@ -223,10 +223,10 @@ MonoBehaviour:
|
|||||||
m_SaveData: []
|
m_SaveData: []
|
||||||
m_SceneHierarchy:
|
m_SceneHierarchy:
|
||||||
m_TreeViewState:
|
m_TreeViewState:
|
||||||
scrollPos: {x: 0, y: 188}
|
scrollPos: {x: 0, y: 140}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: b2b3ffff88b7ffff2eb8ffff0abaffff12bafffff6bbffff00bcffff96e4ffff28fbffff306f000014700000ea730000b4ae0000f4ae00001caf0000d2af000006b000001eb0000046b0000012f5000040f70000a6fa00004cfe0000
|
m_ExpandedIDs: 28fbffff10700000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@@ -557,9 +557,9 @@ MonoBehaviour:
|
|||||||
m_PlayAudio: 0
|
m_PlayAudio: 0
|
||||||
m_AudioPlay: 0
|
m_AudioPlay: 0
|
||||||
m_Position:
|
m_Position:
|
||||||
m_Target: {x: -5.220311, y: -0.793674, z: -0.07745893}
|
m_Target: {x: 0.13771603, y: -0.76930296, z: -0.10357345}
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: -5.220311, y: -0.793674, z: -0.07745893}
|
m_Value: {x: 0.13771603, y: -0.76930296, z: -0.10357345}
|
||||||
m_RenderMode: 0
|
m_RenderMode: 0
|
||||||
m_CameraMode:
|
m_CameraMode:
|
||||||
drawMode: 0
|
drawMode: 0
|
||||||
@@ -610,9 +610,9 @@ MonoBehaviour:
|
|||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_Size:
|
m_Size:
|
||||||
m_Target: 12.106108
|
m_Target: 12.508838
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: 12.106108
|
m_Value: 12.508838
|
||||||
m_Ortho:
|
m_Ortho:
|
||||||
m_Target: 1
|
m_Target: 1
|
||||||
speed: 2
|
speed: 2
|
||||||
@@ -656,8 +656,8 @@ MonoBehaviour:
|
|||||||
y: 574
|
y: 574
|
||||||
width: 1421
|
width: 1421
|
||||||
height: 373
|
height: 373
|
||||||
m_MinSize: {x: 231, y: 271}
|
m_MinSize: {x: 230, y: 250}
|
||||||
m_MaxSize: {x: 10001, y: 10021}
|
m_MaxSize: {x: 10000, y: 10000}
|
||||||
m_ActualView: {fileID: 10}
|
m_ActualView: {fileID: 10}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 10}
|
- {fileID: 10}
|
||||||
@@ -705,22 +705,22 @@ MonoBehaviour:
|
|||||||
m_SkipHidden: 0
|
m_SkipHidden: 0
|
||||||
m_SearchArea: 1
|
m_SearchArea: 1
|
||||||
m_Folders:
|
m_Folders:
|
||||||
- Assets/Scenes
|
- Assets/Scripts
|
||||||
m_Globs: []
|
m_Globs: []
|
||||||
m_OriginalText:
|
m_OriginalText:
|
||||||
m_ViewMode: 1
|
m_ViewMode: 1
|
||||||
m_StartGridSize: 66
|
m_StartGridSize: 66
|
||||||
m_LastFolders:
|
m_LastFolders:
|
||||||
- Assets/Scenes
|
- Assets/Scripts
|
||||||
m_LastFoldersGridSize: 66
|
m_LastFoldersGridSize: 66
|
||||||
m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource
|
m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource
|
||||||
m_LockTracker:
|
m_LockTracker:
|
||||||
m_IsLocked: 0
|
m_IsLocked: 0
|
||||||
m_FolderTreeState:
|
m_FolderTreeState:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs: 50790000
|
m_SelectedIDs: 3c790000
|
||||||
m_LastClickedID: 31056
|
m_LastClickedID: 31036
|
||||||
m_ExpandedIDs: 000000002079000052790000
|
m_ExpandedIDs: 000000001c790000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@@ -748,7 +748,7 @@ MonoBehaviour:
|
|||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: 0000000020790000
|
m_ExpandedIDs: 000000001c790000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@@ -773,8 +773,8 @@ MonoBehaviour:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_ResourceFile:
|
m_ResourceFile:
|
||||||
m_ListAreaState:
|
m_ListAreaState:
|
||||||
m_SelectedInstanceIDs: 96f30000
|
m_SelectedInstanceIDs: 10700000
|
||||||
m_LastClickedInstanceID: 62358
|
m_LastClickedInstanceID: 28688
|
||||||
m_HadKeyboardFocusLastEvent: 1
|
m_HadKeyboardFocusLastEvent: 1
|
||||||
m_ExpandedInstanceIDs: c623000000000000
|
m_ExpandedInstanceIDs: c623000000000000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
@@ -892,7 +892,7 @@ MonoBehaviour:
|
|||||||
m_CachedPref: 160
|
m_CachedPref: 160
|
||||||
m_ControlHash: -371814159
|
m_ControlHash: -371814159
|
||||||
m_PrefName: Preview_InspectorPreview
|
m_PrefName: Preview_InspectorPreview
|
||||||
m_LastInspectedObjectInstanceID: 62358
|
m_LastInspectedObjectInstanceID: 28688
|
||||||
m_LastVerticalScrollValue: 0
|
m_LastVerticalScrollValue: 0
|
||||||
m_GlobalObjectId:
|
m_GlobalObjectId:
|
||||||
m_InspectorMode: 0
|
m_InspectorMode: 0
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 300, y: 200}
|
m_MinSize: {x: 300, y: 200}
|
||||||
m_MaxSize: {x: 24288, y: 16192}
|
m_MaxSize: {x: 24288, y: 16192}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 66
|
controlID: 1257
|
||||||
--- !u!114 &6
|
--- !u!114 &6
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@@ -144,7 +144,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 200, y: 200}
|
m_MinSize: {x: 200, y: 200}
|
||||||
m_MaxSize: {x: 16192, y: 16192}
|
m_MaxSize: {x: 16192, y: 16192}
|
||||||
vertical: 1
|
vertical: 1
|
||||||
controlID: 67
|
controlID: 1188
|
||||||
--- !u!114 &7
|
--- !u!114 &7
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@@ -169,7 +169,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 200, y: 100}
|
m_MinSize: {x: 200, y: 100}
|
||||||
m_MaxSize: {x: 16192, y: 8096}
|
m_MaxSize: {x: 16192, y: 8096}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 68
|
controlID: 1189
|
||||||
--- !u!114 &8
|
--- !u!114 &8
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@@ -269,8 +269,8 @@ MonoBehaviour:
|
|||||||
y: 0
|
y: 0
|
||||||
width: 499
|
width: 499
|
||||||
height: 947
|
height: 947
|
||||||
m_MinSize: {x: 275, y: 50}
|
m_MinSize: {x: 276, y: 71}
|
||||||
m_MaxSize: {x: 4000, y: 4000}
|
m_MaxSize: {x: 4001, y: 4021}
|
||||||
m_ActualView: {fileID: 17}
|
m_ActualView: {fileID: 17}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 17}
|
- {fileID: 17}
|
||||||
@@ -296,8 +296,8 @@ MonoBehaviour:
|
|||||||
m_Tooltip:
|
m_Tooltip:
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 312
|
x: 311
|
||||||
y: 19
|
y: 73
|
||||||
width: 1108
|
width: 1108
|
||||||
height: 553
|
height: 553
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
@@ -314,7 +314,7 @@ MonoBehaviour:
|
|||||||
m_TextureFilterMode: 0
|
m_TextureFilterMode: 0
|
||||||
m_TextureHideFlags: 61
|
m_TextureHideFlags: 61
|
||||||
m_RenderIMGUI: 1
|
m_RenderIMGUI: 1
|
||||||
m_EnterPlayModeBehavior: 1
|
m_EnterPlayModeBehavior: 0
|
||||||
m_UseMipMap: 0
|
m_UseMipMap: 0
|
||||||
m_VSyncEnabled: 0
|
m_VSyncEnabled: 0
|
||||||
m_Gizmos: 0
|
m_Gizmos: 0
|
||||||
@@ -401,7 +401,7 @@ MonoBehaviour:
|
|||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: 56b7fffff8b7ffffd4b9ffffdcb9ffff8abbffffa6bbffff8cc1ffff2ec2ffff44c2ffff4cc2fffffac3ffff04c4ffff20c7ffffc2c7ffffa6c9ffffaec9ffff5ccbffff78cbffff58e2fffffae2ffffd6e4ffffdee4ffff8ce6ffffa8e6ffff28fbffff
|
m_ExpandedIDs: 36b7ffffdcb7ffffb8b9ffffc0b9ffff6ebbffff8abbffff28fbffff
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@@ -705,9 +705,9 @@ MonoBehaviour:
|
|||||||
m_PlayAudio: 0
|
m_PlayAudio: 0
|
||||||
m_AudioPlay: 0
|
m_AudioPlay: 0
|
||||||
m_Position:
|
m_Position:
|
||||||
m_Target: {x: -5.220311, y: -0.793674, z: -0.07745893}
|
m_Target: {x: 0.13771603, y: -0.76930296, z: -0.10357345}
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: -5.220311, y: -0.793674, z: -0.07745893}
|
m_Value: {x: 0.13771603, y: -0.76930296, z: -0.10357345}
|
||||||
m_RenderMode: 0
|
m_RenderMode: 0
|
||||||
m_CameraMode:
|
m_CameraMode:
|
||||||
drawMode: 0
|
drawMode: 0
|
||||||
@@ -758,9 +758,9 @@ MonoBehaviour:
|
|||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_Size:
|
m_Size:
|
||||||
m_Target: 12.106108
|
m_Target: 12.508838
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: 12.106108
|
m_Value: 12.508838
|
||||||
m_Ortho:
|
m_Ortho:
|
||||||
m_Target: 1
|
m_Target: 1
|
||||||
speed: 2
|
speed: 2
|
||||||
@@ -826,21 +826,21 @@ MonoBehaviour:
|
|||||||
m_SkipHidden: 0
|
m_SkipHidden: 0
|
||||||
m_SearchArea: 1
|
m_SearchArea: 1
|
||||||
m_Folders:
|
m_Folders:
|
||||||
- Assets/Scenes
|
- Assets/Scripts
|
||||||
m_Globs: []
|
m_Globs: []
|
||||||
m_OriginalText:
|
m_OriginalText:
|
||||||
m_ViewMode: 1
|
m_ViewMode: 1
|
||||||
m_StartGridSize: 66
|
m_StartGridSize: 66
|
||||||
m_LastFolders:
|
m_LastFolders:
|
||||||
- Assets/Scenes
|
- Assets/Scripts
|
||||||
m_LastFoldersGridSize: 66
|
m_LastFoldersGridSize: 66
|
||||||
m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource
|
m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource
|
||||||
m_LockTracker:
|
m_LockTracker:
|
||||||
m_IsLocked: 0
|
m_IsLocked: 0
|
||||||
m_FolderTreeState:
|
m_FolderTreeState:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs: 26790000
|
m_SelectedIDs: 3c790000
|
||||||
m_LastClickedID: 31014
|
m_LastClickedID: 31036
|
||||||
m_ExpandedIDs: 000000001c790000
|
m_ExpandedIDs: 000000001c790000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
@@ -896,7 +896,7 @@ MonoBehaviour:
|
|||||||
m_ListAreaState:
|
m_ListAreaState:
|
||||||
m_SelectedInstanceIDs:
|
m_SelectedInstanceIDs:
|
||||||
m_LastClickedInstanceID: 0
|
m_LastClickedInstanceID: 0
|
||||||
m_HadKeyboardFocusLastEvent: 0
|
m_HadKeyboardFocusLastEvent: 1
|
||||||
m_ExpandedInstanceIDs: c623000000000000
|
m_ExpandedInstanceIDs: c623000000000000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
@@ -988,7 +988,7 @@ MonoBehaviour:
|
|||||||
m_ControlHash: -371814159
|
m_ControlHash: -371814159
|
||||||
m_PrefName: Preview_InspectorPreview
|
m_PrefName: Preview_InspectorPreview
|
||||||
m_LastInspectedObjectInstanceID: -1
|
m_LastInspectedObjectInstanceID: -1
|
||||||
m_LastVerticalScrollValue: 0
|
m_LastVerticalScrollValue: 570
|
||||||
m_GlobalObjectId:
|
m_GlobalObjectId:
|
||||||
m_InspectorMode: 0
|
m_InspectorMode: 0
|
||||||
m_LockTracker:
|
m_LockTracker:
|
||||||
|
|||||||
Reference in New Issue
Block a user