This commit is contained in:
2023-04-05 11:08:29 +02:00
parent edc7564cc9
commit e278fb1b37
11 changed files with 518 additions and 91 deletions

View File

@@ -4053,6 +4053,7 @@ GameObject:
- component: {fileID: 197904237}
- component: {fileID: 197904238}
- component: {fileID: 197904239}
- component: {fileID: 197904240}
m_Layer: 0
m_Name: Mangager
m_TagString: Untagged
@@ -4690,6 +4691,20 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mainCamera: {fileID: 519420031}
--- !u!114 &197904240
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 197904216}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834fb3b3751703f9bfcd35d25b4ccc4, type: 3}
m_Name:
m_EditorClassIdentifier:
connected: 0
controllers: []
--- !u!1 &229807670
GameObject:
m_ObjectHideFlags: 0
@@ -8479,6 +8494,90 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410263759}
m_CullTransparentMesh: 1
--- !u!1 &414012301
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 414012302}
- component: {fileID: 414012303}
m_Layer: 0
m_Name: BlueDot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &414012302
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 414012301}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 996884040}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &414012303
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 414012301}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
m_Color: {r: 0, g: 0.054581404, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &416499490
GameObject:
m_ObjectHideFlags: 0
@@ -23059,6 +23158,91 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 996172357}
m_CullTransparentMesh: 1
--- !u!1 &996884038
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 996884040}
- component: {fileID: 996884039}
m_Layer: 0
m_Name: ControllerPointer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!212 &996884039
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 996884038}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &996884040
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 996884038}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -40.2, y: -2.5, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 414012302}
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &998264440
GameObject:
m_ObjectHideFlags: 0

View File

@@ -271,6 +271,7 @@ GameObject:
- component: {fileID: 958920304}
- component: {fileID: 958920307}
- component: {fileID: 958920308}
- component: {fileID: 958920309}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -392,6 +393,19 @@ MonoBehaviour:
MainMenuObj: {fileID: 0}
OptionsMenu: {fileID: 0}
VideoButton: {fileID: 0}
--- !u!114 &958920309
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 958920303}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38c0315629436f34d8ba48f6d00b8302, type: 3}
m_Name:
m_EditorClassIdentifier:
szoveg: {fileID: 1041644989}
--- !u!1 &1041644987
GameObject:
m_ObjectHideFlags: 0
@@ -450,7 +464,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: New Text
m_text: 'Pontszam: '
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

View File

