From c0b4f8e07fd7305af84deff419a41b3d382b9359 Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Sun, 9 Apr 2023 17:21:06 +0200 Subject: [PATCH] ugynok kocka valasztas, nev valasztas kotelezo, kezdohely csapat megjelenes, bugfix --- Assets/Scenes/Jatek.unity | 22 +- Assets/Scenes/JatekosNyert.unity | 11 +- Assets/Scenes/JatekosVesztett.unity | 859 +++++++++++++------------ Assets/Scripts/Dice.cs | 92 ++- Assets/Scripts/Elet.cs | 4 +- Assets/Scripts/Source.cs | 1 + Assets/Scripts/Ugynok.cs | 105 ++- Assets/Scripts/jatekmanager.cs | 171 +++-- Assets/Scripts/movement.cs | 66 +- Packages/manifest.json | 1 + Packages/packages-lock.json | 10 + ProjectSettings/ProjectSettings.asset | 2 +- UserSettings/EditorUserSettings.asset | 4 +- UserSettings/Layouts/default-2021.dwlt | 130 ++-- 14 files changed, 811 insertions(+), 667 deletions(-) diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 0c7376d..db95e87 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -4427,6 +4427,7 @@ MonoBehaviour: - {fileID: 889062367} - {fileID: 1970422692} elet: 2 + elet_vesztve: 0 --- !u!114 &197904232 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4440,6 +4441,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: szoveg: {fileID: 0} + osszpont: 0 --- !u!114 &197904234 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4519,7 +4521,6 @@ MonoBehaviour: droidagyuAktivalva: 0 canKill: 0 canShoot: 0 - maincamera: {fileID: 519420031} --- !u!114 &197904236 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4642,6 +4643,7 @@ MonoBehaviour: vanertelme: 1 State: 0 helyszinaktivalasBtn: {fileID: 824033280} + nev: {fileID: 1509580805} --- !u!114 &197904238 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8311,7 +8313,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 197904230} m_TargetAssemblyTypeName: Elet, Assembly-CSharp - m_MethodName: Eletvesztes + m_MethodName: Eletplusz m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -15707,7 +15709,19 @@ MonoBehaviour: m_CharacterLimit: 0 m_OnEndEdit: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 197904237} + m_TargetAssemblyTypeName: jatekmanager, Assembly-CSharp + m_MethodName: NevValasztasUtan + 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_OnSubmit: m_PersistentCalls: m_Calls: [] @@ -31913,7 +31927,7 @@ MonoBehaviour: - m_Target: {fileID: 197904220} m_TargetAssemblyTypeName: Dice, Assembly-CSharp m_MethodName: CallRenderDice - m_Mode: 1 + m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine diff --git a/Assets/Scenes/JatekosNyert.unity b/Assets/Scenes/JatekosNyert.unity index d822a03..ba029f8 100644 --- a/Assets/Scenes/JatekosNyert.unity +++ b/Assets/Scenes/JatekosNyert.unity @@ -406,6 +406,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: szoveg: {fileID: 1041644989} + osszpont: 0 --- !u!1 &1041644987 GameObject: m_ObjectHideFlags: 0 @@ -441,8 +442,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: 25.02, y: -145.89} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: -0, y: -66.600006} + m_SizeDelta: {x: 342.6646, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1041644989 MonoBehaviour: @@ -578,7 +579,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: 0, y: 6.2100067} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1127070446 @@ -791,7 +792,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} @@ -881,7 +882,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: 0, y: 78.4} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1956911020 diff --git a/Assets/Scenes/JatekosVesztett.unity b/Assets/Scenes/JatekosVesztett.unity index f911fa2..3d1d128 100644 --- a/Assets/Scenes/JatekosVesztett.unity +++ b/Assets/Scenes/JatekosVesztett.unity @@ -123,7 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &392158086 +--- !u!1 &810189436 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,147 +131,67 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 392158089} - - component: {fileID: 392158088} - - component: {fileID: 392158087} - - component: {fileID: 392158091} - - component: {fileID: 392158090} - - component: {fileID: 392158092} + - component: {fileID: 810189439} + - component: {fileID: 810189438} + - component: {fileID: 810189437} m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + m_Name: EventSystem + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &392158087 -AudioListener: +--- !u!114 &810189437 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 392158086} + m_GameObject: {fileID: 810189436} m_Enabled: 1 ---- !u!20 &392158088 -Camera: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &810189438 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 392158086} + m_GameObject: {fileID: 810189436} m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0.5764706, g: 0.5764706, b: 0.5764706, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &392158089 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &810189439 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 392158086} + m_GameObject: {fileID: 810189436} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &392158090 -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: b9102add15fe89844a6f103c51332836, type: 3} - m_Name: - m_EditorClassIdentifier: - MainMenuObj: {fileID: 0} - OptionsMenu: {fileID: 0} - VideoButton: {fileID: 0} ---- !u!114 &392158091 -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: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - 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 +--- !u!1 &828138248 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -279,10 +199,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 534187231} - - component: {fileID: 534187234} - - component: {fileID: 534187233} - - component: {fileID: 534187232} + - component: {fileID: 828138249} + - component: {fileID: 828138252} + - component: {fileID: 828138251} + - component: {fileID: 828138250} m_Layer: 5 m_Name: Menu m_TagString: Untagged @@ -290,34 +210,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &534187231 +--- !u!224 &828138249 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 534187230} + m_GameObject: {fileID: 828138248} 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: - - {fileID: 1019554695} - m_Father: {fileID: 1833175879} + - {fileID: 1432441531} + m_Father: {fileID: 1055402643} m_RootOrder: 1 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: -14} + m_AnchoredPosition: {x: -2.9, y: 9.2} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &534187232 +--- !u!114 &828138250 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 534187230} + m_GameObject: {fileID: 828138248} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -351,11 +271,11 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 534187233} + m_TargetGraphic: {fileID: 828138251} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 392158090} + - m_Target: {fileID: 1442263263} m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp m_MethodName: GoToMenu m_Mode: 1 @@ -367,13 +287,13 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &534187233 +--- !u!114 &828138251 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 534187230} + m_GameObject: {fileID: 828138248} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -397,15 +317,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &534187234 +--- !u!222 &828138252 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 534187230} + m_GameObject: {fileID: 828138248} m_CullTransparentMesh: 1 ---- !u!1 &1019554694 +--- !u!1 &1055402639 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -413,9 +333,247 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1019554695} - - component: {fileID: 1019554697} - - component: {fileID: 1019554696} + - component: {fileID: 1055402643} + - component: {fileID: 1055402642} + - component: {fileID: 1055402641} + - component: {fileID: 1055402640} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1055402640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055402639} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1055402641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055402639} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1055402642 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055402639} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1055402643 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055402639} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1310690303} + - {fileID: 828138249} + - {fileID: 1845412275} + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1310690302 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1310690303} + - component: {fileID: 1310690305} + - component: {fileID: 1310690304} + m_Layer: 5 + m_Name: nyert_text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1310690303 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1310690302} + 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: 1055402643} + m_RootOrder: 0 + 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: -2.8999944, y: 81.39} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1310690304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1310690302} + 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: "Veszett\xE9l" + 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: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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 &1310690305 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1310690302} + m_CullTransparentMesh: 1 +--- !u!1 &1432441530 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1432441531} + - component: {fileID: 1432441533} + - component: {fileID: 1432441532} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -423,19 +581,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1019554695 +--- !u!224 &1432441531 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1019554694} + m_GameObject: {fileID: 1432441530} 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: 534187231} + m_Father: {fileID: 828138249} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -443,13 +601,13 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1019554696 +--- !u!114 &1432441532 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1019554694} + m_GameObject: {fileID: 1432441530} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -532,15 +690,15 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1019554697 +--- !u!222 &1432441533 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1019554694} + m_GameObject: {fileID: 1432441530} m_CullTransparentMesh: 1 ---- !u!1 &1059568911 +--- !u!1 &1442263262 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -548,9 +706,158 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1059568912} - - component: {fileID: 1059568914} - - component: {fileID: 1059568913} + - component: {fileID: 1442263268} + - component: {fileID: 1442263267} + - component: {fileID: 1442263266} + - component: {fileID: 1442263265} + - component: {fileID: 1442263263} + - component: {fileID: 1442263264} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1442263263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1442263262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b9102add15fe89844a6f103c51332836, type: 3} + m_Name: + m_EditorClassIdentifier: + MainMenuObj: {fileID: 0} + OptionsMenu: {fileID: 0} + VideoButton: {fileID: 0} +--- !u!114 &1442263264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1442263262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38c0315629436f34d8ba48f6d00b8302, type: 3} + m_Name: + m_EditorClassIdentifier: + szoveg: {fileID: 1845412276} + osszpont: 0 +--- !u!114 &1442263265 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1442263262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &1442263266 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1442263262} + m_Enabled: 1 +--- !u!20 &1442263267 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1442263262} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.5764706, g: 0.5764706, b: 0.5764706, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1442263268 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1442263262} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1845412274 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1845412275} + - component: {fileID: 1845412277} + - component: {fileID: 1845412276} m_Layer: 5 m_Name: pont_text m_TagString: Untagged @@ -558,33 +865,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1059568912 +--- !u!224 &1845412275 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1059568911} + m_GameObject: {fileID: 1845412274} 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_Father: {fileID: 1055402643} 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_AnchoredPosition: {x: -2.9000096, y: -65.61} + m_SizeDelta: {x: 306.5059, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1059568913 +--- !u!114 &1845412276 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1059568911} + m_GameObject: {fileID: 1845412274} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -667,249 +974,11 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1059568914 +--- !u!222 &1845412277 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1059568911} + m_GameObject: {fileID: 1845412274} m_CullTransparentMesh: 1 ---- !u!1 &1782492010 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1782492011} - - component: {fileID: 1782492013} - - component: {fileID: 1782492012} - m_Layer: 5 - m_Name: vesztett_text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1782492011 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1782492010} - 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: 0 - 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: 58.190002} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1782492012 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1782492010} - 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: Vesztettel - 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: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - 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 &1782492013 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1782492010} - m_CullTransparentMesh: 1 ---- !u!1 &1833175875 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1833175879} - - component: {fileID: 1833175878} - - component: {fileID: 1833175877} - - component: {fileID: 1833175876} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1833175876 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833175875} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1833175877 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833175875} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1833175878 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833175875} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1833175879 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833175875} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1782492011} - - {fileID: 534187231} - - {fileID: 1059568912} - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} diff --git a/Assets/Scripts/Dice.cs b/Assets/Scripts/Dice.cs index 9abaf99..a605f66 100644 --- a/Assets/Scripts/Dice.cs +++ b/Assets/Scripts/Dice.cs @@ -13,6 +13,8 @@ public class Dice : MonoBehaviour { private Akciopont ap; private Energia energiasav; private Targyak targyak; + private Ugynok ugynok; + private movement movement; public int[] diceResult = { 0, 0 }; public List ujertek = new List(); public int valasztottErtek; //a jatekos altal valasztott dobott ertek helye @@ -34,11 +36,15 @@ public class Dice : MonoBehaviour { public bool dobottEgyszer = false; //tudjon ujra dobni vagy nem public int ujradobasszamlalo; + private bool ugynokDobasErtek = false; //ertek valasztashoz hogy tudja az ugynok csapat miatt lett meghivva + private bool elsoDobas = true; private void Awake() { upgrade = FindObjectOfType(); ap = FindObjectOfType(); energiasav = FindObjectOfType(); targyak = FindObjectOfType(); + ugynok = FindObjectOfType(); + movement = FindObjectOfType(); } public void ertekValasztas(GameObject gomb) { @@ -46,28 +52,67 @@ public class Dice : MonoBehaviour { if (gomb.name == "dice1btn") { valasztottErtek = diceResult[0]; if (diceResult[0] < diceResult[1]) { - upgrade.canUpgrade = true; //kisebb szam valasztasa eseten fejlesztes egyszer - jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes); + if(!ugynokDobasErtek){ + upgrade.canUpgrade = true; //kisebb szam valasztasa eseten fejlesztes egyszer + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes); + }else{ + //ugynok csapat szama + ugynok.UgynokSorsolas(movement.jelenlegi_x, movement.jelenlegi_y, valasztottErtek); + + //-1 energia + energiasav.csokkenEnergia(1); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); + } } else { - energiasav.csokkenEnergia(1); //nagyobb szam valasztasa eseten -1 energia - jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); + if(!ugynokDobasErtek){ + energiasav.csokkenEnergia(1); //nagyobb szam valasztasa eseten -1 energia + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); + }else{ + //ugynok csapat szama + ugynok.UgynokSorsolas(movement.jelenlegi_x, movement.jelenlegi_y, valasztottErtek); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); + } } locked = true; } else if (gomb.name == "dice2btn") { valasztottErtek = diceResult[1]; if (diceResult[1] < diceResult[0]) { - upgrade.canUpgrade = true; - jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes); + if(!ugynokDobasErtek){ + upgrade.canUpgrade = true; //kisebb szam valasztasa eseten fejlesztes egyszer + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes); + }else{ + //ugynok csapat szama + ugynok.UgynokSorsolas(movement.jelenlegi_x, movement.jelenlegi_y, valasztottErtek); + + //-1 energia + energiasav.csokkenEnergia(1); + + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); + } } else { - energiasav.csokkenEnergia(1); - jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); + if(!ugynokDobasErtek){ + energiasav.csokkenEnergia(1); //nagyobb szam valasztasa eseten -1 energia + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); + }else{ + //ugynok csapat szama + ugynok.UgynokSorsolas(movement.jelenlegi_x, movement.jelenlegi_y, valasztottErtek); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); + } } locked = true; } - ap.UpdateAkciopont(getValasztottErtek() + upgrade.akcio[upgrade.getAkcioIndex()]); + if(!ugynokDobasErtek) + ap.UpdateAkciopont(getValasztottErtek() + upgrade.akcio[upgrade.getAkcioIndex()]); + + if(elsoDobas){ + //jatek kezdeskor elso dobas ugynok csapat meghatarozas kezdo helyszinen + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); + CallRenderDice(true); + elsoDobas = false; + } } Debug.Log("valasztott ertek: " + valasztottErtek + " locked status: " + locked); @@ -82,11 +127,12 @@ public class Dice : MonoBehaviour { return finalSide; } - public void CallRenderDice() => StartCoroutine(renderDice()); + public void CallRenderDice(bool ugynokDobas) => StartCoroutine(renderDice(ugynokDobas)); - public IEnumerator renderDice() { + public IEnumerator renderDice(bool ugynokDobas) { //ha zarolva van akkor ne tudjon ujra dobni / csak egyszer dobhasson (amig nincs feloldva a kovetkezo dobashoz) - if(dobottEgyszer) yield break; + //ha ugynok miatt kell dobni mikor mar nincs ujradobas tudjon dobni + if(dobottEgyszer && !ugynokDobas) yield break; //dice gombok kikapcsolasa hogy amig nem vegez ne tudjon erteket valasztani dice1btnBtn.enabled = false; @@ -97,7 +143,6 @@ public class Dice : MonoBehaviour { diceResult[1] = RollDice(); } while (diceResult[0] == diceResult[1]); - //lassa a jatekos mit dobott hely1.sprite = diceSides[diceResult[0]-1]; hely1.size = new Vector2(38, 38); @@ -105,11 +150,11 @@ public class Dice : MonoBehaviour { hely2.sprite = diceSides[diceResult[1]-1]; hely2.size = new Vector2(38, 38); - ujradobasszamlalo--; - Debug.Log("ujradobasszamlalo: " + ujradobasszamlalo); - if(ujradobasszamlalo == 0){ - dobottEgyszer = true; - } + if(ugynokDobas){ + ugynokDobasErtek = true; + setLocked(false); + } + //ha megvan a targy if(targyak.adrenalinloket > 0) { @@ -181,6 +226,9 @@ public class Dice : MonoBehaviour { diceResult[0] = targyak.ujertek1; diceResult[1] = targyak.ujertek2; dobottEgyszer = true; + + if(!ugynokDobas) //ha ugynok miatt van dobas ne vonjon le + ujradobasszamlalo++; //elhasznal egyet fent } } //deaktivalas @@ -197,6 +245,14 @@ public class Dice : MonoBehaviour { //ha vegzett mindennel kapcsolja vissza az ertekvalasztast dice1btnBtn.enabled = true; dice2btnBtn.enabled = true; + + if(!ugynokDobas){ //ha ugynok miatt van dobas ne vonjon le + ujradobasszamlalo--; + Debug.Log("ujradobasszamlalo: " + ujradobasszamlalo); + if(ujradobasszamlalo == 0){ + dobottEgyszer = true; + } + } } public void HelyszinKiBekapcs(bool kikapcsolas){ diff --git a/Assets/Scripts/Elet.cs b/Assets/Scripts/Elet.cs index ab71de1..f226751 100644 --- a/Assets/Scripts/Elet.cs +++ b/Assets/Scripts/Elet.cs @@ -7,7 +7,7 @@ public class Elet : MonoBehaviour { public TMP_Text[] elet_text; public int elet = 2; - private int elet_vesztve = 0; + [SerializeField] private int elet_vesztve = 0; private int elet_megszerezve = 2; private jatekmanager jatekmanager; @@ -49,7 +49,7 @@ public class Elet : MonoBehaviour //jatekmanager.jatekosvesztett = true; return; } - if (elet_megszerezve > elet +1) return; + //if (elet_megszerezve > elet +1) return; //if(elet < 0) return; elet_vesztve++; diff --git a/Assets/Scripts/Source.cs b/Assets/Scripts/Source.cs index 7ffd87f..3d8294a 100644 --- a/Assets/Scripts/Source.cs +++ b/Assets/Scripts/Source.cs @@ -19,6 +19,7 @@ public class Source : MonoBehaviour private void Awake() { movement = FindObjectOfType(); ugynok = FindObjectOfType(); + jatekmanager = FindObjectOfType(); } private void Start() { diff --git a/Assets/Scripts/Ugynok.cs b/Assets/Scripts/Ugynok.cs index 0a9e02f..6cd4555 100644 --- a/Assets/Scripts/Ugynok.cs +++ b/Assets/Scripts/Ugynok.cs @@ -13,40 +13,25 @@ public class Ugynok : MonoBehaviour private movement movement; public TMP_Text[] oneone; - //public BoxCollider2D[] oneoneCollider; public TMP_Text[] twoone; - //public BoxCollider2D[] twooneCollider; public TMP_Text[] threeone; - //public BoxCollider2D[] threeoneCollider; public TMP_Text[] onetwo; - //public BoxCollider2D[] onetwoCollider; public TMP_Text[] twotwo; - //public BoxCollider2D[] twotwoCollider; public TMP_Text[] threetwo; - //public BoxCollider2D[] threetwoCollider; public TMP_Text[] onethree; - //public BoxCollider2D[] onethreeCollider; public TMP_Text[] twothree; - //public BoxCollider2D[] twothreeCollider; public TMP_Text[] threethree; - //public BoxCollider2D[] threethreeCollider; public TMP_Text[] onefour; - //public BoxCollider2D[] onefourCollider; public TMP_Text[] twofour; - //public BoxCollider2D[] twofourCollider; public TMP_Text[] threefour; - //public BoxCollider2D[] threefourCollider; public bool droidagyuAktivalva = false; - public bool canKill = false; public bool canShoot = false; //harchoz bool - public void setCanKillTrue(){ canKill = true; } - public Camera maincamera; - private string[] previus_ugynok_csapatok; private int elozo_x; private int elozo_y ; + public void setCanKillTrue(){ canKill = true; } private void Awake() { akciok = FindObjectOfType(); @@ -56,10 +41,8 @@ public class Ugynok : MonoBehaviour elet = FindObjectOfType(); previus_ugynok_csapatok = new string[3]; - } - private void Start() - { + //ugynok csapat mezo szoveg kiurites for (int i = 0; i < oneone.Length; i++) { oneone[i].text = ""; @@ -110,188 +93,194 @@ public class Ugynok : MonoBehaviour { threefour[i].text = ""; } - } - public void UgynokSorsolas(int x, int y){ + public void UgynokSorsolas(int x, int y, int ugynokSzam = 0){ + int random; + if(ugynokSzam == 0){ + random = UnityEngine.Random.Range(1,7); + }else{ + random = ugynokSzam; + } + if (x == 1 && y == 1) { if (oneone[0].text.Equals("")) { - oneone[0].text = UnityEngine.Random.Range(1, 7).ToString(); + oneone[0].text = random.ToString(); } else if (oneone[1].text.Equals("")) { - oneone[1].text = UnityEngine.Random.Range(1, 7).ToString(); + oneone[1].text = random.ToString(); } else if (oneone[2].text.Equals("")) { - oneone[2].text = UnityEngine.Random.Range(1, 7).ToString(); + oneone[2].text = random.ToString(); } } else if (x == 1 && y == 2) { if (onetwo[0].text.Equals("")) { - onetwo[0].text = UnityEngine.Random.Range(1, 7).ToString(); + onetwo[0].text = random.ToString(); } else if (onetwo[1].text.Equals("")) { - onetwo[1].text = UnityEngine.Random.Range(1, 7).ToString(); + onetwo[1].text = random.ToString(); } else if (onetwo[2].text.Equals("")) { - onetwo[2].text = UnityEngine.Random.Range(1, 7).ToString(); + onetwo[2].text = random.ToString(); } } else if (x == 1 && y == 3) { if (onethree[0].text.Equals("")) { - onethree[0].text = UnityEngine.Random.Range(1, 7).ToString(); + onethree[0].text = random.ToString(); } else if (onethree[1].text.Equals("")) { - onethree[1].text = UnityEngine.Random.Range(1, 7).ToString(); + onethree[1].text = random.ToString(); } else if (onethree[2].text.Equals("")) { - onethree[2].text = UnityEngine.Random.Range(1, 7).ToString(); + onethree[2].text = random.ToString(); } } else if (x == 1 && y == 4) { if (onefour[0].text.Equals("")) { - onefour[0].text = UnityEngine.Random.Range(1, 7).ToString(); + onefour[0].text = random.ToString(); } else if (onefour[1].text.Equals("")) { - onefour[1].text = UnityEngine.Random.Range(1, 7).ToString(); + onefour[1].text = random.ToString(); } else if (onefour[2].text.Equals("")) { - onefour[2].text = UnityEngine.Random.Range(1, 7).ToString(); + onefour[2].text = random.ToString(); } } else if (x == 2 && y == 1) { if (twoone[0].text.Equals("")) { - twoone[0].text = UnityEngine.Random.Range(1, 7).ToString(); + twoone[0].text = random.ToString(); } else if (twoone[1].text.Equals("")) { - twoone[1].text = UnityEngine.Random.Range(1, 7).ToString(); + twoone[1].text = random.ToString(); } else if (twoone[2].text.Equals("")) { - twoone[2].text = UnityEngine.Random.Range(1, 7).ToString(); + twoone[2].text = random.ToString(); } } else if (x == 2 && y == 2) { if (twotwo[0].text.Equals("")) { - twotwo[0].text = UnityEngine.Random.Range(1, 7).ToString(); + twotwo[0].text = random.ToString(); } else if (twotwo[1].text.Equals("")) { - twotwo[1].text = UnityEngine.Random.Range(1, 7).ToString(); + twotwo[1].text = random.ToString(); } else if (twotwo[2].text.Equals("")) { - twotwo[2].text = UnityEngine.Random.Range(1, 7).ToString(); + twotwo[2].text = random.ToString(); } } else if (x == 2 && y == 3) { if (twothree[0].text.Equals("")) { - twothree[0].text = UnityEngine.Random.Range(1, 7).ToString(); + twothree[0].text = random.ToString(); } else if (twothree[1].text.Equals("")) { - twothree[1].text = UnityEngine.Random.Range(1, 7).ToString(); + twothree[1].text = random.ToString(); } else if (twothree[2].text.Equals("")) { - twothree[2].text = UnityEngine.Random.Range(1, 7).ToString(); + twothree[2].text = random.ToString(); } } else if (x == 2 && y == 4) { if (twofour[0].text.Equals("")) { - twofour[0].text = UnityEngine.Random.Range(1, 7).ToString(); + twofour[0].text = random.ToString(); } else if (twofour[1].text.Equals("")) { - twofour[1].text = UnityEngine.Random.Range(1, 7).ToString(); + twofour[1].text = random.ToString(); } else if (twofour[2].text.Equals("")) { - twofour[2].text = UnityEngine.Random.Range(1, 7).ToString(); + twofour[2].text = random.ToString(); } } else if (x == 3 && y == 1) { if (threeone[0].text.Equals("")) { - threeone[0].text = UnityEngine.Random.Range(1, 7).ToString(); + threeone[0].text = random.ToString(); } else if (threeone[1].text.Equals("")) { - threeone[1].text = UnityEngine.Random.Range(1, 7).ToString(); + threeone[1].text = random.ToString(); } else if (threeone[2].text.Equals("")) { - threeone[2].text = UnityEngine.Random.Range(1, 7).ToString(); + threeone[2].text = random.ToString(); } } else if (x == 3 && y == 2) { if (threetwo[0].text.Equals("")) { - threetwo[0].text = UnityEngine.Random.Range(1, 7).ToString(); + threetwo[0].text = random.ToString(); } else if (threetwo[1].text.Equals("")) { - threetwo[1].text = UnityEngine.Random.Range(1, 7).ToString(); + threetwo[1].text = random.ToString(); } else if (threetwo[2].text.Equals("")) { - threetwo[2].text = UnityEngine.Random.Range(1, 7).ToString(); + threetwo[2].text = random.ToString(); } } else if (x == 3 && y == 3) { if (threethree[0].text.Equals("")) { - threethree[0].text = UnityEngine.Random.Range(1, 7).ToString(); + threethree[0].text = random.ToString(); } else if (threethree[1].text.Equals("")) { - threethree[1].text = UnityEngine.Random.Range(1, 7).ToString(); + threethree[1].text = random.ToString(); } else if (threethree[2].text.Equals("")) { - threethree[2].text = UnityEngine.Random.Range(1, 7).ToString(); + threethree[2].text = random.ToString(); } } else if (x == 3 && y == 4) { if (threefour[0].text.Equals("")) { - threefour[0].text = UnityEngine.Random.Range(1, 7).ToString(); + threefour[0].text = random.ToString(); } else if (threefour[1].text.Equals("")) { - threefour[1].text = UnityEngine.Random.Range(1, 7).ToString(); + threefour[1].text = random.ToString(); } else if (threefour[2].text.Equals("")) { - threefour[2].text = UnityEngine.Random.Range(1, 7).ToString(); + threefour[2].text = random.ToString(); } } } @@ -353,7 +342,7 @@ public class Ugynok : MonoBehaviour foreach(var item in previus_ugynok_csapatok){ if(!item.Equals("")){ //ha nem ures a text vagyis volt atirva szamra nezze meg hogy X-e - if(!item.Equals("x")){ + if(!item.Equals("x") ||!item.Equals("X")){ //vonjon le egy eletet elet.Eletvesztes(); break; diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index e7be9dc..084fa64 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -59,6 +59,8 @@ public class jatekmanager : MonoBehaviour public static event Action OnGameStateChanged; public Button helyszinaktivalasBtn; + public TMP_Text nev; + private void Awake() { Instance = this; @@ -77,7 +79,11 @@ public class jatekmanager : MonoBehaviour source = FindObjectOfType(); vegpontozas = FindObjectOfType(); - UpdateGameState(GameState.KorKezdet); + UpdateGameState(GameState.Nev); + + #if !UNITY_EDITOR + test.SetActive(false); + #endif } public void UpdateGameState(GameState newState) @@ -101,6 +107,12 @@ public class jatekmanager : MonoBehaviour case GameState.Vesztette: HandleVesztette(); break; + case GameState.UgynokValasztas: + HandleUgynokValasztas(); + break; + case GameState.Nev: + HandleUgynokNev(); + break; default: throw new ArgumentOutOfRangeException(nameof(newState), newState, null); } @@ -114,7 +126,9 @@ public class jatekmanager : MonoBehaviour Akcio, Fejlesztes, Ugynok, - Vesztette + Vesztette, + UgynokValasztas, + Nev } private async void HandleKorkezdet() @@ -161,6 +175,55 @@ public class jatekmanager : MonoBehaviour Debug.Log((upgrade.getUjradobasIndex() + 1) + " ; ennyi dobásod van összesen"); } + 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); + movement.onethree_Collider.gameObject.SetActive(false); + movement.onefour_Collider.gameObject.SetActive(false); + movement.twoone_Collider.gameObject.SetActive(false); + movement.twotwo_Collider.gameObject.SetActive(false); + movement.twothree_Collider.gameObject.SetActive(false); + movement.twofour_Collider.gameObject.SetActive(false); + movement.threeone_Collider.gameObject.SetActive(false); + movement.threetwo_Collider.gameObject.SetActive(false); + movement.threethree_Collider.gameObject.SetActive(false); + movement.threefour_Collider.gameObject.SetActive(false); + } + + public void NevValasztasUtan(){ + if(!nev.text.Equals("")) + Instance.UpdateGameState(GameState.KorKezdet); + } + + private async void HandleUgynokNev(){ + movement.oneone_Collider.gameObject.SetActive(false); + movement.onetwo_Collider.gameObject.SetActive(false); + movement.onethree_Collider.gameObject.SetActive(false); + movement.onefour_Collider.gameObject.SetActive(false); + movement.twoone_Collider.gameObject.SetActive(false); + movement.twotwo_Collider.gameObject.SetActive(false); + movement.twothree_Collider.gameObject.SetActive(false); + movement.twofour_Collider.gameObject.SetActive(false); + movement.threeone_Collider.gameObject.SetActive(false); + movement.threetwo_Collider.gameObject.SetActive(false); + movement.threethree_Collider.gameObject.SetActive(false); + movement.threefour_Collider.gameObject.SetActive(false); + + energiafejlesztés.SetActive(false); + akciofejlesztés.SetActive(false); + harcfejlesztés.SetActive(false); + ujradobasfejlesztés.SetActive(false); + hackfejlesztés.SetActive(false); + kovetkezokor.SetActive(false); + betarazas.SetActive(false); + nyomozas.SetActive(false); + hackeles.SetActive(false); + helyszinaktivalasBtn.gameObject.SetActive(false); + //test.SetActive(false); + rolldice.SetActive(false); + } + private async void HandleFejlesztes() { @@ -194,6 +257,20 @@ public class jatekmanager : MonoBehaviour kovetkezokor.SetActive(true); + //ha ugynok valasztasbol jon kapcsolaja vissza a collidereket + movement.oneone_Collider.gameObject.SetActive(true); + movement.onetwo_Collider.gameObject.SetActive(true); + movement.onethree_Collider.gameObject.SetActive(true); + movement.onefour_Collider.gameObject.SetActive(true); + movement.twoone_Collider.gameObject.SetActive(true); + movement.twotwo_Collider.gameObject.SetActive(true); + movement.twothree_Collider.gameObject.SetActive(true); + movement.twofour_Collider.gameObject.SetActive(true); + movement.threeone_Collider.gameObject.SetActive(true); + movement.threetwo_Collider.gameObject.SetActive(true); + movement.threethree_Collider.gameObject.SetActive(true); + movement.threefour_Collider.gameObject.SetActive(true); + //rolldice.SetActive(false); } @@ -256,96 +333,6 @@ public class jatekmanager : MonoBehaviour dice.dice2btnBtn.gameObject.SetActive(bekapcsolas); } - - /* - - // Update is called once per frame - IEnumerator MyCoroutine() - { - //amig a játékos vesztett bool nem egyenlo true-val vagy a nyert bool nem egyenlo true-val - //while (jatekosnyert != true || jatekosvesztett != true) - //{ - //a jatekos mikor belép semmit ne tudjon csinálni csak dobni a kockával, hogy elkezdje a játékot - energiafejlesztés.SetActive(false); - akciofejlesztés.SetActive(false); - harcfejlesztés.SetActive(false); - ujradobasfejlesztés.SetActive(false); - hackfejlesztés.SetActive(false); - kovetkezokor.SetActive(false); - betarazas.SetActive(false); - nyomozas.SetActive(false); - hackeles.SetActive(false); - //test.SetActive(false); - - - - - //&& dice.getLocked() != true - - //ez rossz!!!! - //while (dice.dobott < upgrade.getUjradobasIndex() + 1 ) - //{ - - //eddig újradobhat - //} - - - yield return new WaitUntil(() => dice.getLocked() == true); - - - while (vanertelme == true) - { - //a játékos választ a két érték között - if (upgrade.canUpgrade == true) - { - //ha a kisebbet választotta akkor jelennek meg a fejlesztés gombjai - energiafejlesztés.SetActive(true); - akciofejlesztés.SetActive(true); - harcfejlesztés.SetActive(true); - ujradobasfejlesztés.SetActive(true); - hackfejlesztés.SetActive(true); - kovetkezokor.SetActive(true); - } - else - { - //ha a nagyobbat választotta akkor jelennek meg az akciók gombjai - - //itt a movement bekapcsol - kovetkezokor.SetActive(true); - betarazas.SetActive(true); - nyomozas.SetActive(true); - hackeles.SetActive(true); - } - } - - - - - //itt az akciopont elérte a 0-át - //movement kikapcs - energiafejlesztés.SetActive(false); - akciofejlesztés.SetActive(false); - harcfejlesztés.SetActive(false); - ujradobasfejlesztés.SetActive(false); - hackfejlesztés.SetActive(false); - //rolldice.SetActive(false); - betarazas.SetActive(false); - nyomozas.SetActive(false); - hackeles.SetActive(false); - //test.SetActive(false); - kovetkezokor.SetActive(true); - - //amint rányom a kör vége gombra 0 legyen az akciópont és megint csak a dobás legyen elérhető - - - - //} - - //JatekosNyert(); - //JatekosVesztett(); - - } */ - public void JatekosNyert() { Debug.Log("Játékos nyerésének vizsgálata."); diff --git a/Assets/Scripts/movement.cs b/Assets/Scripts/movement.cs index 244cbeb..34c563d 100644 --- a/Assets/Scripts/movement.cs +++ b/Assets/Scripts/movement.cs @@ -75,6 +75,7 @@ public class movement : MonoBehaviour private Ugynok ugynok; private Targyak targyak; private jatekmanager jatekmanager; + private Dice dice; private int oneonecount = 0; private int twoonecount = 0; @@ -112,6 +113,7 @@ public class movement : MonoBehaviour ugynok = FindObjectOfType(); targyak = FindObjectOfType(); jatekmanager = FindObjectOfType(); + dice = FindObjectOfType(); } void Start() @@ -166,8 +168,7 @@ public class movement : MonoBehaviour eromulepes1.SetActive(true); eromulepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; - jelenlegi_y = 1; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jelenlegi_y = 1; } else if (random == 2) { @@ -176,7 +177,6 @@ public class movement : MonoBehaviour feketepiaclepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 1; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 3) { @@ -185,7 +185,6 @@ public class movement : MonoBehaviour metrolepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 3; jelenlegi_y = 1; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 4) { @@ -194,7 +193,6 @@ public class movement : MonoBehaviour szervereklepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; jelenlegi_y = 2; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 5) { @@ -203,7 +201,6 @@ public class movement : MonoBehaviour kingcasinolepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 2; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 6) { @@ -212,7 +209,6 @@ public class movement : MonoBehaviour feltoltolepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 3; jelenlegi_y = 2; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 7) { @@ -221,7 +217,6 @@ public class movement : MonoBehaviour kutatolaborlepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; jelenlegi_y = 3; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 8) { @@ -230,7 +225,6 @@ public class movement : MonoBehaviour kriptoklublepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 3; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 9) { @@ -239,7 +233,6 @@ public class movement : MonoBehaviour cyberplazalepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 3; jelenlegi_y = 3; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 10) { @@ -248,7 +241,6 @@ public class movement : MonoBehaviour hadiuzemlepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; jelenlegi_y = 4; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 11) { @@ -257,7 +249,6 @@ public class movement : MonoBehaviour konyvtarlepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 4; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 12) { @@ -266,9 +257,9 @@ public class movement : MonoBehaviour korhazlepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 3; jelenlegi_y = 4; - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); ugynok.setElozoHelyszin(jelenlegi_x, jelenlegi_y); } @@ -825,6 +816,7 @@ public class movement : MonoBehaviour public void Update() { tavolsag = math.abs(tavolsag); + ugynok.ugynokMegolveElozoHelyen(); // player mozgatasa es konzolra iratas if (Input.GetKeyDown(KeyCode.Mouse0) && oneone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) @@ -862,7 +854,9 @@ public class movement : MonoBehaviour oneonecount = oneonecount + 1; Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); if (eromulepes1.activeSelf == true) { @@ -926,7 +920,9 @@ public class movement : MonoBehaviour } twoonecount = twoonecount + 1; Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); if (feketepiaclepes1.activeSelf == true) { @@ -993,7 +989,9 @@ public class movement : MonoBehaviour threeonecount++; Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); if (metrolepes1.activeSelf == true) { @@ -1064,7 +1062,9 @@ public class movement : MonoBehaviour onetwocount++; Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); if (szervereklepes1.activeSelf == true) { @@ -1130,7 +1130,9 @@ public class movement : MonoBehaviour } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); twotwocount++; if (kingcasinolepes1.activeSelf == true) @@ -1202,7 +1204,9 @@ public class movement : MonoBehaviour } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); threetwocount++; if (feltoltolepes1.activeSelf == true) @@ -1270,7 +1274,9 @@ public class movement : MonoBehaviour } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); onethreecount++; if (kutatolaborlepes1.activeSelf == true) @@ -1342,7 +1348,9 @@ public class movement : MonoBehaviour } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); twothreecount++; if (kriptoklublepes1.activeSelf == true) @@ -1411,7 +1419,9 @@ public class movement : MonoBehaviour } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); threethreecount++; if (cyberplazalepes1.activeSelf == true) @@ -1479,7 +1489,9 @@ public class movement : MonoBehaviour } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); onefourcount++; if (hadiuzemlepes1.activeSelf == true) @@ -1547,7 +1559,9 @@ public class movement : MonoBehaviour } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); twofourcount++; if (konyvtarlepes1.activeSelf == true) @@ -1615,7 +1629,9 @@ public class movement : MonoBehaviour } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas); //ne lepjen addig tovabb amig nem valasztott + dice.CallRenderDice(true); ugynok.ugynokMegolveElozoHelyen(); threefourcount++; if (korhazlepes1.activeSelf == true) diff --git a/Packages/manifest.json b/Packages/manifest.json index 132b888..9a790b9 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -9,6 +9,7 @@ "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", "com.unity.toolchain.linux-x86_64": "2.0.4", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.7.8", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 6105e8c..c1c8f79 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -260,6 +260,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.5", + "com.unity.sysroot.linux-x86_64": "2.0.4" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8e8cdf6..aa0461e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.8 + bundleVersion: 0.9.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 7e41fac..202182c 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,7 +6,7 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d + value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 RecentlyUsedSceneGuid-1: value: 0200045e07010a5f5d5c542341765d4213164a7f797d7e347c7e1c60bab7656a @@ -15,7 +15,7 @@ EditorUserSettings: value: 07040753500359095b580a2641275e41444f19297c2d2363752d4a35b1b46339 flags: 0 RecentlyUsedSceneGuid-3: - value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 + value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d flags: 0 UnityRemoteCompression: value: 29617121 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 4cf5ec6..0eed58a 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Console m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -39,12 +39,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1269 + x: 1414 y: 0 - width: 651 + width: 506 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 110 + controlID: 94 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1269 + width: 1414 height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 111 + controlID: 82 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -190,12 +190,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1269 - height: 534 + width: 1414 + height: 617 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 112 + controlID: 83 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -213,8 +213,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 237 - height: 534 + width: 205 + height: 617 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -237,12 +237,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 237 + x: 205 y: 0 - width: 1032 - height: 534 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + width: 1209 + height: 617 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -265,9 +265,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 534 - width: 1269 - height: 413 + y: 617 + width: 1414 + height: 330 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} @@ -296,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 237 + x: 205 y: 73 - width: 1030 - height: 513 + width: 1207 + height: 596 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -310,7 +310,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1030, y: 492} + m_TargetSize: {x: 1207, y: 575} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -325,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -515 - m_HBaseRangeMax: 515 - m_VBaseRangeMin: -246 - m_VBaseRangeMax: 246 + m_HBaseRangeMin: -603.5 + m_HBaseRangeMax: 603.5 + m_VBaseRangeMin: -287.5 + m_VBaseRangeMax: 287.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -346,23 +346,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1030 - height: 492 + width: 1207 + height: 575 m_Scale: {x: 1, y: 1} - m_Translation: {x: 515, y: 246} + m_Translation: {x: 603.5, y: 287.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -515 - y: -246 - width: 1030 - height: 492 + x: -603.5 + y: -287.5 + width: 1207 + height: 575 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1030, y: 513} + m_LastWindowPixelSize: {x: 1207, y: 596} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -390,8 +390,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 236 - height: 513 + width: 204 + height: 596 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -401,7 +401,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 12fbffff + m_ExpandedIDs: 6a9afeff0c9bfeffe69cfefff09cfeffe49efeffee9efeffbca2feff5ea3feff38a5feff42a5feff36a7feff40a7feff3eabfeffe0abfeffbaadfeffc4adfeff8caffeff96affeffccb2feffd6b2feff56b6fefff8b6feff10b7feff1ab7feffe2b8feffecb8feff7cbafeff1ebbfeff00bdfeff0abdfefffebefeff08bffeff9ec2feff40c3feff1ac5feff24c5feff18c7feff22c7feff3ccbfeffdecbfeffc0cdfeffcacdfeffbecffeffc8cffeff6ad3feff0cd4feff1cd4feff26d4feffeed5fefff8d5feff0cd7feffd2d8feff74d9feff84d9feff8ed9feff56dbfeff60dbfeff18ddfeffbaddfeffcaddfeffd4ddfeff9cdffeffa6dffeff8ae2feff36e6feff82e9feff24eafefffeebfeff08ecfeffd0edfeffeeedfeff563fffff6e46ffff1647ffffe048ffffdc4bffff804effff2c4fffffc258ffff7c59ffff785cffff6465ffffe26bffffd46cffff206effff28fbfffffa6b00009c700000567300003075000010780000b88a0100a28c0100c48c0100389b010062aa010054ab010056af0100c8b20100ce6e02008e6f0200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -417,7 +417,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -445,10 +445,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 237 + x: 205 y: 73 - width: 1030 - height: 513 + width: 1207 + height: 596 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -705,9 +705,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.3600006, y: 0, z: -10} + m_Target: {x: 721.455, y: 264.75873, z: -3.1850817} speed: 2 - m_Value: {x: -4.3600006, y: 0, z: -10} + m_Value: {x: 721.455, y: 264.75873, z: -3.1850817} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -758,9 +758,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.124355 + m_Target: 421.58566 speed: 2 - m_Value: 12.124355 + m_Value: 421.58566 m_Ortho: m_Target: 1 speed: 2 @@ -806,9 +806,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 607 - width: 1268 - height: 392 + y: 690 + width: 1413 + height: 309 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -826,22 +826,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: E:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3e7a0000 - m_LastClickedID: 31294 - m_ExpandedIDs: 000000001e7a0000 + m_SelectedIDs: 547a0000 + m_LastClickedID: 31316 + m_ExpandedIDs: 00000000187a0000567a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000001e7a0000 + m_ExpandedIDs: 00000000187a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -894,8 +894,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: ac6c0000 - m_LastClickedInstanceID: 27820 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -913,7 +913,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -946,9 +946,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 607 - width: 1268 - height: 392 + y: 690 + width: 1413 + height: 309 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -973,9 +973,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1269 + x: 1414 y: 73 - width: 650 + width: 505 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: