From 576c113fadde0791c40fad63b374f9430f875af5 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Wed, 27 Dec 2023 18:17:22 +0000
Subject: [PATCH] Changed drops, no need just go directly into inventory
---
Assets/Scenes/GameplayScene.unity | 201 ++++++++------------------------------------------
1 files changed, 32 insertions(+), 169 deletions(-)
diff --git a/Assets/Scenes/GameplayScene.unity b/Assets/Scenes/GameplayScene.unity
index b16a381..742f20d 100644
--- a/Assets/Scenes/GameplayScene.unity
+++ b/Assets/Scenes/GameplayScene.unity
@@ -1120,68 +1120,6 @@
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6b54c0762333ea34a93ec05ccbb1330f, type: 3}
---- !u!1001 &391227262
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 1409843026}
- m_Modifications:
- - target: {fileID: 2334861655815823944, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- propertyPath: m_Name
- value: HealthPickup
- objectReference: {fileID: 0}
- - target: {fileID: 3069410814361871794, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- propertyPath: m_LocalPosition.x
- value: 7.09
- objectReference: {fileID: 0}
- - target: {fileID: 3069410814361871794, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.97
- objectReference: {fileID: 0}
- - target: {fileID: 3069410814361871794, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3069410814361871794, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3069410814361871794, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3069410814361871794, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3069410814361871794, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3069410814361871794, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3069410814361871794, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3069410814361871794, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
---- !u!4 &427702723 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 3069410814361871794, guid: 5549e8180a8b1ba49bf0de3848e7bcf9, type: 3}
- m_PrefabInstance: {fileID: 391227262}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &487206665
GameObject:
m_ObjectHideFlags: 0
@@ -2757,90 +2695,6 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1219825711}
m_CullTransparentMesh: 1
---- !u!1 &1220293564
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1220293565}
- - component: {fileID: 1220293566}
- m_Layer: 7
- m_Name: Drill
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1220293565
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1220293564}
- 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: 254538002}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &1220293566
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1220293564}
- m_Enabled: 0
- 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: 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: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 9b63dee9d78a1b44e9d4f8d91e41057e, 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!1 &1235149190
GameObject:
m_ObjectHideFlags: 0
@@ -3735,11 +3589,10 @@
m_GameObject: {fileID: 1409843025}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 4.0902042, y: 0.8252689, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 427702723}
+ m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1504282390
@@ -4659,25 +4512,25 @@
e33: 0
- m_RefCount: 0
m_Data:
- e00: 5.0497e-41
+ e00: 0
e01: 0
- e02: 5.5000076
- e03: 5.5000076
+ e02: 1.616307e-38
+ e03: 1.616307e-38
e10: 0
e11: 0
- e12: 5.55e-43
- e13: 5.55e-43
- e20: 0.000116169685
- e21: 8.914042e-18
- e22: -8.137887e-29
- e23: -1.1375036e-19
+ e12: 6.99e-43
+ e13: 6.99e-43
+ e20: -464782340
+ e21: 4.8868747e+30
+ e22: -7.2632837e-29
+ e23: -1.1956524e-19
e30: 4.5904e-41
- e31: 5.58e-43
- e32: 5.55e-43
- e33: 5.58e-43
+ e31: 7.02e-43
+ e32: 6.99e-43
+ e33: 7.02e-43
m_TileColorArray:
- m_RefCount: 0
- m_Data: {r: 4.2084e-41, g: 4.2084e-41, b: 4.2084e-41, a: 4.2084e-41}
+ m_Data: {r: 4.2134e-41, g: 4.2134e-41, b: 4.2134e-41, a: 4.2134e-41}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -4822,9 +4675,18 @@
m_Script: {fileID: 11500000, guid: 000b2ca4a3c14d04e8c8a5c1084c700f, type: 3}
m_Name:
m_EditorClassIdentifier:
- width: 256
- height: 256
- ruleTile: {fileID: 11400000, guid: e77c00aec3ec74f4a9ec15ef63c3f9a7, type: 2}
+ maxWidth: 256
+ maxHeight: 384
+ maxGroundHeight: 256
+ forestRuleTile: {fileID: 11400000, guid: e77c00aec3ec74f4a9ec15ef63c3f9a7, type: 2}
+ borderTile: {fileID: 11400000, guid: dcef846474e534b45ab3b175559c19a2, type: 2}
+ ores:
+ - name: Iron
+ weight: 7
+ clusterWeight: 40
+ tile: {fileID: 11400000, guid: 4d8deb60103293942a07fd9361be5e8f, type: 2}
+ maxSpawnHeight: 250
+ minSpawnHeight: 150
--- !u!1 &1990316377
GameObject:
m_ObjectHideFlags: 0
@@ -5234,6 +5096,10 @@
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
+ propertyPath: pickups
+ value:
+ objectReference: {fileID: 1409843025}
+ - target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: tileMap
value:
objectReference: {fileID: 1919262559}
@@ -5335,10 +5201,7 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 2368348636056148999, guid: c220ec455fce341408d66d880b464cad, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1220293565}
+ m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c220ec455fce341408d66d880b464cad, type: 3}
--- !u!1660057539 &9223372036854775807
--
Gitblit v1.9.3