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

update

Browse Source
This commit is contained in:
Playmaker1210
2023-02-08 16:03:08 +01:00
parent 079776f1fa
commit 49555c711d
5 changed files with 225 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
Assets/Scenes/Jatek.unity
View File

@@ -264,19 +264,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 16285952}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 197904220}
m_TargetAssemblyTypeName: Dice, Assembly-CSharp
m_MethodName: setAdrenalinMegerosites
m_Mode: 6
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_Calls: []
--- !u!114 &16285952
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3446,8 +3434,26 @@ MonoBehaviour:
- {fileID: 21300000, guid: 8d8a82287846c3d4892b15d8ab640d68, type: 3}
hely1: {fileID: 1620774317}
hely2: {fileID: 921900544}
diceResult: 0000000000000000
ujertek:
valasztottErtek: 0
adrenalinMegerosites: 0
adrenalinHasznalat: {fileID: 274472943}
confirm: {fileID: 1617719567}
cancel: {fileID: 0}
colliders:
- {fileID: 987029841}
- {fileID: 1580358512}
- {fileID: 829877509}
- {fileID: 146512458}
- {fileID: 1872854}
- {fileID: 1173707738}
- {fileID: 711095008}
- {fileID: 1541045931}
- {fileID: 365563088}
- {fileID: 53063410}
- {fileID: 710452256}
- {fileID: 255844036}
dobott: 0
--- !u!114 &197904222
MonoBehaviour:
@@ -3907,6 +3913,8 @@ MonoBehaviour:
kocka2ertek: {fileID: 762817987}
ujertek1: 0
ujertek2: 0
confirmNewValue: {fileID: 815764584}
cancelNewValue: {fileID: 628297615}
targy_szamlalo: 0
adrenalinloket: 0
hackercsatlakozo: 0
@@ -11386,7 +11394,7 @@ GameObject:
- component: {fileID: 628297616}
- component: {fileID: 628297615}
m_Layer: 5
m_Name: deaktivateInput2
m_Name: cancelNewValue
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -11410,8 +11418,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: 163.36, y: 0}
m_SizeDelta: {x: 51.11, y: 30}
m_AnchoredPosition: {x: 180, y: -42}
m_SizeDelta: {x: 82.68, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &628297615
MonoBehaviour:
@@ -11456,19 +11464,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 628297616}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 197904236}
m_TargetAssemblyTypeName: Targyak, Assembly-CSharp
m_MethodName: deactivateInput2
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_Calls: []
--- !u!114 &628297616
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -13984,11 +13980,11 @@ RectTransform:
m_Children:
- {fileID: 1345558467}
m_Father: {fileID: 891272366}
m_RootOrder: 29
m_RootOrder: 28
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: -42}
m_SizeDelta: {x: 250, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &762817987
@@ -15333,7 +15329,7 @@ GameObject:
- component: {fileID: 815764585}
- component: {fileID: 815764584}
m_Layer: 5
m_Name: deaktivateInput1
m_Name: confirmNewValue
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -15353,12 +15349,12 @@ RectTransform:
m_Children:
- {fileID: 1188450186}
m_Father: {fileID: 891272366}
m_RootOrder: 28
m_RootOrder: 29
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: 163.36, y: 0}
m_SizeDelta: {x: 51.11, y: 30}
m_AnchoredPosition: {x: 180, y: 0}
m_SizeDelta: {x: 82.68, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &815764584
MonoBehaviour:
@@ -15403,19 +15399,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 815764585}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 197904236}
m_TargetAssemblyTypeName: Targyak, Assembly-CSharp
m_MethodName: deactivateInput1
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_Calls: []
--- !u!114 &815764585
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -17105,8 +17089,8 @@ RectTransform:
- {fileID: 83085750}
- {fileID: 191744300}
- {fileID: 1569152954}
- {fileID: 815764583}
- {fileID: 762817986}
- {fileID: 815764583}
- {fileID: 628297614}
- {fileID: 274472944}
m_Father: {fileID: 0}
@@ -28682,7 +28666,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 197904220}
m_TargetAssemblyTypeName: Dice, Assembly-CSharp
m_MethodName: renderDice
m_MethodName: CallRenderDice
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -33757,19 +33741,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1617719568}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 197904220}
m_TargetAssemblyTypeName: Dice, Assembly-CSharp
m_MethodName: setAdrenalinMegerosites
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
m_Calls: []
--- !u!114 &1617719568
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -38086,7 +38058,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: OK
m_text: cancel
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

4
Assets/Scripts/Akciopont.cs
View File

@@ -12,13 +12,13 @@ public class Akciopont : MonoBehaviour
// Start is called before the first frame update
void Start()
{
text.text = "Akciópontok: ";
text.text = "Akciopontok: ";
}
// Update is called once per frame
void Update()
{
text.text = "Akciópontok: " + akciopont;
text.text = "Akciopontok: " + akciopont;
}
public void UpdateAkciopont(int number) {

81
Assets/Scripts/Dice.cs
View File

@@ -1,6 +1,7 @@
using System.Collections;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
public class Dice : MonoBehaviour {
public Sprite[] diceSides = new Sprite[6];
@@ -12,12 +13,18 @@ public class Dice : MonoBehaviour {
private Energia energiasav;
private Targyak targyak;
private int[] diceResult = { 0, 0 };
public int[] diceResult = { 0, 0 };
public int[] ujertek;
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 adrenalinMegerosites = false;
public bool adrenalinMegerosites = false;
public GameObject adrenalinHasznalat;
public Button confirm;
public Button cancel;
public BoxCollider2D[] colliders;
//getters setters
public int[] getDices() { return diceResult; }
@@ -73,40 +80,49 @@ public class Dice : MonoBehaviour {
return finalSide;
}
public void renderDice() {
public void CallRenderDice() => StartCoroutine(renderDice());
public IEnumerator renderDice() {
do {
diceResult[0] = RollDice();
diceResult[1] = RollDice();
/*if(targyak.adrenalinloket > 0) {
//text aktivalasa kerdesre hogy akarja e hasznalni a targyat
adrenalinHasznalat.SetActive(true);
//ha igen gomb -> valtozo igaz, targy fv meghivas, deaktivalas
if (adrenalinMegerosites) {
int[] ujertek = targyak.AdrenalinLoket();
diceResult[0] = ujertek[0];
diceResult[1] = ujertek[1];
}
//deaktivalas
adrenalinHasznalat.gameObject.SetActive(false);
adrenalinMegerosites = false;
}*/
} while (diceResult[0] == diceResult[1]);
//lassa a jatekos mit dobott
hely1.sprite = diceSides[diceResult[0]-1];
hely1.size = new Vector2(38, 38);
hely2.sprite = diceSides[diceResult[1]-1];
hely2.size = new Vector2(38, 38);
if(targyak.adrenalinloket > 0) {
Debug.Log("belep");
//helyszin collider kikapcsolas a gomb miatt
HelyszinKiBekapcs(true);
//text aktivalasa kerdesre hogy akarja e hasznalni a targyat
adrenalinHasznalat.SetActive(true);
adrenalinHasznalat.gameObject.SetActive(true);
//ha igen gomb -> valtozo igaz, targy fv meghivas, deaktivalas
//VARNIA KELL A GOMBRA
var waitForButton = new WaitForUIButtons(confirm, cancel);
yield return waitForButton.Reset();
if(waitForButton.PressedButton == confirm){
adrenalinMegerosites = true;
}else{
adrenalinMegerosites = false;
}
adrenalinHasznalat.gameObject.SetActive(false);
if (adrenalinMegerosites) {
int[] ujertek = targyak.AdrenalinLoket();
Debug.Log("belep");
targyak.CallAdrenalinLoket();
diceResult[0] = ujertek[0];
diceResult[1] = ujertek[1];
}
//deaktivalas
adrenalinHasznalat.gameObject.SetActive(false);
Debug.Log("belep2");
adrenalinMegerosites = false;
HelyszinKiBekapcs(false);
}
@@ -119,6 +135,29 @@ public class Dice : MonoBehaviour {
}
public void HelyszinKiBekapcs(bool kikapcsolas){
if(kikapcsolas)
foreach(var item in colliders)
item.gameObject.SetActive(false);
else
foreach(var item in colliders)
item.gameObject.SetActive(true);
}
public IEnumerator waitbutton(){
Debug.Log("belep wait");
var waitForButton = new WaitForUIButtons(confirm, cancel);
yield return waitForButton.Reset();
if(waitForButton.PressedButton == confirm){
adrenalinMegerosites = true;
}else{
adrenalinMegerosites = false;
}
adrenalinHasznalat.gameObject.SetActive(false);
}
public void setAdrenalinMegerosites(bool adrenalinMegerosites) {
this.adrenalinMegerosites = adrenalinMegerosites;
}

46
Assets/Scripts/Targyak.cs
View File

@@ -2,6 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
public class Targyak : MonoBehaviour
{
@@ -17,6 +18,8 @@ public class Targyak : MonoBehaviour
public TMP_InputField kocka2ertek;
public int ujertek1;
public int ujertek2;
public Button confirmNewValue;
public Button cancelNewValue;
public int targy_szamlalo = 0;
public int adrenalinloket = 0;
@@ -86,26 +89,45 @@ public class Targyak : MonoBehaviour
adrenalinloket = 1;
}
public int[] AdrenalinLoket() {
//kocka1ertek.text = dice.getDices()[0].ToString(); //maradjon uresen es jelenjen meg kepen a kocka ertekek, hogy while-al varakoztatni lehessen?
//kocka2ertek.text = dice.getDices()[1].ToString();
public void CallAdrenalinLoket() => StartCoroutine(AdrenalinLoket());
public IEnumerator AdrenalinLoket() {
Debug.Log("nefefs");
kocka1ertek.text = dice.getDices()[0].ToString(); //maradjon uresen es jelenjen meg kepen a kocka ertekek, hogy while-al varakoztatni lehessen?
kocka2ertek.text = dice.getDices()[1].ToString();
kocka1ertek.gameObject.SetActive(true); //aktivalja az input mezot hogy meg lehessen adni az uj erteket
kocka2ertek.gameObject.SetActive(true);
//ITT IS VARNI KELL?
kocka2ertek.gameObject.SetActive(true);
confirmNewValue.gameObject.SetActive(true);//aktivalja a gombot hozza
cancelNewValue.gameObject.SetActive(true);
ujertek1 = int.Parse(kocka1ertek.text);
ujertek2 = int.Parse(kocka2ertek.text); //hogy tunik el az elozo? || egymas melle kerul a ket input vagy gomb ami deaktivalja a inputot
int[] eredmeny = {ujertek1, ujertek2};
return eredmeny;
//VARNIA KELL A GOMBRA
var waitForButton = new WaitForUIButtons(confirmNewValue, cancelNewValue);
yield return waitForButton.Reset();
if(waitForButton.PressedButton == confirmNewValue){
deactivateInputOk(true);
dice.ujertek[0] = ujertek1; //csak akkor adja at ha leokezta
dice.ujertek[1] = ujertek2;
}else{
deactivateInputOk(false);
}
}
public void deactivateInput1() {
public void deactivateInputOk(bool targyelvesztes) {
kocka1ertek.gameObject.SetActive(false);
kocka2ertek.gameObject.SetActive(false);
confirmNewValue.gameObject.SetActive(false);//deaktivalja a gombot hozza
cancelNewValue.gameObject.SetActive(false);
if(targyelvesztes)
adrenalinloket = 0; //targy elvesztese
}
public void deactivateInput2(){
kocka2ertek.gameObject.SetActive(false);
}
public void HackerCsatlakozo() { //kesz
//+2 tolteny