From 625073a040238534dfe9fda1d7b3a2f415db84b3 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Thu, 03 Apr 2025 18:53:07 +0000
Subject: [PATCH] Merge branch 'develop' into #42-performance-chunk-generation
---
Assets/Scenes/GameplayScene.unity | 387 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 327 insertions(+), 60 deletions(-)
diff --git a/Assets/Scenes/GameplayScene.unity b/Assets/Scenes/GameplayScene.unity
index 564f44c..e7b2fb7 100644
--- a/Assets/Scenes/GameplayScene.unity
+++ b/Assets/Scenes/GameplayScene.unity
@@ -565,6 +565,140 @@
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6b54c0762333ea34a93ec05ccbb1330f, type: 3}
+--- !u!1 &456454177
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 456454178}
+ - component: {fileID: 456454179}
+ - component: {fileID: 456454180}
+ m_Layer: 5
+ m_Name: DepthMeter
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &456454178
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 456454177}
+ 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: 8239203837511537697}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0.000061035156, y: 0}
+ m_SizeDelta: {x: 200, y: 50}
+ m_Pivot: {x: 1, y: 1}
+--- !u!222 &456454179
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 456454177}
+ m_CullTransparentMesh: 1
+--- !u!114 &456454180
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 456454177}
+ 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: 'Y: 0'
+ 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: 28
+ m_fontSizeBase: 28
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 1
+ m_HorizontalAlignment: 4
+ m_VerticalAlignment: 256
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &519420028
GameObject:
m_ObjectHideFlags: 0
@@ -1452,6 +1586,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 1794216240}
- {fileID: 1919262557}
- {fileID: 1235149191}
m_Father: {fileID: 0}
@@ -1811,7 +1946,7 @@
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 1826729471}
m_HorizontalScrollbarVisibility: 2
- m_VerticalScrollbarVisibility: 0
+ m_VerticalScrollbarVisibility: 1
m_HorizontalScrollbarSpacing: -3
m_VerticalScrollbarSpacing: -3
m_OnValueChanged:
@@ -4386,6 +4521,126 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1725312356}
m_CullTransparentMesh: 1
+--- !u!1 &1794216239
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1794216240}
+ - component: {fileID: 1794216242}
+ - component: {fileID: 1794216241}
+ m_Layer: 6
+ m_Name: FogTilemap
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1794216240
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1794216239}
+ serializedVersion: 2
+ 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: 727795133}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!483693784 &1794216241
+TilemapRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1794216239}
+ m_Enabled: 0
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 1721078169
+ m_SortingLayer: -1
+ m_SortingOrder: 1
+ m_ChunkSize: {x: 32, y: 32, z: 32}
+ m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
+ m_MaxChunkCount: 16
+ m_MaxFrameAge: 16
+ m_SortOrder: 0
+ m_Mode: 0
+ m_DetectChunkCullingBounds: 0
+ m_MaskInteraction: 0
+--- !u!1839735485 &1794216242
+Tilemap:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1794216239}
+ m_Enabled: 1
+ m_Tiles: {}
+ m_AnimatedTiles: {}
+ m_TileAssetArray: []
+ m_TileSpriteArray: []
+ m_TileMatrixArray: []
+ m_TileColorArray: []
+ m_TileObjectToInstantiateArray: []
+ m_AnimationFrameRate: 1
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Origin: {x: 0, y: 0, z: 0}
+ m_Size: {x: 0, y: 0, z: 1}
+ m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
+ m_TileOrientation: 0
+ m_TileOrientationMatrix:
+ e00: 1
+ e01: 0
+ e02: 0
+ e03: 0
+ e10: 0
+ e11: 1
+ e12: 0
+ e13: 0
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
--- !u!1 &1826729469
GameObject:
m_ObjectHideFlags: 0
@@ -4882,6 +5137,7 @@
m_EditorClassIdentifier:
forestRuleTile: {fileID: 11400000, guid: 3999614e192b37546a6b710bf5ceb30c, type: 2}
borderTile: {fileID: 11400000, guid: dcef846474e534b45ab3b175559c19a2, type: 2}
+ tilePool: {fileID: 2140657251}
--- !u!1 &1955008394
GameObject:
m_ObjectHideFlags: 0
@@ -5126,6 +5382,50 @@
hasTopBuddy: 0
hasBottomBuddy: 0
reverseScale: 1
+--- !u!1 &2140657250
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2140657252}
+ - component: {fileID: 2140657251}
+ m_Layer: 0
+ m_Name: TilePool
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &2140657251
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2140657250}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ca130bf5edb364941807e577a7d1b7d6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!4 &2140657252
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2140657250}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 84.880615, y: -3.9463425, z: -2.3778288}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &18669457987763773
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5179,6 +5479,18 @@
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 851313892602111808, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
+ propertyPath: player
+ value:
+ objectReference: {fileID: 254538002}
+ - target: {fileID: 851313892602111808, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
+ propertyPath: fogTilemap
+ value:
+ objectReference: {fileID: 1794216242}
+ - target: {fileID: 851313892602111808, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
+ propertyPath: mainCamera
+ value:
+ objectReference: {fileID: 519420031}
- target: {fileID: 5654596948088327753, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: m_LocalPosition.x
value: 721.6197
@@ -5224,10 +5536,6 @@
value:
objectReference: {fileID: 1409843025}
- target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: tileMap
- value:
- objectReference: {fileID: 1919262559}
- - target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: tilemap
value:
objectReference: {fileID: 1919262559}
@@ -5236,9 +5544,9 @@
value:
objectReference: {fileID: 90387968388784992}
- target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: gameCanvas
+ propertyPath: fogTilemap
value:
- objectReference: {fileID: 90387968388784992}
+ objectReference: {fileID: 1794216242}
- target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: pauseMenuUI
value:
@@ -5251,30 +5559,6 @@
propertyPath: worldSpaceUI
value:
objectReference: {fileID: 97771189}
- - target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: lootTextPrefab
- value:
- objectReference: {fileID: 456827189715955869, guid: 9014e3792e948bf4e81fdfdc7f38c5d9, type: 3}
- - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: m_ActionEvents.Array.size
- value: 15
- objectReference: {fileID: 0}
- - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: m_ActionEvents.Array.data[14].m_ActionId
- value: b425611e-206f-4a50-938e-ad263b5330a1
- objectReference: {fileID: 0}
- - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: m_ActionEvents.Array.data[14].m_ActionName
- value: UI/Inventory[/Keyboard/b,/Keyboard/i]
- objectReference: {fileID: 0}
- - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.size
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
@@ -5283,33 +5567,9 @@
propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 7398061984209721034}
- - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnEscapedPressed
- objectReference: {fileID: 0}
- - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnInventoryButtonPressed
- objectReference: {fileID: 0}
- - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
- value: InventoryDisplay, Assembly-CSharp
- objectReference: {fileID: 0}
- - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- target: {fileID: 8598998496262044661, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: m_Name
value: GameManager
- objectReference: {fileID: 0}
- - target: {fileID: 8598998496262044661, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
- propertyPath: m_IsActive
- value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@@ -5792,6 +6052,10 @@
objectReference: {fileID: 0}
- target: {fileID: 3345854317100013954, guid: c220ec455fce341408d66d880b464cad, type: 3}
propertyPath: m_Name
+ value: Player
+ objectReference: {fileID: 0}
+ - target: {fileID: 3345854317100013954, guid: c220ec455fce341408d66d880b464cad, type: 3}
+ propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
m_RemovedComponents: []
@@ -6428,7 +6692,7 @@
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 9023304646215873866}
m_HorizontalScrollbarVisibility: 2
- m_VerticalScrollbarVisibility: 0
+ m_VerticalScrollbarVisibility: 1
m_HorizontalScrollbarSpacing: -3
m_VerticalScrollbarSpacing: -3
m_OnValueChanged:
@@ -7673,7 +7937,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -745, y: 395.14252}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 359.722, y: 53.584}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2657793602768780171
@@ -7845,6 +8109,7 @@
m_Name:
m_EditorClassIdentifier:
healthText: {fileID: 4871943362221616829}
+ depthMeterText: {fileID: 456454180}
healthSlider: {fileID: 5194951462332086948}
--- !u!114 &2768546151914192555
MonoBehaviour:
@@ -12790,12 +13055,13 @@
m_Children:
- {fileID: 2569421158530886717}
- {fileID: 6194941432802901942}
+ - {fileID: 456454178}
m_Father: {fileID: 4515621798426421079}
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_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 100, y: 100}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8252927260488856247
MonoBehaviour:
@@ -14042,3 +14308,4 @@
- {fileID: 318061306}
- {fileID: 1190838621}
- {fileID: 1162250618}
+ - {fileID: 2140657252}
--
Gitblit v1.9.3