@@ -136,6 +136,7 @@ GameObject:
- component: {fileID: 392158087}
- component: {fileID: 392158091}
- component: {fileID: 392158090}
- component: {fileID: 392158092}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -221,6 +222,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b9102add15fe89844a6f103c51332836, type: 3}
m_Name:
m_EditorClassIdentifier:
MainMenuObj: {fileID: 0}
OptionsMenu: {fileID: 0}
VideoButton: {fileID: 0}
--- !u!114 &392158091
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -254,6 +258,19 @@ MonoBehaviour:
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
--- !u!114 &392158092
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 392158086}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38c0315629436f34d8ba48f6d00b8302, type: 3}
m_Name:
m_EditorClassIdentifier:
szoveg: {fileID: 1059568913}
--- !u!1 &534187230
GameObject:
m_ObjectHideFlags: 0
@@ -291,7 +308,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: 7, y: -14}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &534187232
@@ -523,6 +540,141 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1019554694}
m_CullTransparentMesh: 1
--- !u!1 &1059568911
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1059568912}
- component: {fileID: 1059568914}
- component: {fileID: 1059568913}
m_Layer: 5
m_Name: pont_text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1059568912
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1059568911}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1833175879}
m_RootOrder: 2
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: 7, y: -101}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1059568913
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1059568911}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Pontszam: '
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1059568914
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1059568911}
m_CullTransparentMesh: 1
--- !u!1 &1782492010
GameObject:
m_ObjectHideFlags: 0
@@ -558,7 +710,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: 7, y: 58.190002}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1782492012
@@ -752,6 +904,7 @@ RectTransform:
m_Children:
- {fileID: 1782492011}
- {fileID: 534187231}
- {fileID: 1059568912}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@@ -0,0 +1,33 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ControllerHandler : MonoBehaviour
{
[SerializeField]private bool connected = false;
public string[] controllers;
private IEnumerator detectControllers(){
while(true){
controllers = Input.GetJoystickNames();
if(!connected && controllers.Length > 0){
Debug.Log("Controller connected");
for(int i = 0; i < controllers.Length; i++){
Debug.Log(controllers[i]);
//yield break;
}
}else if(connected && controllers.Length == 0){
Debug.Log("disconnected / not connected");
}else if(!connected && controllers.Length == 0){
Debug.Log("not connected");
}
yield return new WaitForSeconds(5f); //check every 5 seconds
}
}
private void Awake() {
StartCoroutine(detectControllers());
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5834fb3b3751703f9bfcd35d25b4ccc4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -24,6 +24,7 @@ public class Elet : MonoBehaviour
private void Update() {
if(elet == 0){
jatekmanager.Instance.jatekosvesztett = true;
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Vesztette);
}
}

View File

@@ -20,7 +20,11 @@ public class Energia : MonoBehaviour
return; //targy cucc aktivalva egesz korbe nem csokken az energia
}
if (energiasav_index > 29) jatekmanager.Instance.jatekosvesztett = true; //ha nincs tobb energia vesztes
if (energiasav_index > 29) {
jatekmanager.Instance.jatekosvesztett = true;
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Vesztette);
//ha nincs tobb energia vesztes
}
for (int i = 0; i < number; i++) {
//if (number + enegiasav_index > energiasav_text.Length) break;

View File

@@ -35,6 +35,7 @@ public class jatekmanager : MonoBehaviour
private movement movement;
private TurnManager turnManager;
private Source source;
private vegpontozas vegpontozas;
//ügynökcsapatok implementálása
public TMP_Text[] oneone;
@@ -197,17 +198,18 @@ public class jatekmanager : MonoBehaviour
private async void HandleVesztette()
{
//vegpontozas.pontkiiras();
JatekosNyert();
JatekosVesztett();
}
private void Update() {
if(jatekosvesztett){
/*if(jatekosvesztett){
SceneManager.LoadScene("JatekosVesztett");
}
if(jatekosnyert){
SceneManager.LoadScene("JatekosNyert");
}
}*/
}
private async void ugynokDeaktivalas(bool bekapcsolas)
@@ -442,6 +444,7 @@ public class jatekmanager : MonoBehaviour
}
if(jatekosnyert){
vegpontozas.pontkiiras();
SceneManager.LoadScene("JatekosNyert");
}
else
@@ -718,6 +721,7 @@ public class jatekmanager : MonoBehaviour
}
if(jatekosvesztett){
vegpontozas.pontkiiras();
SceneManager.LoadScene("JatekosVesztett");
}
else

View File

@@ -3,7 +3,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TMPro;
using System.IO;
using System.Text;
using UnityEngine.SceneManagement;
public class vegpontozas : MonoBehaviour
{
@@ -14,9 +16,9 @@ public class vegpontozas : MonoBehaviour
private Elet elet;
public GameObject szoveg;
public TMP_Text szoveg;
int osszpont = 0;
public int osszpont = 0;
int tolteny;
int megszerzetttargyak;
int fejlesztespont;
@@ -30,6 +32,10 @@ public class vegpontozas : MonoBehaviour
targyak = FindObjectOfType<Targyak>();
akciok = FindObjectOfType<Akciok>();
elet = FindObjectOfType<Elet>();
if(SceneManager.GetActiveScene().name.Equals("JatekosNyert") || SceneManager.GetActiveScene().name.Equals("JatekosVesztett")){
szoveg.text = "Pontszam: " + pontbeolvas();
}
}
public int OsszpontSzamalas()
@@ -44,4 +50,21 @@ public class vegpontozas : MonoBehaviour
//textMesh.text = "Összesen ennyi pontot szereztél:" + osszpont;
return osszpont;
}
public void pontkiiras(){
StreamWriter writer = new StreamWriter(Application.persistentDataPath + "/pontszam.txt", false, Encoding.Default);
writer.Write(osszpont);
writer.Close();
Debug.Log("fajl kiirva");
}
public string pontbeolvas(){
StreamReader reader = new StreamReader(Application.persistentDataPath + "/pontszam.txt");
string pontszam = reader.ReadLine();
reader.Close();
return pontszam;
}
}