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

Merge branch 'master' into harc

Browse Source
This commit is contained in:
playmaker1210
2023-04-19 10:34:33 +02:00
committed by GitHub
parent ad11946a20 1b58467509
commit 3d80e4d8a3
5 changed files with 140 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/Scenes/Jatek.unity
View File

@@ -9206,6 +9206,7 @@ GameObject:
- component: {fileID: 401176109}
- component: {fileID: 401176108}
- component: {fileID: 401176107}
- component: {fileID: 401176110}
m_Layer: 5
m_Name: TestGomb
m_TagString: Untagged
@@ -9328,6 +9329,18 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 401176105}
m_CullTransparentMesh: 1
--- !u!225 &401176110
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 401176105}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &410263759
GameObject:
m_ObjectHideFlags: 0

4
Assets/Scripts/AspectRatioHandler.cs
View File

@@ -24,12 +24,12 @@ public class AspectRatioHandler : MonoBehaviour
if(aspectRatio == 1.78 || aspectRatio == 2.33){
if(Application.platform == RuntimePlatform.OSXPlayer)
mainCamera.orthographicSize = 13f; //mac aspect ratio fix???
mainCamera.orthographicSize = 11.5f; //mac aspect ratio fix???
else
mainCamera.orthographicSize = 10.4f; //16:9, 21:9
}else if(aspectRatio == 1.6){
if(Application.platform == RuntimePlatform.OSXPlayer)
mainCamera.orthographicSize = 13f; //mac aspect ratio fix???
mainCamera.orthographicSize = 11.5f; //mac aspect ratio fix???
else
mainCamera.orthographicSize = 11.43f; //16:9, 21:9 //16:10 11.43f
}else if(aspectRatio == 1.33){

40
Assets/Scripts/jatekmanager.cs
View File

@@ -160,7 +160,8 @@ public class jatekmanager : MonoBehaviour
//double click
public void Resume(){
public void Resume()
{
pauseMenuUI.SetActive(false);
Time.timeScale = 1f; //normal ido visszainditasa
GameIsPlaying = true;
@@ -168,7 +169,8 @@ public class jatekmanager : MonoBehaviour
Instance.UpdateGameState(previousGameState); //elozo statere menjen vissza
}
public void Pause(){
public void Pause()
{
pauseMenuUI.SetActive(true);
//ido megallitasa hogy megalljon a jatek
Time.timeScale = 0f;
@@ -178,7 +180,8 @@ public class jatekmanager : MonoBehaviour
Instance.UpdateGameState(jatekmanager.GameState.Pause);
}
public void Quit(){
public void Quit()
{
SceneManager.LoadScene("MainMenu");
}
@@ -244,7 +247,8 @@ public class jatekmanager : MonoBehaviour
Debug.Log((upgrade.getUjradobasIndex() + 1) + " ; ennyi dobásod van összesen");
}
private async void HandleUgynokValasztas(){
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);
@@ -260,14 +264,17 @@ public class jatekmanager : MonoBehaviour
movement.threefour_Collider.gameObject.SetActive(false);
}
public void NevValasztasUtan(){
if(!nev.text.Equals("")){
public void NevValasztasUtan()
{
if (!nev.text.Equals(""))
{
UpdateGameState(GameState.KorKezdet);
//dice.CallRenderDice(true);
}
}
private async void HandleUgynokNev(){
private async void HandleUgynokNev()
{
movement.oneone_Collider.gameObject.SetActive(false);
movement.onetwo_Collider.gameObject.SetActive(false);
movement.onethree_Collider.gameObject.SetActive(false);
@@ -355,7 +362,8 @@ public class jatekmanager : MonoBehaviour
JatekosVesztett();
}
private void Update() {
private void Update()
{
/*if(jatekosvesztett){
SceneManager.LoadScene("JatekosVesztett");
}
@@ -363,11 +371,15 @@ public class jatekmanager : MonoBehaviour
SceneManager.LoadScene("JatekosNyert");
}*/
if(Input.GetKeyDown(KeyCode.Escape)){
if(GameIsPlaying){
if (Input.GetKeyDown(KeyCode.Escape))
{
if (GameIsPlaying)
{
Pause();
Debug.Log("Game is paused");
}else{
}
else
{
Resume();
Debug.Log("Game is playing");
}
@@ -516,7 +528,8 @@ public class jatekmanager : MonoBehaviour
}
}
if(jatekosnyert){
if (jatekosnyert)
{
vegpontozas.pontkiiras();
SceneManager.LoadScene("JatekosNyert");
}
@@ -793,7 +806,8 @@ public class jatekmanager : MonoBehaviour
}
}
if(jatekosvesztett){
if (jatekosvesztett)
{
vegpontozas.pontkiiras();
SceneManager.LoadScene("JatekosVesztett");
}

74
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View File

File diff suppressed because one or more lines are too long

154
UserSettings/Layouts/CurrentMaximizeLayout.dwlt
View File

@@ -19,12 +19,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 30
width: 1366
height: 630
width: 1470
height: 870
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 3551
controlID: 603
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -45,10 +45,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 255
y: 86
width: 754
height: 410
x: 195
y: 66
width: 891
height: 503
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -59,7 +59,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 692, y: 389}
m_TargetSize: {x: 857, y: 482}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -74,10 +74,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -346
m_HBaseRangeMax: 346
m_VBaseRangeMin: -194.5
m_VBaseRangeMax: 194.5
m_HBaseRangeMin: -214.25
m_HBaseRangeMax: 214.25
m_VBaseRangeMin: -120.5
m_VBaseRangeMax: 120.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -95,23 +95,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 754
height: 389
m_Scale: {x: 1, y: 1}
m_Translation: {x: 377, y: 194.5}
width: 891
height: 482
m_Scale: {x: 2, y: 2}
m_Translation: {x: 445.5, y: 241}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -377
y: -194.5
width: 754
height: 389
x: -222.75
y: -120.5
width: 445.5
height: 241
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 754, y: 410}
m_defaultScale: 2
m_LastWindowPixelSize: {x: 1782, y: 1006}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -136,12 +136,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1011
height: 630
width: 1088
height: 870
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 3552
controlID: 604
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -161,12 +161,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1011
height: 431
width: 1088
height: 524
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 3511
controlID: 581
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -184,10 +184,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 255
height: 431
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
width: 195
height: 524
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 6}
m_Panes:
- {fileID: 6}
@@ -214,9 +214,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 86
width: 254
height: 410
y: 66
width: 194
height: 503
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -226,7 +226,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 247}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 88e6ffff2ae7ffff3ae7ffff44e7ffff0ee9ffff1ae9ffff88ecffff2aedffff3aedffff44edffff0eefffff1aefffffe8f2ffff8af3ffff66f5ffff70f5ffff3af7ffff58f7ffff28fbfffff80c01001812010004150100c81501000a170100141a0100
m_ExpandedIDs: acf2ffff2af3ffff0ef5ffff18f5ffffe2f6ffff00f7ffffa6faffff82b90000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -265,10 +265,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 255
x: 195
y: 0
width: 756
height: 431
width: 893
height: 524
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 2}
@@ -297,10 +297,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 255
y: 86
width: 754
height: 410
x: 195
y: 95
width: 891
height: 439
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -557,9 +557,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -5.9219866, y: -0.14756384, z: 0.001324445}
m_Target: {x: 0, y: 0, z: 0}
speed: 2
m_Value: {x: -5.9219866, y: -0.14756384, z: 0.001324445}
m_Value: {x: 0, y: 0, z: 0}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -610,9 +610,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: -0, y: 0, z: -0, w: -1}
m_Size:
m_Target: 10.86666
m_Target: 10
speed: 2
m_Value: 10.86666
m_Value: 10
m_Ortho:
m_Target: 1
speed: 2
@@ -653,11 +653,11 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 431
width: 1011
height: 199
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
y: 524
width: 1088
height: 346
m_MinSize: {x: 230, y: 250}
m_MaxSize: {x: 10000, y: 10000}
m_ActualView: {fileID: 10}
m_Panes:
- {fileID: 10}
@@ -686,9 +686,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 517
width: 1010
height: 178
y: 590
width: 1087
height: 325
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -718,10 +718,10 @@ MonoBehaviour:
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 72890000
m_LastClickedID: 35186
m_ExpandedIDs: 00000000847b000000ca9a3b
scrollPos: {x: 0, y: 37.999878}
m_SelectedIDs: ec690000
m_LastClickedID: 27116
m_ExpandedIDs: 00000000e669000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -749,7 +749,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000847b000000ca9a3b
m_ExpandedIDs: 00000000e669000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -774,8 +774,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: 141a0100
m_LastClickedInstanceID: 72212
m_SelectedInstanceIDs: 22b50000
m_LastClickedInstanceID: 46370
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000687a00003a79000058790000
m_RenameOverlay:
@@ -826,9 +826,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 517
width: 1010
height: 178
y: 555
width: 1087
height: 283
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -849,7 +849,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Audio Mixer
m_Image: {fileID: 2344599766593239149, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -3283902137440876849, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
@@ -1024,12 +1024,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1011
x: 1088
y: 0
width: 355
height: 630
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
width: 382
height: 870
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
@@ -1055,10 +1055,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1011
y: 86
width: 354
height: 609
x: 1088
y: 66
width: 381
height: 849
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -1069,8 +1069,8 @@ MonoBehaviour:
m_CachedPref: -160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: 72212
m_LastVerticalScrollValue: 0
m_LastInspectedObjectInstanceID: 46370
m_LastVerticalScrollValue: 3550.4995
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker: