From 7b8e7f36b009a09b1d5036d708652bed0fc2b19d Mon Sep 17 00:00:00 2001 From: RedStealthDev Date: Tue, 28 Feb 2023 09:09:29 +0100 Subject: [PATCH] temporary world gen not final --- .../ForegroundTiles/tiles/TileRules.asset | 166 +++- Assets/Scenes/Main_Game.unity | 748 +----------------- Assets/Scripts/RoomsGen.cs | 422 ---------- Assets/Scripts/WFCGenerator.cs | 127 ++- Assets/Scripts/camera.cs | 13 +- Assets/Scripts/rectangleroomgen.cs | 34 + ...msGen.cs.meta => rectangleroomgen.cs.meta} | 2 +- ...SyncFile~f7dc15bce580e3247a2c4e2278c5f096~ | 0 .../Layouts/CurrentMaximizeLayout.dwlt | 526 ++++++------ UserSettings/Layouts/default-2021.dwlt | 340 ++++---- 10 files changed, 661 insertions(+), 1717 deletions(-) delete mode 100644 Assets/Scripts/RoomsGen.cs create mode 100644 Assets/Scripts/rectangleroomgen.cs rename Assets/Scripts/{RoomsGen.cs.meta => rectangleroomgen.cs.meta} (83%) create mode 100644 Assets/~UnityDirMonSyncFile~f7dc15bce580e3247a2c4e2278c5f096~ diff --git a/Assets/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset b/Assets/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset index 3d0d989..665124e 100644 --- a/Assets/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset +++ b/Assets/Materials/Grapic/ForegroundTiles/tiles/TileRules.asset @@ -12,13 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9d1514134bc4fbd41bb739b1b9a49231, type: 3} m_Name: TileRules m_EditorClassIdentifier: - m_DefaultSprite: {fileID: 1161249499, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + m_DefaultSprite: {fileID: 2098902956, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} m_DefaultGameObject: {fileID: 0} m_DefaultColliderType: 2 m_TilingRules: - - m_Id: 1 + - m_Id: 0 m_Sprites: - - {fileID: -1977288218, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + - {fileID: 1184939126, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} m_GameObject: {fileID: 0} m_MinAnimationSpeed: 1 m_MaxAnimationSpeed: 1 @@ -28,13 +28,13 @@ MonoBehaviour: m_RandomTransform: 0 m_Neighbors: 010000000100000002000000 m_NeighborPositions: - - {x: 1, y: 0, z: 0} - {x: -1, y: 0, z: 0} - - {x: 0, y: -1, z: 0} + - {x: 1, y: 0, z: 0} + - {x: 0, y: 1, z: 0} m_RuleTransform: 0 - - m_Id: 3 + - m_Id: 1 m_Sprites: - - {fileID: -43068007, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + - {fileID: 1646476331, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} m_GameObject: {fileID: 0} m_MinAnimationSpeed: 1 m_MaxAnimationSpeed: 1 @@ -44,13 +44,13 @@ MonoBehaviour: m_RandomTransform: 0 m_Neighbors: 010000000100000002000000 m_NeighborPositions: - - {x: 0, y: 1, z: 0} - {x: -1, y: 0, z: 0} - - {x: 1, y: -1, z: 0} + - {x: 1, y: 0, z: 0} + - {x: 0, y: 1, z: 0} m_RuleTransform: 0 - - m_Id: 4 + - m_Id: 9 m_Sprites: - - {fileID: 2010503647, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + - {fileID: -1977288218, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} m_GameObject: {fileID: 0} m_MinAnimationSpeed: 1 m_MaxAnimationSpeed: 1 @@ -58,11 +58,11 @@ MonoBehaviour: m_Output: 0 m_ColliderType: 1 m_RandomTransform: 0 - m_Neighbors: 010000000100000002000000 + m_Neighbors: 020000000100000001000000 m_NeighborPositions: - - {x: 0, y: 1, z: 0} + - {x: 0, y: -1, z: 0} + - {x: -1, y: 0, z: 0} - {x: 1, y: 0, z: 0} - - {x: -1, y: -1, z: 0} m_RuleTransform: 0 - m_Id: 5 m_Sprites: @@ -76,11 +76,11 @@ MonoBehaviour: m_RandomTransform: 0 m_Neighbors: 010000000100000002000000 m_NeighborPositions: - - {x: 0, y: -1, z: 0} - {x: 0, y: 1, z: 0} + - {x: 0, y: -1, z: 0} - {x: 1, y: 0, z: 0} m_RuleTransform: 0 - - m_Id: 6 + - m_Id: 4 m_Sprites: - {fileID: -1271397342, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} m_GameObject: {fileID: 0} @@ -96,9 +96,9 @@ MonoBehaviour: - {x: 0, y: -1, z: 0} - {x: -1, y: 0, z: 0} m_RuleTransform: 0 - - m_Id: 7 + - m_Id: 2 m_Sprites: - - {fileID: -418124667, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + - {fileID: 1070215111, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} m_GameObject: {fileID: 0} m_MinAnimationSpeed: 1 m_MaxAnimationSpeed: 1 @@ -108,13 +108,13 @@ MonoBehaviour: m_RandomTransform: 0 m_Neighbors: 010000000100000002000000 m_NeighborPositions: - - {x: -1, y: 0, z: 0} - {x: 0, y: -1, z: 0} - - {x: 1, y: 1, z: 0} + - {x: 1, y: 0, z: 0} + - {x: -1, y: 1, z: 0} m_RuleTransform: 0 - - m_Id: 8 + - m_Id: 3 m_Sprites: - - {fileID: 1070215111, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + - {fileID: -418124667, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} m_GameObject: {fileID: 0} m_MinAnimationSpeed: 1 m_MaxAnimationSpeed: 1 @@ -122,15 +122,15 @@ MonoBehaviour: m_Output: 0 m_ColliderType: 1 m_RandomTransform: 0 - m_Neighbors: 010000000100000002000000 + m_Neighbors: 010000000200000001000000 m_NeighborPositions: - - {x: 1, y: 0, z: 0} + - {x: -1, y: 0, z: 0} + - {x: 1, y: 1, z: 0} - {x: 0, y: -1, z: 0} - - {x: -1, y: 1, z: 0} m_RuleTransform: 0 - - m_Id: 9 + - m_Id: 6 m_Sprites: - - {fileID: 1646476331, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + - {fileID: 2010503647, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} m_GameObject: {fileID: 0} m_MinAnimationSpeed: 1 m_MaxAnimationSpeed: 1 @@ -140,13 +140,46 @@ MonoBehaviour: m_RandomTransform: 0 m_Neighbors: 010000000100000002000000 m_NeighborPositions: + - {x: 0, y: 1, z: 0} - {x: 1, y: 0, z: 0} + - {x: -1, y: -1, z: 0} + m_RuleTransform: 0 + - m_Id: 7 + m_Sprites: + - {fileID: -43068007, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + m_GameObject: {fileID: 0} + m_MinAnimationSpeed: 1 + m_MaxAnimationSpeed: 1 + m_PerlinScale: 0.5 + m_Output: 0 + m_ColliderType: 1 + m_RandomTransform: 0 + m_Neighbors: 020000000100000001000000 + m_NeighborPositions: + - {x: 1, y: -1, z: 0} + - {x: 0, y: 1, z: 0} + - {x: -1, y: 0, z: 0} + m_RuleTransform: 0 + - m_Id: 8 + m_Sprites: + - {fileID: 2098902956, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + m_GameObject: {fileID: 0} + m_MinAnimationSpeed: 1 + m_MaxAnimationSpeed: 1 + m_PerlinScale: 0.5 + m_Output: 0 + m_ColliderType: 1 + m_RandomTransform: 0 + m_Neighbors: 01000000010000000100000001000000 + m_NeighborPositions: - {x: -1, y: 0, z: 0} - {x: 0, y: 1, z: 0} + - {x: 1, y: 0, z: 0} + - {x: 0, y: -1, z: 0} m_RuleTransform: 0 - m_Id: 10 m_Sprites: - - {fileID: 1184939126, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + - {fileID: 1161249499, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} m_GameObject: {fileID: 0} m_MinAnimationSpeed: 1 m_MaxAnimationSpeed: 1 @@ -154,15 +187,15 @@ MonoBehaviour: m_Output: 0 m_ColliderType: 1 m_RandomTransform: 0 - m_Neighbors: 010000000100000002000000 + m_Neighbors: 020000000200000001000000 m_NeighborPositions: - - {x: -1, y: 0, z: 0} + - {x: 0, y: -1, z: 0} - {x: 1, y: 0, z: 0} - - {x: 0, y: 1, z: 0} + - {x: -1, y: 1, z: 0} m_RuleTransform: 0 - m_Id: 11 m_Sprites: - - {fileID: 2098902956, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + - {fileID: 1546467105, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} m_GameObject: {fileID: 0} m_MinAnimationSpeed: 1 m_MaxAnimationSpeed: 1 @@ -170,10 +203,75 @@ MonoBehaviour: m_Output: 0 m_ColliderType: 1 m_RandomTransform: 0 - m_Neighbors: 01000000010000000100000001000000 + m_Neighbors: 020000000200000001000000 m_NeighborPositions: - {x: -1, y: 0, z: 0} + - {x: 0, y: -1, z: 0} + - {x: 1, y: 1, z: 0} + m_RuleTransform: 0 + - m_Id: 12 + m_Sprites: + - {fileID: -607760080, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + m_GameObject: {fileID: 0} + m_MinAnimationSpeed: 1 + m_MaxAnimationSpeed: 1 + m_PerlinScale: 0.5 + m_Output: 0 + m_ColliderType: 1 + m_RandomTransform: 0 + m_Neighbors: 020000000200000001000000 + m_NeighborPositions: + - {x: 0, y: 1, z: 0} - {x: 1, y: 0, z: 0} + - {x: -1, y: -1, z: 0} + m_RuleTransform: 0 + - m_Id: 13 + m_Sprites: + - {fileID: 326467328, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + m_GameObject: {fileID: 0} + m_MinAnimationSpeed: 1 + m_MaxAnimationSpeed: 1 + m_PerlinScale: 0.5 + m_Output: 0 + m_ColliderType: 1 + m_RandomTransform: 0 + m_Neighbors: 010000000200000002000000 + m_NeighborPositions: + - {x: 1, y: -1, z: 0} + - {x: -1, y: 0, z: 0} - {x: 0, y: 1, z: 0} - - {x: 0, y: -1, z: 0} + m_RuleTransform: 0 + - m_Id: 14 + m_Sprites: + - {fileID: 1679217227, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + m_GameObject: {fileID: 0} + m_MinAnimationSpeed: 1 + m_MaxAnimationSpeed: 1 + m_PerlinScale: 0.5 + m_Output: 0 + m_ColliderType: 1 + m_RandomTransform: 0 + m_Neighbors: 01000000010000000200000002000000 + m_NeighborPositions: + - {x: -1, y: 1, z: 0} + - {x: 1, y: -1, z: 0} + - {x: -1, y: -1, z: 0} + - {x: 1, y: 1, z: 0} + m_RuleTransform: 0 + - m_Id: 15 + m_Sprites: + - {fileID: 2141421803, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3} + m_GameObject: {fileID: 0} + m_MinAnimationSpeed: 1 + m_MaxAnimationSpeed: 1 + m_PerlinScale: 0.5 + m_Output: 0 + m_ColliderType: 1 + m_RandomTransform: 0 + m_Neighbors: 01000000010000000200000002000000 + m_NeighborPositions: + - {x: 1, y: 1, z: 0} + - {x: -1, y: -1, z: 0} + - {x: 1, y: -1, z: 0} + - {x: -1, y: 1, z: 0} m_RuleTransform: 0 diff --git a/Assets/Scenes/Main_Game.unity b/Assets/Scenes/Main_Game.unity index 75824c7..8c38738 100644 --- a/Assets/Scenes/Main_Game.unity +++ b/Assets/Scenes/Main_Game.unity @@ -222,9 +222,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 697f3848188d511178ae224d2ed73cde, type: 3} m_Name: m_EditorClassIdentifier: - FollowedObject: {fileID: 1426947899} + FollowedObject: {fileID: 1426947896} offset: {x: 0, y: 6} - sus: {x: 20, y: 5} Speed: 1 --- !u!114 &96465042 MonoBehaviour: @@ -242,7 +241,7 @@ MonoBehaviour: m_RefResolutionX: 480 m_RefResolutionY: 270 m_UpscaleRT: 0 - m_PixelSnapping: 0 + m_PixelSnapping: 1 m_CropFrameX: 0 m_CropFrameY: 0 m_StretchFill: 0 @@ -267,173 +266,6 @@ Rigidbody2D: m_SleepingMode: 0 m_CollisionDetection: 1 m_Constraints: 4 ---- !u!1 &225923646 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 225923647} - m_Layer: 0 - m_Name: Test Map - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &225923647 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 225923646} - 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: 1734573319} - - {fileID: 1748358147} - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &321587397 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 321587398} - - component: {fileID: 321587401} - - component: {fileID: 321587400} - - component: {fileID: 321587399} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &321587398 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 321587397} - 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: 1767037992} - m_Father: {fileID: 1302022173} - m_RootOrder: 0 - 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: 160, y: 30} - m_Pivot: {x: 0, y: 0} ---- !u!114 &321587399 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 321587397} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 321587400} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 949487201} - m_TargetAssemblyTypeName: RoomsGen, Assembly-CSharp - m_MethodName: makeRoom - 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 ---- !u!114 &321587400 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 321587397} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &321587401 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 321587397} - m_CullTransparentMesh: 1 --- !u!1 &874085733 GameObject: m_ObjectHideFlags: 0 @@ -5259,7 +5091,7 @@ GameObject: - component: {fileID: 924561540} - component: {fileID: 924561542} - component: {fileID: 924561541} - m_Layer: 0 + m_Layer: 6 m_Name: Foreground m_TagString: Untagged m_Icon: {fileID: 0} @@ -5506,7 +5338,7 @@ Transform: - {fileID: 1426128976} - {fileID: 924561544} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &949487201 MonoBehaviour: @@ -5517,215 +5349,14 @@ MonoBehaviour: m_GameObject: {fileID: 949487197} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6006dd3e743a0134591611bd775fe454, type: 3} + m_Script: {fileID: 11500000, guid: ca3b740468fd1ff4aa519d6585cc38a0, type: 3} m_Name: m_EditorClassIdentifier: - Map: {fileID: 924561540} - Tiles: - - tile: {fileID: 0} - weight: 30 - TL: 1 - TR: 1 - BL: 1 - BR: 1 - - tile: {fileID: 0} - weight: 7 - TL: 0 - TR: 0 - BL: 1 - BR: 1 - - tile: {fileID: 0} - weight: 7 - TL: 0 - TR: 0 - BL: 1 - BR: 1 - - tile: {fileID: 0} - weight: 2 - TL: 0 - TR: 1 - BL: 1 - BR: 1 - - tile: {fileID: 0} - weight: 2 - TL: 1 - TR: 0 - BL: 1 - BR: 1 - - tile: {fileID: 0} - weight: 5 - TL: 0 - TR: 1 - BL: 0 - BR: 1 - - tile: {fileID: 0} - weight: 5 - TL: 1 - TR: 0 - BL: 1 - BR: 0 - - tile: {fileID: 0} - weight: 2 - TL: 1 - TR: 1 - BL: 0 - BR: 1 - - tile: {fileID: 0} - weight: 2 - TL: 1 - TR: 1 - BL: 1 - BR: 0 - - tile: {fileID: 0} - weight: 7 - TL: 1 - TR: 1 - BL: 0 - BR: 0 - - tile: {fileID: 11400000, guid: 6da4a08fb9e881948a7b628049337699, type: 2} - weight: 1 - TL: 0 - TR: 0 - BL: 0 - BR: 0 - - tile: {fileID: 11400000, guid: 1007506a73aa1fbf9aa383a9fcfb163c, type: 2} - weight: 2 - TL: 1 - TR: 0 - BL: 0 - BR: 0 - - tile: {fileID: 11400000, guid: 162ffa1174e77444f9d6b7c5c9c44f9c, type: 2} - weight: 2 - TL: 0 - TR: 1 - BL: 0 - BR: 0 - - tile: {fileID: 11400000, guid: 955fdc78a98e0444f97e8e7345348245, type: 2} - weight: 2 - TL: 0 - TR: 0 - BL: 1 - BR: 0 - - tile: {fileID: 11400000, guid: 4d90f067928a3384a9bd0e91919d9f72, type: 2} - weight: 2 - TL: 0 - TR: 0 - BL: 0 - BR: 1 - - tile: {fileID: 11400000, guid: 6657674b4d602334db1b7c4f2fd0c4b4, type: 2} - weight: 5 - TL: 1 - TR: 0 - BL: 0 - BR: 1 - - tile: {fileID: 11400000, guid: c13ef733986e60b4798aac1a19f103b3, type: 2} - weight: 5 - TL: 0 - TR: 1 - BL: 1 - BR: 0 - Entropy: 0 ---- !u!1 &1302022169 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1302022173} - - component: {fileID: 1302022172} - - component: {fileID: 1302022171} - - component: {fileID: 1302022170} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1302022170 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1302022169} - 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 &1302022171 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1302022169} - 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 &1302022172 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1302022169} - 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 &1302022173 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1302022169} - 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: 321587398} - m_Father: {fileID: 0} - m_RootOrder: 4 - 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} + Rule: {fileID: 11400000, guid: fef1fa7ffa6e147498b1a88042071554, type: 2} + map: {fileID: 924561540} + empty: {fileID: 11400000, guid: 6da4a08fb9e881948a7b628049337699, type: 2} + player: {fileID: 1426947895} + Camera: {fileID: 96465037} --- !u!1 &1426128975 GameObject: m_ObjectHideFlags: 1 @@ -5980,228 +5611,6 @@ Transform: m_Father: {fileID: 1426947899} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1734573316 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1734573319} - - component: {fileID: 1734573318} - - component: {fileID: 1734573320} - m_Layer: 6 - m_Name: test map - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1734573318 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1734573316} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1734573319 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1734573316} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -50, z: 0} - m_LocalScale: {x: 1000, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 225923647} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1734573320 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1734573316} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!1 &1748358146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1748358147} - - component: {fileID: 1748358148} - - component: {fileID: 1748358149} - m_Layer: 0 - m_Name: Square - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1748358147 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748358146} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -500, y: -0.5, z: 0} - m_LocalScale: {x: 1, y: 100, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 225923647} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1748358148 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748358146} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &1748358149 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748358146} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 --- !u!1 &1766360383 GameObject: m_ObjectHideFlags: 0 @@ -6233,141 +5642,6 @@ Transform: m_Father: {fileID: 1426947899} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1767037991 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1767037992} - - component: {fileID: 1767037994} - - component: {fileID: 1767037993} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1767037992 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1767037991} - 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: 321587398} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1767037993 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1767037991} - 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: Button - 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: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - 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 &1767037994 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1767037991} - m_CullTransparentMesh: 1 --- !u!1 &2142331839 GameObject: m_ObjectHideFlags: 0 @@ -6414,7 +5688,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2142331843 MonoBehaviour: diff --git a/Assets/Scripts/RoomsGen.cs b/Assets/Scripts/RoomsGen.cs deleted file mode 100644 index 120548c..0000000 --- a/Assets/Scripts/RoomsGen.cs +++ /dev/null @@ -1,422 +0,0 @@ -using System; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Tilemaps; -using System.Threading; - -public class RoomsGen : MonoBehaviour -{ - private Vector2Int size; - private Wave[,] Waves; - private Vector2Int lowest; - private System.Random ran; - private Thread genthread; - private bool Print; - private bool running; - public Tilemap Map; - public Tile[] Tiles; - [SerializeField][ReadOnly] private float Entropy; - void OnDisable() - { - genthread.Interrupt(); - genthread.Abort(); - } - private void FixedUpdate() - { - if (Print) - { - Print = false; - Map.ClearAllTiles(); - for (int y = 0; y < size.y; y++) - { - for (int x = 0; x < size.x; x++) - { - try - { - Map.SetTile(new Vector3Int(x, y, 0), Waves[x, y].Possible[0].tile); - } - catch{} - } - } - } - } - public void makeRoom() - { - if (running) - { - return; - } - running = true; - genthread = new Thread(new ThreadStart(inmakeRoom)); - genthread.Start(); - } - private void inmakeRoom() - { - ran = new System.Random(); - size = new Vector2Int(ran.Next(10, 30), ran.Next(7, 15)); - Waves = new Wave[size.x, size.y]; - - for (int y = 0; y < size.y; y++) - { - for (int x = 0; x < size.x; x++) - { - Waves[x, y].Possible = new List(); - Waves[x, y].Possible.AddRange(Tiles); - Waves[x, y].TL = -1; - Waves[x, y].TR = -1; - Waves[x, y].BL = -1; - Waves[x, y].BR = -1; - if (y == 0 || y == size.y - 1 || x == 0 || x == size.x - 1) - { - Waves[x, y].Possible = new List(); - Waves[x, y].Possible.Add(Tiles[0]); - Waves[x, y].TL = 1; - Waves[x, y].TR = 1; - Waves[x, y].BL = 1; - Waves[x, y].BR = 1; - } - } - } - int runs = 0; - while (true) - { - runs++; - Debug.Log("Runs: " + runs); - CalcEntropy(); - if (Select()) - { - break; - } - Wave[,] Temp = Waves; - Observe(); - for (int i = 0; i < 100; i++) - { - if (!Propagate()) - { - break; - } - } - if(PathCheck()) - { - Waves = Temp; - } - } - running = false; - Print = true; - } - public void CalcEntropy() - { - for (int y = 0; y < size.y; y++) - { - for (int x = 0; x < size.x; x++) - { - float weight = 0; - if (Waves[x, y].Possible.Count <= 1) - { - Waves[x, y].Entropy = 0; - continue; - } - foreach (var we in Waves[x, y].Possible) - { - weight += we.weight; - } - Waves[x, y].Entropy = weight; - } - } - } - public bool Select() - { - bool Sel = false; - int tries = 0; - while (true) - { - tries++; - lowest = new Vector2Int(ran.Next(0, size.x), ran.Next(0, size.y)); - if (Waves[lowest.x, lowest.y].Entropy != 0) - { - break; - } - if (tries >= 2000) - { - tries = 0; - float entropy = 0; - for (int y = 0; y < size.y; y++) - { - for (int x = 0; x < size.x; x++) - { - entropy += Waves[x, y].Entropy; - } - } - if (entropy == 0) - { - break; - } - } - } - float entroexit = 0; - for (int y = 0; y < size.y; y++) - { - for (int x = 0; x < size.x; x++) - { - if (Waves[x, y].Entropy < Waves[lowest.x, lowest.y].Entropy && Waves[x, y].Entropy != 0) - { - lowest = new Vector2Int(x, y); - } - entroexit += Waves[x, y].Entropy; - } - } - Entropy = entroexit; - if (entroexit == 0) - { - Sel = true; - } - return Sel; - } - public void Observe() - { - List Weights = new List(); - int maxweight = 0; - foreach (var item in Waves[lowest.x, lowest.y].Possible) - { - Weights.Add(item.weight); - maxweight += item.weight; - } - Weights.Sort(); - double selected = Math.Pow(Math.Floor(ran.NextDouble() * 10), 2) / maxweight; - for (int i = 0; i < Weights.Count; i++) - { - selected -= Weights[i]; - if (selected < 0) - { - selected = i; - break; - } - } - selected = Math.Clamp(selected, 0, Weights.Count-1); - for (int i = 0; i < Waves[lowest.x, lowest.y].Possible.Count; i++) - { - Debug.Log(Waves[lowest.x, lowest.y].Possible[i].weight); - Debug.Log("AAAA: " + Weights[(int)selected]); - if(Waves[lowest.x, lowest.y].Possible[i].weight == Weights[(int)selected]) - { - selected = i; - break; - } - } - Waves[lowest.x, lowest.y].Entropy = 0; - Tile temp = Waves[lowest.x, lowest.y].Possible[(int)selected]; - Waves[lowest.x, lowest.y].Possible.Clear(); - Waves[lowest.x, lowest.y].Possible.Add(temp); - Waves[lowest.x, lowest.y].TL = ToInt(temp.TL); - Waves[lowest.x, lowest.y].TR = ToInt(temp.TR); - Waves[lowest.x, lowest.y].BL = ToInt(temp.BL); - Waves[lowest.x, lowest.y].BR = ToInt(temp.BR); - } - public bool Propagate() - { - bool edited = false; - for (int y = 0; y < size.y; y++) - { - for (int x = 0; x < size.x; x++) - { - if (x - 1 >= 0) - { - check(new Vector2Int(x, y), new Vector2Int(x - 1, y)); - if (y - 1 >= 0) - { - check(new Vector2Int(x, y), new Vector2Int(x - 1, y - 1)); - } - if (y + 1 < size.y) - { - check(new Vector2Int(x, y), new Vector2Int(x - 1, y + 1)); - } - } - if (y - 1 >= 0) - { - check(new Vector2Int(x, y), new Vector2Int(x, y - 1)); - if (x + 1 < size.x) - { - check(new Vector2Int(x, y), new Vector2Int(x + 1, y - 1)); - } - } - if (x + 1 < size.x) - { - check(new Vector2Int(x, y), new Vector2Int(x + 1, y)); - } - if (y + 1 < size.y) - { - check(new Vector2Int(x, y), new Vector2Int(x, y + 1)); - if (x + 1 < size.x) - { - check(new Vector2Int(x, y), new Vector2Int(x + 1, y + 1)); - } - } - if (!edited) - { - try - { - edited = Clean(new Vector2Int(x, y)); - } - catch { } - } - else - { - try - { - Clean(new Vector2Int(x, y)); - } - catch { } - } - } - } - return edited; - } - public void check(Vector2Int Current, Vector2Int Check) - { - Vector2Int normal = Check - Current; - if (normal.x == 0) - { - if (normal.y == -1) - { - if (Waves[Check.x, Check.y].TL != -1) - { - Waves[Current.x, Current.y].BL = Waves[Check.x, Check.y].TL; - } - if (Waves[Check.x, Check.y].TR != -1) - { - Waves[Current.x, Current.y].BR = Waves[Check.x, Check.y].TR; - } - } - else if (normal.y == 1) - { - if (Waves[Check.x, Check.y].BL != -1) - { - Waves[Current.x, Current.y].TL = Waves[Check.x, Check.y].BL; - } - if (Waves[Check.x, Check.y].BR != -1) - { - Waves[Current.x, Current.y].TR = Waves[Check.x, Check.y].BR; - } - } - } - else if (normal.y == 0) - { - if (normal.x == -1) - { - if (Waves[Check.x, Check.y].TR != -1) - { - Waves[Current.x, Current.y].TL = Waves[Check.x, Check.y].TR; - } - if (Waves[Check.x, Check.y].BR != -1) - { - Waves[Current.x, Current.y].BL = Waves[Check.x, Check.y].BR; - } - } - else if (normal.x == 1) - { - if (Waves[Check.x, Check.y].TL != -1) - { - Waves[Current.x, Current.y].TR = Waves[Check.x, Check.y].TL; - } - if (Waves[Check.x, Check.y].BL != -1) - { - Waves[Current.x, Current.y].BR = Waves[Check.x, Check.y].BL; - } - } - } - else - { - if (normal.y == 1 && normal.x == -1) - { - if (Waves[Check.x, Check.y].BR != -1) - { - Waves[Current.x, Current.y].TL = Waves[Check.x, Check.y].BR; - } - } - if (normal.y == 1 && normal.x == 1) - { - if (Waves[Check.x, Check.y].BL != -1) - { - Waves[Current.x, Current.y].TR = Waves[Check.x, Check.y].BL; - } - } - if (normal.y == -1 && normal.x == -1) - { - if (Waves[Check.x, Check.y].TR != -1) - { - Waves[Current.x, Current.y].BL = Waves[Check.x, Check.y].TR; - } - } - if (normal.y == -1 && normal.x == 1) - { - if (Waves[Check.x, Check.y].TL != -1) - { - Waves[Current.x, Current.y].BR = Waves[Check.x, Check.y].TL; - } - } - } - } - public bool Clean(Vector2Int Current) - { - List Yeat = new List(); - foreach (var item in Waves[Current.x, Current.y].Possible) - { - if (ToInt(item.BL) != Waves[Current.x, Current.y].BL && Waves[Current.x, Current.y].BL != -1) - { - Yeat.Add(item); - continue; - } - if (ToInt(item.BR) != Waves[Current.x, Current.y].BR && Waves[Current.x, Current.y].BR != -1) - { - Yeat.Add(item); - continue; - } - if (ToInt(item.TL) != Waves[Current.x, Current.y].TL && Waves[Current.x, Current.y].TL != -1) - { - Yeat.Add(item); - continue; - } - if (ToInt(item.TR) != Waves[Current.x, Current.y].TR && Waves[Current.x, Current.y].TR != -1) - { - Yeat.Add(item); - continue; - } - } - bool e = false; - foreach (var item in Yeat) - { - Waves[Current.x, Current.y].Possible.Remove(item); - e = true; - } - if (Waves[Current.x, Current.y].Possible.Count <= 1) - { - Waves[Current.x, Current.y].Entropy = 0; - } - return e; - } - public bool PathCheck() - { - return false; - } - public int ToInt(bool In) - { - if (In) - { - return 1; - } - return 0; - } - [System.Serializable] - public struct Tile - { - public TileBase tile; - public int weight; - public bool TL, TR, BL, BR; - } - public struct Wave - { - public float Entropy; - public List Possible; - public int TL, TR, BL, BR; - } -} diff --git a/Assets/Scripts/WFCGenerator.cs b/Assets/Scripts/WFCGenerator.cs index 3d683f2..cc1e624 100644 --- a/Assets/Scripts/WFCGenerator.cs +++ b/Assets/Scripts/WFCGenerator.cs @@ -1,6 +1,5 @@ using System.Collections; using System.Collections.Generic; -using UnityEditor; using UnityEngine; using UnityEngine.Tilemaps; using System.Threading; @@ -10,99 +9,100 @@ public class WFCGenerator : MonoBehaviour public Tiles[] tiles; public Vector2Int maxsize; public Tilemap ForeGround; - public Tilemap BackGround; public bool gen; - public float TimeToDraw; private Vector2Int yeat; private wave[,] waves; - [SerializeField][ReadOnly]private float timer; private Thread genthread; private bool done; - - // Start is called before the first frame update void Start() { - waves = new wave[maxsize.x, maxsize.y]; - for (int i = 0; i < waves.GetLength(0); i++) - { - for (int k = 0; k < waves.GetLength(1); k++) - { - waves[i, k].possible = new List(tiles); - } - } - timer = TimeToDraw; + genthread = new Thread(new ThreadStart(Generate)); } void OnDisable() { genthread.Interrupt(); genthread.Abort(); } - // Update is called once per frame void Update() { - if(timer <= 0) - { - draw(); - timer = TimeToDraw; - } if (gen) { gen = false; genthread = new Thread(new ThreadStart(Generate)); genthread.Start(); } - if(done) + if (genthread.ThreadState == ThreadState.Stopped && done) { - draw(); done = false; + draw(); } - timer -= Time.deltaTime; } - private void draw() + private void NewMap() { + waves = new wave[maxsize.x, maxsize.y]; for (int i = 0; i < waves.GetLength(0); i++) { for (int k = 0; k < waves.GetLength(1); k++) { - if (waves[i, k].possible.Count == 0) - { - ForeGround.SetTile(new Vector3Int(-i, -k, 0), waves[i, k].selected.tile); - } + waves[i, k].possible = new List(tiles); } } + for(int i = 0; i < tiles.Length; i++) + { + tiles[i].Globalweight = 0; + } } - private void Generate() + private void draw() { - //get all - waves = new wave[maxsize.x, maxsize.y]; for (int i = 0; i < waves.GetLength(0); i++) { for (int k = 0; k < waves.GetLength(1); k++) { - waves[i, k].possible = new List(tiles); + if (waves[i, k].possible.Count == 0) + { + ForeGround.SetTile(new Vector3Int(-i, -k, 0), waves[i, k].selected.tile); + } } } + } + private void Generate() + { while (true) { //select with low ent Debug.Log("getting with low entropy"); Vector2Int wav = new Vector2Int(0, 0); - int smallestent = 1000; - for (int i = 0; i < waves.GetLength(0); i++) + float smallestent = 1000; + for (int runs = 0; runs < 2; runs++) { - for (int k = 0; k < waves.GetLength(1); k++) + for (int i = 0; i < waves.GetLength(0); i++) { - if (waves[i, k].possible.Count < smallestent && waves[i, k].possible.Count != 0) + for (int k = 0; k < waves.GetLength(1); k++) { - smallestent = waves[i, k].possible.Count; - wav = new Vector2Int(i, k); + if(runs == 0) + { + float total = 0; + float logtotal = 0; + foreach(var item in waves[i, k].possible) + { + total += item.weight; + logtotal += Mathf.Log(item.weight, 2); + } + waves[i, k].entropy = Mathf.Log(total, 2) - (logtotal/total); + continue; + } + if (waves[i, k].entropy < smallestent && waves[i, k].entropy != 0) + { + smallestent = waves[i, k].possible.Count; + wav = new Vector2Int(i, k); + } } } } //set down Debug.Log("selecting random low entropy"); System.Random r = new System.Random(); - waves[wav.x, wav.y].selected = waves[wav.x, wav.y].possible[r.Next(0, smallestent)]; + waves[wav.x, wav.y].selected = waves[wav.x, wav.y].possible[r.Next(0, (int)smallestent)]; waves[wav.x, wav.y].possible.Clear(); //propagate Debug.Log("started propagation"); @@ -216,7 +216,7 @@ public class WFCGenerator : MonoBehaviour waves[Pos[0].x, Pos[0].y - 1].selected = waves[Pos[0].x, Pos[0].y - 1].possible[0]; waves[Pos[0].x, Pos[0].y - 1].possible.Clear(); } - if(gChange) + if (gChange) { Pos.Add(new Vector2Int(Pos[0].x, Pos[0].y - 1)); } @@ -256,7 +256,7 @@ public class WFCGenerator : MonoBehaviour waves[Pos[0].x + 1, Pos[0].y].selected = waves[Pos[0].x + 1, Pos[0].y].possible[0]; waves[Pos[0].x + 1, Pos[0].y].possible.Clear(); } - if(gChange) + if (gChange) { Pos.Add(new Vector2Int(Pos[0].x + 1, Pos[0].y)); } @@ -296,65 +296,32 @@ public class WFCGenerator : MonoBehaviour waves[Pos[0].x, Pos[0].y + 1].selected = waves[Pos[0].x, Pos[0].y + 1].possible[0]; waves[Pos[0].x, Pos[0].y + 1].possible.Clear(); } - if(gChange) + if (gChange) { Pos.Add(new Vector2Int(Pos[0].x, Pos[0].y + 1)); } } } Pos.Remove(Pos[0]); - /*foreach(var item in Pos) - { - Debug.Log(item.ToString()); - } - Thread.Sleep(1000); - if(Pos.Count <= 100) - { - Debug.Log("finnished a run: " + Pos.Count); - } - else if(Pos.Count % 100 == 0) - { - Debug.Log("finnished a run: " + Pos.Count); - }*/ return change; } private struct wave { public List possible; public Tiles selected; + public float entropy; } [System.Serializable] public struct Tiles { public TileBase tile; + public float weight; [Header("False Black / True White")] public bool TopLeft; public bool TopRight; public bool BottomLeft; public bool BottomRight; + [System.NonSerialized]public float Globalweight; } -} - public class ReadOnlyAttribute : PropertyAttribute - { - - } - - [CustomPropertyDrawer(typeof(ReadOnlyAttribute))] - public class ReadOnlyDrawer : PropertyDrawer - { - public override float GetPropertyHeight(SerializedProperty property, - GUIContent label) - { - return EditorGUI.GetPropertyHeight(property, label, true); - } - - public override void OnGUI(Rect position, - SerializedProperty property, - GUIContent label) - { - GUI.enabled = false; - EditorGUI.PropertyField(position, property, label, true); - GUI.enabled = true; - } - } \ No newline at end of file +} \ No newline at end of file diff --git a/Assets/Scripts/camera.cs b/Assets/Scripts/camera.cs index 58cd463..60b5627 100644 --- a/Assets/Scripts/camera.cs +++ b/Assets/Scripts/camera.cs @@ -5,27 +5,20 @@ using UnityEngine; public class camera : MonoBehaviour { - public Transform FollowedObject; + public Rigidbody2D FollowedObject; public Vector2 offset; private Vector2 dest; private Vector2 Vel; private Rigidbody2D RB; - private Rigidbody2D FolRB; - public Vector2 sus; public float Speed; private void Awake() { RB = this.gameObject.GetComponent(); - FolRB = FollowedObject.GetComponent(); } void Update() { - dest = FolRB.position + offset; + dest = FollowedObject.position + offset; Vel = RB.velocity; - RB.velocity = (new Vector2(MathF.Round(dest.x*4, MidpointRounding.AwayFromZero)/4, MathF.Round(dest.y*4, MidpointRounding.AwayFromZero)/4) - RB.position)*Vector2.Distance(RB.position, FolRB.position)/Speed; - } - void FixedUpdate() - { - + RB.velocity = (new Vector2(MathF.Round(dest.x*4, MidpointRounding.AwayFromZero)/4, MathF.Round(dest.y*4, MidpointRounding.AwayFromZero)/4) - RB.position)*Vector2.Distance(RB.position, FollowedObject.position)/Speed; } } \ No newline at end of file diff --git a/Assets/Scripts/rectangleroomgen.cs b/Assets/Scripts/rectangleroomgen.cs new file mode 100644 index 0000000..2a3501e --- /dev/null +++ b/Assets/Scripts/rectangleroomgen.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Tilemaps; + + +public class rectangleroomgen : MonoBehaviour +{ + public RuleTile Rule; + public Tilemap map; + public TileBase empty; + public GameObject player; + public GameObject Camera; + void Start() + { + System.Random ran = new System.Random(); + Vector2Int size = new Vector2Int(ran.Next(25, 50), ran.Next(10, 25)); + for (int x = 0; x < size.x+22; x++) + { + for (int y = 0; y < size.y+22; y++) + { + map.SetTile(new Vector3Int(x, y, 0), Rule); + } + } + for (int x = 11; x < size.x+11; x++) + { + for (int y = 11; y < size.y+11; y++) + { + map.SetTile(new Vector3Int(x, y, 0), empty); + } + } + player.transform.position = new Vector3((size.x)*8, (size.y)*8, 0); + } +} diff --git a/Assets/Scripts/RoomsGen.cs.meta b/Assets/Scripts/rectangleroomgen.cs.meta similarity index 83% rename from Assets/Scripts/RoomsGen.cs.meta rename to Assets/Scripts/rectangleroomgen.cs.meta index 0f25088..7b8eff3 100644 --- a/Assets/Scripts/RoomsGen.cs.meta +++ b/Assets/Scripts/rectangleroomgen.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6006dd3e743a0134591611bd775fe454 +guid: ca3b740468fd1ff4aa519d6585cc38a0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/~UnityDirMonSyncFile~f7dc15bce580e3247a2c4e2278c5f096~ b/Assets/~UnityDirMonSyncFile~f7dc15bce580e3247a2c4e2278c5f096~ new file mode 100644 index 0000000..e69de29 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 858b39f..c10a7d0 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -25,8 +25,237 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 124 + controlID: -1 --- !u!114 &2 +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: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 303 + y: 73 + width: 1099 + height: 640 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - /home/red/projekts/RatAttack2D/Library/PlayModeViewStates/8c40760acb5b93949a5b619942810555 + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1099, y: 618} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 1 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -549.5 + m_HBaseRangeMax: 549.5 + m_VBaseRangeMin: -309 + m_VBaseRangeMax: 309 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1099 + height: 619 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 549.5, y: 309.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -549.5 + y: -309.5 + width: 1099 + height: 619 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1099, y: 640} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &3 +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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneHierarchyWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 303 + height: 947 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 4} + m_Panes: + - {fileID: 4} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +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: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73 + width: 302 + height: 926 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 78620000 + m_LastClickedID: 25208 + m_ExpandedIDs: 1efbffff66620000846200008c620000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 3} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &5 +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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 6} + - {fileID: 8} + m_Position: + serializedVersion: 2 + x: 303 + y: 0 + width: 1101 + height: 947 + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: -1 +--- !u!114 &6 +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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1101 + height: 661 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 7} + - {fileID: 2} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -48,7 +277,7 @@ MonoBehaviour: serializedVersion: 2 x: 303 y: 73 - width: 1101 + width: 1099 height: 640 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -306,9 +535,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 313.72507, y: 149.383, z: -1.1724261} + m_Target: {x: 134.21945, y: 70.37811, z: -7.202164} speed: 2 - m_Value: {x: 313.72507, y: 149.383, z: -1.1724261} + m_Value: {x: 134.21945, y: 70.37811, z: -7.202164} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -359,9 +588,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 196.47821 + m_Target: 82.09329 speed: 2 - m_Value: 196.47821 + m_Value: 82.09329 m_Ortho: m_Target: 1 speed: 2 @@ -386,235 +615,6 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &3 -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: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneHierarchyWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 303 - height: 947 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 4} - m_Panes: - - {fileID: 4} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -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: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 73 - width: 302 - height: 926 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7a620000 - m_LastClickedID: 25210 - m_ExpandedIDs: bcf9ffff28fbffff7a620000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 3} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &5 -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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 8} - m_Position: - serializedVersion: 2 - x: 303 - y: 0 - width: 1103 - height: 947 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 125 ---- !u!114 &6 -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: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1103 - height: 661 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 2} - m_Panes: - - {fileID: 2} - - {fileID: 7} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &7 -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: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 303 - y: 73 - width: 1101 - height: 640 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - /home/red/projekts/RatAttack2D/Library/PlayModeViewStates/8c40760acb5b93949a5b619942810555 - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1100, y: 619} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 1 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -550 - m_HBaseRangeMax: 550 - m_VBaseRangeMin: -309.5 - m_VBaseRangeMax: 309.5 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1101 - height: 619 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 550.5, y: 309.5} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -550.5 - y: -309.5 - width: 1101 - height: 619 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1101, y: 640} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -625,25 +625,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 661 - width: 1103 + width: 1101 height: 286 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 9} + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} + m_ActualView: {fileID: 10} m_Panes: - {fileID: 9} - {fileID: 10} - {fileID: 11} - {fileID: 12} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -666,7 +666,7 @@ MonoBehaviour: serializedVersion: 2 x: 303 y: 734 - width: 1101 + width: 1099 height: 265 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -694,7 +694,7 @@ MonoBehaviour: serializedVersion: 2 x: 303 y: 734 - width: 1098 + width: 1099 height: 265 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -713,22 +713,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Materials/Grapic/ForegroundTiles/tiles m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Materials/Grapic/ForegroundTiles/tiles m_LastFoldersGridSize: -1 m_LastProjectPath: D:\repos\WIP\RatAttack2D m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: de630000 - m_LastClickedID: 25566 - m_ExpandedIDs: 00000000d063000000ca9a3b + m_SelectedIDs: 68640000 + m_LastClickedID: 25704 + m_ExpandedIDs: 0000000052640000546400005e6400006a64000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -756,7 +756,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000d0630000 + m_ExpandedIDs: 00000000526400005464000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -781,10 +781,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 0e250000 - m_LastClickedInstanceID: 9486 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000000000009272000038630000 + m_SelectedInstanceIDs: 78620000 + m_LastClickedInstanceID: 25208 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c62300000000000092720000386300001a630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -842,7 +842,7 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 25198 + m_LastSelectedObjectID: 25208 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -922,12 +922,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1406 + x: 1404 y: 0 - width: 514 + width: 516 height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -954,9 +954,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1406 + x: 1404 y: 73 - width: 513 + width: 515 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -995,9 +995,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1405 + x: 1404 y: 73 - width: 514 + width: 515 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 9418cc6..afaac63 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: Project + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 350} m_MaxSize: {x: 10000, y: 10000} @@ -120,7 +120,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 91 + controlID: 10923 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,8 +140,8 @@ MonoBehaviour: y: 0 width: 303 height: 947 - 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: 12} m_Panes: - {fileID: 12} @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 92 + controlID: 10924 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -193,10 +193,10 @@ MonoBehaviour: height: 661 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 11} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 11} - {fileID: 13} + - {fileID: 11} m_Selected: 0 m_LastSelected: 1 --- !u!114 &9 @@ -256,6 +256,157 @@ MonoBehaviour: m_Selected: 0 m_LastSelected: 1 --- !u!114 &11 +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: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 303 + y: 73 + width: 1099 + height: 640 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - /home/red/projekts/RatAttack2D/Library/PlayModeViewStates/8c40760acb5b93949a5b619942810555 + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1280, y: 720} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 1 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -640 + m_HBaseRangeMax: 640 + m_VBaseRangeMin: -360 + m_VBaseRangeMax: 360 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1099 + height: 619 + m_Scale: {x: 0.85859376, y: 0.85859376} + m_Translation: {x: 549.5, y: 309.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -640 + y: -360.47314 + width: 1280 + height: 720.9463 + m_MinimalGUI: 1 + m_defaultScale: 0.85859376 + m_LastWindowPixelSize: {x: 1099, y: 640} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 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: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73 + width: 302 + height: 926 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 1efbffff66620000846200008c620000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 6} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -535,9 +686,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -59.335045, y: 35.01681, z: -1.6116565} + m_Target: {x: 22.692488, y: 11.187645, z: -6.9449744} speed: 2 - m_Value: {x: -59.335045, y: 35.01681, z: -1.6116565} + m_Value: {x: 22.692488, y: 11.187645, z: -6.9449744} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -588,9 +739,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 33.56435 + m_Target: 63.515537 speed: 2 - m_Value: 33.56435 + m_Value: 63.515537 m_Ortho: m_Target: 1 speed: 2 @@ -615,157 +766,6 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 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: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 73 - width: 302 - height: 926 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 0e250000 - m_LastClickedID: 0 - m_ExpandedIDs: 28fbffff6662000084620000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 6} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &13 -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: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 303 - y: 73 - width: 1099 - height: 640 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - /home/red/projekts/RatAttack2D/Library/PlayModeViewStates/8c40760acb5b93949a5b619942810555 - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1099, y: 618} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 1 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -549.5 - m_HBaseRangeMax: 549.5 - m_VBaseRangeMin: -309 - m_VBaseRangeMax: 309 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1099 - height: 619 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 549.5, y: 309.5} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -549.5 - y: -309.5 - width: 1099 - height: 619 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1099, y: 640} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -835,22 +835,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Materials/Grapic/ForegroundTiles/tiles m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Materials/Grapic/ForegroundTiles/tiles m_LastFoldersGridSize: -1 m_LastProjectPath: D:\repos\WIP\RatAttack2D m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 56640000 - m_LastClickedID: 25686 - m_ExpandedIDs: 000000003c64000052640000b86a0000266e000000ca9a3b + m_SelectedIDs: 68640000 + m_LastClickedID: 25704 + m_ExpandedIDs: 0000000052640000546400005e6400006a64000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -878,7 +878,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000003c640000 + m_ExpandedIDs: 00000000526400005464000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -906,7 +906,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000000000009272000038630000 + m_ExpandedInstanceIDs: c62300000000000092720000386300001a630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -964,7 +964,7 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 25214 + m_LastSelectedObjectID: 25208 --- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52