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 | 384 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 296 insertions(+), 88 deletions(-)
diff --git a/Assets/Scenes/GameplayScene.unity b/Assets/Scenes/GameplayScene.unity
index 1c11e86..742f20d 100644
--- a/Assets/Scenes/GameplayScene.unity
+++ b/Assets/Scenes/GameplayScene.unity
@@ -123,6 +123,81 @@
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &28850376
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 28850377}
+ - component: {fileID: 28850379}
+ - component: {fileID: 28850378}
+ m_Layer: 5
+ m_Name: Border
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &28850377
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 28850376}
+ 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: 1082973126}
+ 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, y: 1}
+--- !u!114 &28850378
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 28850376}
+ 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: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 1295271971, guid: d664099639155da4996f48c5a731bc2c, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 1
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &28850379
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 28850376}
+ m_CullTransparentMesh: 1
--- !u!224 &105277890 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8463972149905527249, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
@@ -909,6 +984,81 @@
m_CorrespondingSourceObject: {fileID: 2368348636056148999, guid: c220ec455fce341408d66d880b464cad, type: 3}
m_PrefabInstance: {fileID: 257677327013671455}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &300370007
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 300370008}
+ - component: {fileID: 300370010}
+ - component: {fileID: 300370009}
+ m_Layer: 5
+ m_Name: Fill
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &300370008
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 300370007}
+ 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: 1082973126}
+ 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: -15.999999, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &300370009
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 300370007}
+ 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: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: -15255984, guid: d664099639155da4996f48c5a731bc2c, type: 3}
+ m_Type: 3
+ m_PreserveAspect: 1
+ m_FillCenter: 1
+ m_FillMethod: 0
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &300370010
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 300370007}
+ m_CullTransparentMesh: 1
--- !u!1001 &318061306
PrefabInstance:
m_ObjectHideFlags: 0
@@ -970,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
@@ -1065,7 +1153,7 @@
m_Father: {fileID: 1520567228}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {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}
@@ -1861,6 +1949,11 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 851154475}
m_CullTransparentMesh: 1
+--- !u!1 &977175855 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 2271361204546697504, guid: 1727dce3407104540a6bf21deb2957a8, type: 3}
+ m_PrefabInstance: {fileID: 1007461191}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1004733875
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2092,6 +2185,14 @@
- target: {fileID: 2271361204546697504, guid: 1727dce3407104540a6bf21deb2957a8, type: 3}
propertyPath: m_Name
value: LevelChanger
+ objectReference: {fileID: 0}
+ - target: {fileID: 2880792788494883435, guid: 1727dce3407104540a6bf21deb2957a8, type: 3}
+ propertyPath: m_AdditionalShaderChannelsFlag
+ value: 25
+ objectReference: {fileID: 0}
+ - target: {fileID: 4321010892148685286, guid: 1727dce3407104540a6bf21deb2957a8, type: 3}
+ propertyPath: m_text
+ value: Loading...
objectReference: {fileID: 0}
- target: {fileID: 7044154378667287598, guid: 1727dce3407104540a6bf21deb2957a8, type: 3}
propertyPath: m_LocalPosition.x
@@ -2371,6 +2472,95 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1042147644}
m_CullTransparentMesh: 1
+--- !u!1 &1082973124
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1082973126}
+ - component: {fileID: 1082973125}
+ m_Layer: 5
+ m_Name: HealthBar
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1082973125
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1082973124}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 0
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 0
+ 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: 0
+ m_TargetGraphic: {fileID: 0}
+ m_FillRect: {fileID: 300370008}
+ m_HandleRect: {fileID: 0}
+ m_Direction: 0
+ m_MinValue: 0
+ m_MaxValue: 1
+ m_WholeNumbers: 0
+ m_Value: 1
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!224 &1082973126
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1082973124}
+ 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: 28850377}
+ - {fileID: 300370008}
+ m_Father: {fileID: 2064964503}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -712, y: 362.19}
+ m_SizeDelta: {x: 176, y: 48}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1219825711
GameObject:
m_ObjectHideFlags: 0
@@ -3218,12 +3408,12 @@
- component: {fileID: 1398596077}
- component: {fileID: 1398596078}
m_Layer: 5
- m_Name: HealthBar
+ m_Name: HealthBar2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1398596077
RectTransform:
m_ObjectHideFlags: 0
@@ -3399,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
@@ -4323,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}
@@ -4486,12 +4675,18 @@
m_Script: {fileID: 11500000, guid: 000b2ca4a3c14d04e8c8a5c1084c700f, type: 3}
m_Name:
m_EditorClassIdentifier:
- width: 256
- height: 256
- scale: 20
- offsetX: 0
- offsetY: 0
- 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
@@ -4698,6 +4893,7 @@
m_Children:
- {fileID: 1398596077}
- {fileID: 153702489}
+ - {fileID: 1082973126}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -4718,7 +4914,7 @@
m_Name:
m_EditorClassIdentifier:
healthText: {fileID: 153702490}
- healthSlider: {fileID: 1398596078}
+ healthSlider: {fileID: 1082973125}
--- !u!1001 &2118694763
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4900,6 +5096,14 @@
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}
+ - target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: tilemap
value:
objectReference: {fileID: 1919262559}
@@ -4915,6 +5119,10 @@
propertyPath: pauseMenuUI
value:
objectReference: {fileID: 1504282393}
+ - target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
+ propertyPath: levelChanger
+ value:
+ objectReference: {fileID: 977175855}
- target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
--
Gitblit v1.9.3