From c46635f4e06c3fb322067a140b7a43cb0eff2297 Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Wed, 14 Dec 2022 10:32:38 +0100 Subject: [PATCH] dice and source bugfix --- Assets/Scripts/Dice.cs | 2 +- Assets/Scripts/Source.cs | 2 +- UserSettings/EditorUserSettings.asset | 8 +- .../Layouts/CurrentMaximizeLayout.dwlt | 88 +++++----- UserSettings/Layouts/default-2021.dwlt | 156 +++++++++--------- 5 files changed, 128 insertions(+), 128 deletions(-) diff --git a/Assets/Scripts/Dice.cs b/Assets/Scripts/Dice.cs index fe99186..4718803 100644 --- a/Assets/Scripts/Dice.cs +++ b/Assets/Scripts/Dice.cs @@ -66,7 +66,7 @@ public class Dice : MonoBehaviour { } public int RollDice() { - int randomDiceSide = Random.Range(0, 5); + int randomDiceSide = Random.Range(0, 6); int finalSide = randomDiceSide + 1; Debug.Log(finalSide); diff --git a/Assets/Scripts/Source.cs b/Assets/Scripts/Source.cs index 337e309..cddc437 100644 --- a/Assets/Scripts/Source.cs +++ b/Assets/Scripts/Source.cs @@ -24,7 +24,7 @@ public class Source : MonoBehaviour private void Update() { if(isNyitva && oszlop != -1 && sor.Count == 1) { - sourceRender(sor[0], oszlop); + sourceRender(oszlop, sor[0]); if (!oneTime) { printSourceLocation(); oneTime = true; diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 99c2241..9077c51 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,13 +6,13 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 - flags: 0 - RecentlyUsedSceneGuid-1: value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d flags: 0 + RecentlyUsedSceneGuid-1: + value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 + flags: 0 UnityRemoteCompression: - value: 337f73 + value: 29617121 flags: 0 UnityRemoteDevice: value: 530104565d04580b405e5c7244770b43464749097d70766108 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 04c92ca..09e11c2 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 6355 + controlID: 96 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,9 +45,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 260 + x: 218 y: 73 - width: 697 + width: 739 height: 364 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 697, y: 343} + m_TargetSize: {x: 739, y: 343} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,8 +74,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -348.5 - m_HBaseRangeMax: 348.5 + m_HBaseRangeMin: -369.5 + m_HBaseRangeMax: 369.5 m_VBaseRangeMin: -171.5 m_VBaseRangeMax: 171.5 m_HAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 697 + width: 739 height: 343 m_Scale: {x: 1, y: 1} - m_Translation: {x: 348.5, y: 171.5} + m_Translation: {x: 369.5, y: 171.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -348.5 + x: -369.5 y: -171.5 - width: 697 + width: 739 height: 343 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 697, y: 364} + m_LastWindowPixelSize: {x: 739, y: 364} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 6356 + controlID: 97 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 6357 + controlID: 98 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -184,10 +184,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 260 + width: 218 height: 385 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -215,7 +215,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 259 + width: 217 height: 364 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: f6baffff96bbffff5abfffff6abffffffef7ffff28fbffffcc7700000c780000147800003078000034780000c8780000ea780000187900001e7900002879000088c5000090c50000acc50000b0c5000044c6000066c6000094c600009ac60000a4c60000 + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -265,12 +265,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 260 + x: 218 y: 0 - width: 699 + width: 741 height: 385 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} @@ -297,9 +297,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 260 + x: 218 y: 73 - width: 697 + width: 739 height: 364 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 109.13717, y: 53.656593, z: -0.3365027} + m_Target: {x: -16.243225, y: 5.37563, z: 0.07577607} speed: 2 - m_Value: {x: 109.13717, y: 53.656593, z: -0.3365027} + m_Value: {x: -16.243225, y: 5.37563, z: 0.07577607} 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: 35.13277 + m_Target: 1.8561924 speed: 2 - m_Value: 35.13277 + m_Value: 1.8561924 m_Ortho: m_Target: 1 speed: 2 @@ -656,8 +656,8 @@ MonoBehaviour: y: 385 width: 959 height: 250 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} @@ -706,22 +706,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/menu + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 71 m_LastFolders: - - Assets/Scripts/menu + - Assets/Scripts m_LastFoldersGridSize: 71 m_LastProjectPath: C:\dev\find the source m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 788e0000 - m_LastClickedID: 36472 - m_ExpandedIDs: 00000000507700007277000000ca9a3bffffff7f + m_SelectedIDs: 68770000 + m_LastClickedID: 30568 + m_ExpandedIDs: 000000005077000064770000c277000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -749,7 +749,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005077000000ca9a3bffffff7f + m_ExpandedIDs: 0000000050770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -774,8 +774,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: e01d0000 + m_LastClickedInstanceID: 7648 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300000000000034ecffff m_RenameOverlay: @@ -1002,9 +1002,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 647 - width: 1472 - height: 352 + y: 458 + width: 958 + height: 229 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1028,8 +1028,8 @@ MonoBehaviour: y: 0 width: 407 height: 635 - 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: 14} m_Panes: - {fileID: 14} @@ -1069,7 +1069,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 7648 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 4315099..2e5e9d8 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1366 height: 685 m_ShowMode: 4 - m_Title: Project + m_Title: Hierarchy m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 421} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 111 + controlID: 103 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1048 + width: 959 height: 635 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 64 + controlID: 87 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1048 + width: 959 height: 385 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 41 + controlID: 88 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,13 +187,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 204 + width: 260 height: 385 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 14} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -206,23 +206,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 204 + x: 260 y: 0 - width: 844 + width: 699 height: 385 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 15} - - {fileID: 13} - m_Selected: 1 - m_LastSelected: 0 + - {fileID: 14} + - {fileID: 12} + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,15 +240,15 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 385 - width: 1048 + width: 959 height: 250 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 15} m_Panes: + - {fileID: 15} - {fileID: 16} - {fileID: 17} - - {fileID: 12} m_Selected: 0 m_LastSelected: 2 --- !u!114 &11 @@ -266,9 +266,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1048 + x: 959 y: 0 - width: 318 + width: 407 height: 635 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -278,34 +278,6 @@ MonoBehaviour: m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 647 - width: 1472 - height: 352 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] ---- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -325,9 +297,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 204 + x: 260 y: 73 - width: 842 + width: 697 height: 364 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -339,11 +311,11 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 842, y: 343} + m_TargetSize: {x: 697, y: 343} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 + m_EnterPlayModeBehavior: 1 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -354,8 +326,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -421 - m_HBaseRangeMax: 421 + m_HBaseRangeMin: -348.5 + m_HBaseRangeMax: 348.5 m_VBaseRangeMin: -171.5 m_VBaseRangeMax: 171.5 m_HAllowExceedBaseRangeMin: 1 @@ -375,29 +347,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 842 + width: 697 height: 343 m_Scale: {x: 1, y: 1} - m_Translation: {x: 421, y: 171.5} + m_Translation: {x: 348.5, y: 171.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -421 + x: -348.5 y: -171.5 - width: 842 + width: 697 height: 343 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 842, y: 364} + m_LastWindowPixelSize: {x: 697, y: 364} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &14 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -419,7 +391,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 203 + width: 259 height: 364 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -430,7 +402,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 28fbffff + m_ExpandedIDs: a4f2ffff46f3ffffe8f6ffff06f7ffff28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -454,7 +426,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -474,10 +446,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 287 + x: 260 y: 73 - width: 1184 - height: 456 + width: 697 + height: 364 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -727,16 +699,16 @@ MonoBehaviour: m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 + m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.2285957, y: 0.84585404, z: -0.0070748287} + m_Target: {x: -5.219469, y: 0.13304771, z: -0.006620476} speed: 2 - m_Value: {x: -4.5465274, y: -1.4268839, z: -0.07916484} + m_Value: {x: -5.219469, y: 0.13304771, z: -0.006620476} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -787,9 +759,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.215788 + m_Target: 11.592702 speed: 2 - m_Value: 10.31249 + m_Value: 11.592702 m_Ortho: m_Target: 1 speed: 2 @@ -814,7 +786,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -836,7 +808,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 458 - width: 1047 + width: 958 height: 229 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -954,7 +926,7 @@ MonoBehaviour: m_GridSize: 71 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 164 ---- !u!114 &17 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1130,6 +1102,34 @@ MonoBehaviour: m_ShowReferencedBuses: 1 m_ShowBusConnections: 0 m_ShowBusConnectionsOfSelection: 0 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 458 + width: 958 + height: 229 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] --- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1150,9 +1150,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1048 + x: 959 y: 73 - width: 317 + width: 406 height: 614 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: