Added menu scene and sound manage individual volume controls

Assets/Assets/Sounds/ftsdemo1loop.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: d779f8144b4238647982224ddbc418fc
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Jatek.unity

@@ -13228,7 +13228,7 @@ MonoBehaviour:
   audioMixer: {fileID: 24100000, guid: 833dc20f7f9e5b244a756827a43d874d, type: 2}
   sounds:
   - name: BackgroundMusic
-    clip: {fileID: 8300000, guid: 0b3a32694c5ed5f4fad733a3945a4249, type: 3}
+    clip: {fileID: 8300000, guid: d779f8144b4238647982224ddbc418fc, type: 3}
     volume: 1
     pitch: 1
     loop: 1

Assets/Scenes/MainMenu.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: fb49c3ca69521a342954e1d45a3ec6bc
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/MainMenu.unity.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4a923e600f3edff4f8e3198b58b21f65
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/MainMenu/LightingData.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 95f354166198c1b48a8b08c5727326ee
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 112000000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/MainMenu/ReflectionProbe-0.exr.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: de98d5191b109e64298a590d0c5c950a
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Akciopont.cs

@@ -5,7 +5,7 @@ using TMPro;
 
 public class Akciopont : MonoBehaviour
 {
-    public TMP_Text text;    
+    [SerializeField] private TMP_Text _text;    
     private int akciopont = 0;
 
     public int getAkciopont(){ return akciopont; }
@@ -15,7 +15,7 @@ public class Akciopont : MonoBehaviour
     }
 
     private void setText(){
-        text.text = "Akciopontok: " + akciopont;
+        _text.text = "Akciopontok: " + akciopont;
     }
 
     public void UpdateAkciopont(int number) {

Assets/Scripts/CameraMovement.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class CameraMovement : MonoBehaviour
 {
+    //not in use currently
     public Camera mainCamera;
     public Vector3 offset;
 

Assets/Scripts/ControllerHandler.cs

@@ -4,7 +4,9 @@ using UnityEngine;
 
 public class ControllerHandler : MonoBehaviour
 {
-    [SerializeField]private bool connected = false;
+    //if controller movement is detected hide the cursor and and spawn a ui object to act as a cursor for controller
+
+    [SerializeField] private bool connected = false;
     public string[] controllers;
 
     private IEnumerator detectControllers(){

Assets/Scripts/Targyak.cs

@@ -15,8 +15,11 @@ public class Targyak : MonoBehaviour
     private Ugynok ugynok;
     private Dice dice;
     private jatekmanager jatekmanager;
+    private MessageBox messageBox;
+
     public TMP_InputField kocka1ertek;
     public TMP_InputField kocka2ertek;
+
     public int ujertek1;
     public int ujertek2;
     public int targy_szamlalo = 0;
@@ -36,14 +39,16 @@ public class Targyak : MonoBehaviour
     public Button cancelNewValue;
 
     //targy megszerezve ui
-    public TMP_Text adrenalinMegszerezve;
-    public TMP_Text hackerMegszerezve;
-    public TMP_Text lathatatlanMegszerezve;
-    public TMP_Text droidMegszerezve;
-    public TMP_Text matavMegszerezve;
-    public TMP_Text alomhozoMegszerezve;
+    //TODO: change to searialize field
+    [SerializeField] private TMP_Text adrenalinMegszerezve;
+    [SerializeField] private TMP_Text hackerMegszerezve;
+    [SerializeField] private TMP_Text lathatatlanMegszerezve;
+    [SerializeField] private TMP_Text droidMegszerezve;
+    [SerializeField] private TMP_Text matavMegszerezve;
+    [SerializeField] private TMP_Text alomhozoMegszerezve;
 
     //targy felhasznalva ui
+    //TODO: change to searialize field
     public TMP_Text adrenalinFelhasznalva;
     public TMP_Text hackerFelhasznalva;
     public TMP_Text lathatatlanFelhasznalva;
@@ -51,7 +56,7 @@ public class Targyak : MonoBehaviour
     public TMP_Text matavFelhasznalva;
     public TMP_Text alomhozoFelhasznalva;
 
-    public List<string> elerheto_targyak = new List<string>{"Adrenalinloket", "Hacker csatlakozo", "Lathatatlan oltozet", "Droid agyu", "Matav taviranyito", "Alomhozo fustgranat"};
+    [SerializeField] private List<string> elerheto_targyak = new List<string>{"Adrenalinloket", "Hacker csatlakozo", "Lathatatlan oltozet", "Droid agyu", "Matav taviranyito", "Alomhozo fustgranat"};
 
     private void Awake() {
         akciok = FindObjectOfType<Akciok>(); 
@@ -62,6 +67,7 @@ public class Targyak : MonoBehaviour
         ugynok = FindObjectOfType<Ugynok>();
         dice = FindObjectOfType<Dice>();
         jatekmanager = FindObjectOfType<jatekmanager>();
+        messageBox = FindObjectOfType<MessageBox>();
     }
 
     private void Start() {
@@ -85,31 +91,37 @@ public class Targyak : MonoBehaviour
             adrenalinloket++;
             adrenalinFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy AdrenalinLoketet!");
+            messageBox.SendMessageToBox("Kaptal egy AdrenalinLoketet!");
         }else if(elerheto_targyak[randomszam].Equals("Hacker csatlakozo")){
             hackerMegszerezve.text = "X";
             hackercsatlakozo++;
             hackerFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy Hacker Csatlakozot!");
+            messageBox.SendMessageToBox("Kaptal egy Hacker Csatlakozot!");
         }else if(elerheto_targyak[randomszam].Equals("Lathatatlan oltozet")){
             lathatatlanMegszerezve.text = "X";
             lathatatlanoltozet++;
             lathatatlanFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy Lathatatlan oltozetet!");
+            messageBox.SendMessageToBox("Kaptal egy Lathatatlan oltozetet!");
         }else if(elerheto_targyak[randomszam].Equals("Droid agyu")){
             droidMegszerezve.text = "X";
             droidgepagyu++;
             droidFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy Droid-X2 Gepagyut!");
+            messageBox.SendMessageToBox("Kaptal egy Droid-X2 Gepagyut!");
         }else if(elerheto_targyak[randomszam].Equals("Matav taviranyito")){
             matavMegszerezve.text = "X";
             matavtaviranyito++;
             matavFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy Matav Taviranyitot!");
+            messageBox.SendMessageToBox("Kaptal egy Matav Taviranyitot!");
         }else if(elerheto_targyak[randomszam].Equals("Alomhozo fustgranat")){
             alomhozoMegszerezve.text = "X";
             fustgranat++;
             alomhozoFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy Alomhozo Fustgranatot!");
+            messageBox.SendMessageToBox("Kaptal egy Alomhozo Fustgranatot!");
         }
 
         elerheto_targyak.RemoveAt(randomszam); //szedje ki a listabol
@@ -193,6 +205,11 @@ public class Targyak : MonoBehaviour
     }
 
     public void HackerCsatlakozo() { //kesz
+        if(hackercsatlakozo <= 0){
+            Debug.Log("Nincs ilyen targyad!!");
+            return;
+        }
+
         //+2 tolteny
         akciok.betarazasDb = 2;
         akciok.Betarazas();
@@ -211,6 +228,11 @@ public class Targyak : MonoBehaviour
     }
 
     public void LathatatlanOltozek() { //kesz
+        if(lathatatlanoltozet <= 0){
+            Debug.Log("Nincs ilyen targyad!!");
+            return;
+        }
+
         lathatatlanOltozetAktivalva = true;
         lathatatlanoltozet = 0; //targy elvesztese 
 
@@ -221,6 +243,10 @@ public class Targyak : MonoBehaviour
     }
 
     public void DroidGepagyu() { 
+        if(droidgepagyu <= 0){
+            Debug.Log("Nincs ilyen targyad!!");
+            return;
+        }
         //deaktivalni minden objectet kiveve a ugynok text boxokat es addig nem vissza aktivalni amig nem kattintott ra valamelyikre      
         
         //deaktivalas
@@ -286,6 +312,11 @@ public class Targyak : MonoBehaviour
     }
 
     public void MatavTaviranyito() {
+        if(matavtaviranyito <= 0){
+            Debug.Log("Nincs ilyen targyad!!");
+            return;
+        }
+
         matavtaviranyitoAktivalva = true;
         matavtaviranyito = 0; //targy elvesztese
 
@@ -296,6 +327,11 @@ public class Targyak : MonoBehaviour
     }
 
     public void FustGranat() {
+        if(fustgranat <= 0){
+            Debug.Log("Nincs ilyen targyad!!");
+            return;
+        }
+
         energia.granatAktivalva = true;
         fustgranat = 0; //targy elvesztese   
 

Assets/Scripts/menu/FrameRateSetter.cs

@@ -4,8 +4,12 @@ using UnityEngine;
 
 public class FrameRateSetter : MonoBehaviour
 {
-    //mobil miatt volt (30fps) van ertelme? nincs sok mozgas es animacio \\ ha lesz animacio vissza rakhato
+
     private void Awake() {
+#if !UNITY_ANDROID || !UNITY_IOS
         Application.targetFrameRate = 60;
+#else
+        Application.targetFrameRate = 30;
+#endif
     }
 }

ProjectSettings/EditorBuildSettings.asset

@@ -11,10 +11,4 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/Jatek.unity
     guid: 2cda990e2423bbf4892e6590ba056729
-  - enabled: 0
-    path: Assets/Scenes/JatekosNyert.unity
-    guid: a108b4cd028a15b2ea25558d17a38712
-  - enabled: 0
-    path: Assets/Scenes/JatekosVesztett.unity
-    guid: d535560266fd1da128ac0ee38d7f347a
   m_configObjects: {}

ProjectSettings/ProjectSettings.asset

@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.9.2
+  bundleVersion: 0.9.2.2
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0