diff --git a/DiceProbabilities/DiceProbabilities/bin/Debug/netstandard2.0/DiceProbabilities.dll b/DiceProbabilities/DiceProbabilities/bin/Debug/netstandard2.0/DiceProbabilities.dll index b616e06..7c09265 100644 Binary files a/DiceProbabilities/DiceProbabilities/bin/Debug/netstandard2.0/DiceProbabilities.dll and b/DiceProbabilities/DiceProbabilities/bin/Debug/netstandard2.0/DiceProbabilities.dll differ diff --git a/DungeonMapGenerator/DungeonMapConsolePrinter/Program.cs b/DungeonMapGenerator/DungeonMapConsolePrinter/Program.cs index 746e138..984da3a 100644 --- a/DungeonMapGenerator/DungeonMapConsolePrinter/Program.cs +++ b/DungeonMapGenerator/DungeonMapConsolePrinter/Program.cs @@ -1,6 +1,7 @@ // See https://aka.ms/new-console-template for more information using DungeonMapGenerator; +using DungeonMapGenerator.Rooms; class Program { diff --git a/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DiceProbabilities.dll b/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DiceProbabilities.dll index b616e06..7c09265 100644 Binary files a/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DiceProbabilities.dll and b/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DiceProbabilities.dll differ diff --git a/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapConsolePrinter.dll b/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapConsolePrinter.dll index c0bd6b7..cca522c 100644 Binary files a/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapConsolePrinter.dll and b/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapConsolePrinter.dll differ diff --git a/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapConsolePrinter.exe b/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapConsolePrinter.exe index 8e55002..c648e98 100644 Binary files a/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapConsolePrinter.exe and b/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapConsolePrinter.exe differ diff --git a/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapGenerator.dll b/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapGenerator.dll index 8cd40a0..6c279a4 100644 Binary files a/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapGenerator.dll and b/DungeonMapGenerator/DungeonMapConsolePrinter/bin/Debug/net9.0/DungeonMapGenerator.dll differ diff --git a/DungeonMapGenerator/DungeonMapGenerator/DungeonGenerator.cs b/DungeonMapGenerator/DungeonMapGenerator/DungeonGenerator.cs index 9d8b964..1b75a41 100644 --- a/DungeonMapGenerator/DungeonMapGenerator/DungeonGenerator.cs +++ b/DungeonMapGenerator/DungeonMapGenerator/DungeonGenerator.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Numerics; +using DungeonMapGenerator.Rooms; using Random = System.Random; namespace DungeonMapGenerator diff --git a/DungeonMapGenerator/DungeonMapGenerator/DungeonLockPopulator.cs b/DungeonMapGenerator/DungeonMapGenerator/DungeonLockPopulator.cs index 8a5a2df..b60b54d 100644 --- a/DungeonMapGenerator/DungeonMapGenerator/DungeonLockPopulator.cs +++ b/DungeonMapGenerator/DungeonMapGenerator/DungeonLockPopulator.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using DiceProbabilities; +using DungeonMapGenerator.Rooms; namespace DungeonMapGenerator { @@ -132,6 +133,7 @@ namespace DungeonMapGenerator if (extraLockCounter < maxExtraMonsterRoomLocks) { monsterRoom.ExtraLocks.Add(new Lock(adjacentRoom.Lock.GetLock())); + monsterRoom.AddBlockingRoom(adjacentRoom); extraLockCounter++; } } @@ -150,6 +152,7 @@ namespace DungeonMapGenerator if (extraLockCounter < maxExtraBossRooms) { bossRoom.ExtraLocks.Add(new Lock(adjacentRoom.Lock.GetLock())); + bossRoom.AddBlockingRoom(adjacentRoom); extraLockCounter++; } } diff --git a/DungeonMapGenerator/DungeonMapGenerator/DungeonLootPopulator.cs b/DungeonMapGenerator/DungeonMapGenerator/DungeonLootPopulator.cs index 6cd6ed9..ec74e63 100644 --- a/DungeonMapGenerator/DungeonMapGenerator/DungeonLootPopulator.cs +++ b/DungeonMapGenerator/DungeonMapGenerator/DungeonLootPopulator.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using DungeonMapGenerator.Rooms; namespace DungeonMapGenerator { @@ -39,7 +40,7 @@ namespace DungeonMapGenerator for (int i = 0; i < BOSS_ROOM_DAMAGE; i++) { - room.AddLoot(LootType.Diamond); + room.AddLoot(LootType.Damage); } break; } diff --git a/DungeonMapGenerator/DungeonMapGenerator/DungeonMap.cs b/DungeonMapGenerator/DungeonMapGenerator/DungeonMap.cs index e91d7dd..3f335f7 100644 --- a/DungeonMapGenerator/DungeonMapGenerator/DungeonMap.cs +++ b/DungeonMapGenerator/DungeonMapGenerator/DungeonMap.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using DungeonMapGenerator.Rooms; using Newtonsoft.Json; namespace DungeonMapGenerator diff --git a/DungeonMapGenerator/DungeonMapGenerator/EntranceRoom.cs b/DungeonMapGenerator/DungeonMapGenerator/EntranceRoom.cs index 87f7ba9..d535e08 100644 --- a/DungeonMapGenerator/DungeonMapGenerator/EntranceRoom.cs +++ b/DungeonMapGenerator/DungeonMapGenerator/EntranceRoom.cs @@ -1,3 +1,5 @@ +using DungeonMapGenerator.Rooms; + namespace DungeonMapGenerator { public class EntranceRoom : Room diff --git a/DungeonMapGenerator/DungeonMapGenerator/EvenDisperser.cs b/DungeonMapGenerator/DungeonMapGenerator/EvenDisperser.cs index f03ad01..2bf5e4a 100644 --- a/DungeonMapGenerator/DungeonMapGenerator/EvenDisperser.cs +++ b/DungeonMapGenerator/DungeonMapGenerator/EvenDisperser.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using DungeonMapGenerator.Rooms; using Random = System.Random; namespace DungeonMapGenerator diff --git a/DungeonMapGenerator/DungeonMapGenerator/Rooms/MonsterRoom.cs b/DungeonMapGenerator/DungeonMapGenerator/Rooms/MonsterRoom.cs index eb9157f..6402cc7 100644 --- a/DungeonMapGenerator/DungeonMapGenerator/Rooms/MonsterRoom.cs +++ b/DungeonMapGenerator/DungeonMapGenerator/Rooms/MonsterRoom.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using Newtonsoft.Json; namespace DungeonMapGenerator.Rooms { @@ -12,5 +13,26 @@ namespace DungeonMapGenerator.Rooms } public List ExtraLocks = new List(); + + [JsonProperty("BlockingRoomIds")] + private List _blockingRoomIds = new List(); + private List _blockingRooms = new List(); + + public void AddBlockingRoom(Room room) + { + _blockingRooms.Add(room); + _blockingRoomIds.Add(room.Id); + } + + public List GetBlockingRoomIds() + { + return _blockingRoomIds; + } + + public List GetBlockingRooms() + { + return _blockingRooms; + } + } } \ No newline at end of file diff --git a/DungeonMapGenerator/DungeonMapGenerator/bin/Debug/netstandard2.0/DiceProbabilities.dll b/DungeonMapGenerator/DungeonMapGenerator/bin/Debug/netstandard2.0/DiceProbabilities.dll index b616e06..7c09265 100644 Binary files a/DungeonMapGenerator/DungeonMapGenerator/bin/Debug/netstandard2.0/DiceProbabilities.dll and b/DungeonMapGenerator/DungeonMapGenerator/bin/Debug/netstandard2.0/DiceProbabilities.dll differ diff --git a/DungeonMapGenerator/DungeonMapGenerator/bin/Debug/netstandard2.0/DungeonMapGenerator.dll b/DungeonMapGenerator/DungeonMapGenerator/bin/Debug/netstandard2.0/DungeonMapGenerator.dll index 8cd40a0..6c279a4 100644 Binary files a/DungeonMapGenerator/DungeonMapGenerator/bin/Debug/netstandard2.0/DungeonMapGenerator.dll and b/DungeonMapGenerator/DungeonMapGenerator/bin/Debug/netstandard2.0/DungeonMapGenerator.dll differ diff --git a/PuzzleGameProject/Assets/Prefabs/Loot.meta b/PuzzleGameProject/Assets/Prefabs/Loot.meta new file mode 100644 index 0000000..cfc410d --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Loot.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c2a39074d0e6974abffbe0d8ad741f6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Prefabs/Loot/BossRoomLoot.prefab b/PuzzleGameProject/Assets/Prefabs/Loot/BossRoomLoot.prefab new file mode 100644 index 0000000..6d08fe9 --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Loot/BossRoomLoot.prefab @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6177664376029239970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5335934361605678981} + - component: {fileID: 8657646541086457408} + m_Layer: 0 + m_Name: BossRoomLoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5335934361605678981 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6177664376029239970} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.18, y: 0.18, z: 0.18} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8657646541086457408 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6177664376029239970} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + 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: 1624215951482189108, guid: 73c4fdf91ba912f46b2f65fd8045cff3, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 6.65, y: 7.31} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/PuzzleGameProject/Assets/Prefabs/Loot/BossRoomLoot.prefab.meta b/PuzzleGameProject/Assets/Prefabs/Loot/BossRoomLoot.prefab.meta new file mode 100644 index 0000000..0c9fe6a --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Loot/BossRoomLoot.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8c697c9f0a1100c42a351044f2de4430 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Prefabs/Loot/Chest.prefab b/PuzzleGameProject/Assets/Prefabs/Loot/Chest.prefab new file mode 100644 index 0000000..2cd7da1 --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Loot/Chest.prefab @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7623211689897389497 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8771607810497636724} + - component: {fileID: 82425453648701367} + m_Layer: 0 + m_Name: Chest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8771607810497636724 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7623211689897389497} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.18, y: 0.18, z: 0.18} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &82425453648701367 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7623211689897389497} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + 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: -2047444714636044383, guid: 01ced7ba524aa494d866b7bbf579ae8b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.87, y: 2.36} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/PuzzleGameProject/Assets/Prefabs/Loot/Chest.prefab.meta b/PuzzleGameProject/Assets/Prefabs/Loot/Chest.prefab.meta new file mode 100644 index 0000000..646ec95 --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Loot/Chest.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 71b4fbb4504b2cb4d84f428c2290eb24 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Prefabs/Loot/Diamond.prefab b/PuzzleGameProject/Assets/Prefabs/Loot/Diamond.prefab new file mode 100644 index 0000000..37c0241 --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Loot/Diamond.prefab @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8024871249303271850 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2193341219983027770} + - component: {fileID: 3397535165227845181} + m_Layer: 0 + m_Name: Diamond + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2193341219983027770 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8024871249303271850} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.18, y: 0.18, z: 0.18} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3397535165227845181 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8024871249303271850} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + 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: 51343329d535cf64ca202b9bf49be6d5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3, y: 3} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/PuzzleGameProject/Assets/Prefabs/Loot/Diamond.prefab.meta b/PuzzleGameProject/Assets/Prefabs/Loot/Diamond.prefab.meta new file mode 100644 index 0000000..1f5e8b4 --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Loot/Diamond.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 22049de4837a00441afd046eadbf8e27 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Prefabs/Loot/Diamonds.prefab b/PuzzleGameProject/Assets/Prefabs/Loot/Diamonds.prefab new file mode 100644 index 0000000..7f0c2be --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Loot/Diamonds.prefab @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5186510819950232936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4766078844305888754} + - component: {fileID: 1168684057175050590} + m_Layer: 0 + m_Name: Diamonds + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4766078844305888754 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5186510819950232936} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.018410403} + m_LocalScale: {x: -0.18, y: -0.18, z: -0.18} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1168684057175050590 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5186510819950232936} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + 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: d9006fcde78e20a4ba310182dc048261, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3, y: 3} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/PuzzleGameProject/Assets/Prefabs/Loot/Diamonds.prefab.meta b/PuzzleGameProject/Assets/Prefabs/Loot/Diamonds.prefab.meta new file mode 100644 index 0000000..86e17b2 --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Loot/Diamonds.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5a57ee5a862216644bcb99d3d39c83e5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Resources/Rooms/BossRoom.prefab b/PuzzleGameProject/Assets/Resources/Rooms/BossRoom.prefab index 1f857ed..ae3b0bd 100644 --- a/PuzzleGameProject/Assets/Resources/Rooms/BossRoom.prefab +++ b/PuzzleGameProject/Assets/Resources/Rooms/BossRoom.prefab @@ -111,6 +111,7 @@ Transform: - {fileID: 2539620726141895785} - {fileID: 3468303354545702297} - {fileID: 1970506867859126581} + - {fileID: 5383963564051426199} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3406749035128918688 @@ -130,7 +131,7 @@ MonoBehaviour: litRoom: {fileID: 8682678252917992992, guid: f64f7ca52dead154780dd3ce1ef99a90, type: 3} AdjacentRooms: [] IsEntrance: 0 - roomReward: {fileID: 0} + roomRewards: {fileID: 0} numberTextObject: {fileID: 8119019481281764985} healthTickObject: {fileID: 2885337975627474754} _health: 6 @@ -146,9 +147,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 686125cb666fff047a08043aa1feb0a8, type: 3} m_Name: m_EditorClassIdentifier: - diamonds: 0 - damage: 0 - chest: 0 + Diamonds: 0 + diamondsGO: {fileID: 3219581914120621641} + Damage: 0 + chestGO: {fileID: 0} + Chest: 0 --- !u!212 &1770509300873928573 SpriteRenderer: m_ObjectHideFlags: 0 @@ -498,6 +501,38 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 +--- !u!1 &3369660581269833763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5383963564051426199} + m_Layer: 0 + m_Name: Loot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5383963564051426199 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3369660581269833763} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.769, y: 0.726, z: -0.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3681751735185896302} + m_Father: {fileID: 9187907134033443523} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7488793311042651820 GameObject: m_ObjectHideFlags: 0 @@ -762,8 +797,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -824,3 +859,86 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &8724943305581810923 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5383963564051426199} + m_Modifications: + - target: {fileID: 5335934361605678981, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_LocalPosition.x + value: 0.105 + objectReference: {fileID: 0} + - target: {fileID: 5335934361605678981, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_LocalPosition.y + value: -1.426 + objectReference: {fileID: 0} + - target: {fileID: 5335934361605678981, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335934361605678981, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_LocalRotation.w + value: 0.77808815 + objectReference: {fileID: 0} + - target: {fileID: 5335934361605678981, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335934361605678981, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335934361605678981, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_LocalRotation.z + value: 0.6281552 + objectReference: {fileID: 0} + - target: {fileID: 5335934361605678981, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335934361605678981, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335934361605678981, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 77.828 + objectReference: {fileID: 0} + - target: {fileID: 6177664376029239970, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_Name + value: BossRoomLoot + objectReference: {fileID: 0} + - target: {fileID: 6177664376029239970, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8657646541086457408, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_Size.x + value: 6.7 + objectReference: {fileID: 0} + - target: {fileID: 8657646541086457408, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 73c4fdf91ba912f46b2f65fd8045cff3, type: 3} + - target: {fileID: 8657646541086457408, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} +--- !u!1 &3219581914120621641 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6177664376029239970, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + m_PrefabInstance: {fileID: 8724943305581810923} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3681751735185896302 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335934361605678981, guid: 8c697c9f0a1100c42a351044f2de4430, type: 3} + m_PrefabInstance: {fileID: 8724943305581810923} + m_PrefabAsset: {fileID: 0} diff --git a/PuzzleGameProject/Assets/Resources/Rooms/MonsterRoom.prefab b/PuzzleGameProject/Assets/Resources/Rooms/MonsterRoom.prefab index 6460e9a..5fd6fb1 100644 --- a/PuzzleGameProject/Assets/Resources/Rooms/MonsterRoom.prefab +++ b/PuzzleGameProject/Assets/Resources/Rooms/MonsterRoom.prefab @@ -112,6 +112,7 @@ Transform: - {fileID: 2539620726141895785} - {fileID: 5248487366693402692} - {fileID: 9112079120058374287} + - {fileID: 7379524192045016350} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3406749035128918688 @@ -131,7 +132,7 @@ MonoBehaviour: litRoom: {fileID: -6102877728980417268, guid: f64f7ca52dead154780dd3ce1ef99a90, type: 3} AdjacentRooms: [] IsEntrance: 0 - roomReward: {fileID: 0} + roomRewards: {fileID: 0} numberTextObject: {fileID: 8119019481281764985} healthTickObject: {fileID: 2885337975627474754} _health: 4 @@ -147,9 +148,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 686125cb666fff047a08043aa1feb0a8, type: 3} m_Name: m_EditorClassIdentifier: - diamonds: 0 - damage: 0 - chest: 0 + Diamonds: 0 + diamondsGO: {fileID: 7185463857937085828} + Damage: 0 + chestGO: {fileID: 0} + Chest: 0 --- !u!212 &1770509300873928573 SpriteRenderer: m_ObjectHideFlags: 0 @@ -691,8 +694,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -840,3 +843,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &2615981508756107500 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9187907134033443523} + m_Modifications: + - target: {fileID: 1168684057175050590, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1168684057175050590, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_Size.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1168684057175050590, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: aedbf87768c9f0a49a48c840e6f44192, type: 3} + - target: {fileID: 1168684057175050590, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4766078844305888754, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_LocalPosition.x + value: -0.57 + objectReference: {fileID: 0} + - target: {fileID: 4766078844305888754, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_LocalPosition.y + value: -0.591 + objectReference: {fileID: 0} + - target: {fileID: 4766078844305888754, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_LocalPosition.z + value: -0.018410403 + objectReference: {fileID: 0} + - target: {fileID: 4766078844305888754, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4766078844305888754, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4766078844305888754, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4766078844305888754, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4766078844305888754, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4766078844305888754, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4766078844305888754, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5186510819950232936, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_Name + value: Diamonds + objectReference: {fileID: 0} + - target: {fileID: 5186510819950232936, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} +--- !u!1 &7185463857937085828 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5186510819950232936, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + m_PrefabInstance: {fileID: 2615981508756107500} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7379524192045016350 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4766078844305888754, guid: 5a57ee5a862216644bcb99d3d39c83e5, type: 3} + m_PrefabInstance: {fileID: 2615981508756107500} + m_PrefabAsset: {fileID: 0} diff --git a/PuzzleGameProject/Assets/Resources/Rooms/Room.prefab b/PuzzleGameProject/Assets/Resources/Rooms/Room.prefab index 57a0cfa..625e220 100644 --- a/PuzzleGameProject/Assets/Resources/Rooms/Room.prefab +++ b/PuzzleGameProject/Assets/Resources/Rooms/Room.prefab @@ -37,6 +37,7 @@ Transform: - {fileID: 2539620726141895785} - {fileID: 5759602651856808200} - {fileID: 4197700764814813390} + - {fileID: 8574206842422454431} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &849256457500513523 @@ -71,7 +72,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 4061245896087561327} Damage: 0 + chestGO: {fileID: 2559421718761544190} Chest: 0 --- !u!212 &1770509300873928573 SpriteRenderer: @@ -189,6 +192,39 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 1, b: 0.09941673, a: 0.5} m_EffectDistance: {x: 10, y: 10} m_UseGraphicAlpha: 1 +--- !u!1 &2860717222458643703 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8574206842422454431} + m_Layer: 0 + m_Name: Loot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8574206842422454431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2860717222458643703} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.40355843, y: 0.049610563, z: -0.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5292345813521396735} + - {fileID: 3743881134161993011} + m_Father: {fileID: 9187907134033443523} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6810342086301101619 GameObject: m_ObjectHideFlags: 0 @@ -303,7 +339,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7488793311042651820} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.2} m_LocalScale: {x: 0.0008, y: 0.0008, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -452,8 +488,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -601,3 +637,173 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &5354765501673501767 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8574206842422454431} + m_Modifications: + - target: {fileID: 82425453648701367, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_FlipX + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 82425453648701367, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 82425453648701367, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_Size.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 82425453648701367, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a172635daf0b3db4b90e10824a7b920c, type: 3} + - target: {fileID: 82425453648701367, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7623211689897389497, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_Name + value: Chest + objectReference: {fileID: 0} + - target: {fileID: 7623211689897389497, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8771607810497636724, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_LocalPosition.x + value: -0.29255843 + objectReference: {fileID: 0} + - target: {fileID: 8771607810497636724, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_LocalPosition.y + value: 0.10938943 + objectReference: {fileID: 0} + - target: {fileID: 8771607810497636724, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8771607810497636724, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9560153 + objectReference: {fileID: 0} + - target: {fileID: 8771607810497636724, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8771607810497636724, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8771607810497636724, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_LocalRotation.z + value: -0.29331702 + objectReference: {fileID: 0} + - target: {fileID: 8771607810497636724, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8771607810497636724, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8771607810497636724, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -34.113 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} +--- !u!1 &2559421718761544190 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7623211689897389497, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + m_PrefabInstance: {fileID: 5354765501673501767} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3743881134161993011 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8771607810497636724, guid: 71b4fbb4504b2cb4d84f428c2290eb24, type: 3} + m_PrefabInstance: {fileID: 5354765501673501767} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6269679468696608197 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8574206842422454431} + m_Modifications: + - target: {fileID: 2193341219983027770, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_LocalPosition.x + value: -0.60255843 + objectReference: {fileID: 0} + - target: {fileID: 2193341219983027770, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_LocalPosition.y + value: -0.26261055 + objectReference: {fileID: 0} + - target: {fileID: 2193341219983027770, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2193341219983027770, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2193341219983027770, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2193341219983027770, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2193341219983027770, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2193341219983027770, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2193341219983027770, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2193341219983027770, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3397535165227845181, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 12c75eb8a2e326b4e9c47b9f7cb06a2c, type: 3} + - target: {fileID: 3397535165227845181, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8024871249303271850, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_Name + value: Diamond + objectReference: {fileID: 0} + - target: {fileID: 8024871249303271850, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 22049de4837a00441afd046eadbf8e27, type: 3} +--- !u!1 &4061245896087561327 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8024871249303271850, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + m_PrefabInstance: {fileID: 6269679468696608197} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5292345813521396735 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2193341219983027770, guid: 22049de4837a00441afd046eadbf8e27, type: 3} + m_PrefabInstance: {fileID: 6269679468696608197} + m_PrefabAsset: {fileID: 0} diff --git a/PuzzleGameProject/Assets/Scenes/good.unity b/PuzzleGameProject/Assets/Scenes/good.unity index cf30f08..159afa3 100644 --- a/PuzzleGameProject/Assets/Scenes/good.unity +++ b/PuzzleGameProject/Assets/Scenes/good.unity @@ -221,7 +221,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &24866557 MonoBehaviour: @@ -441,7 +443,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &59982194 MonoBehaviour: @@ -559,7 +563,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &258146133 MonoBehaviour: @@ -681,7 +687,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &290592942 MonoBehaviour: @@ -803,7 +811,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &291657576 MonoBehaviour: @@ -975,7 +985,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &349240177 MonoBehaviour: @@ -1237,7 +1249,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &373289708 MonoBehaviour: @@ -1324,6 +1338,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maxHealth: 20 + diamonds: 0 healthGameObject: {fileID: 1728296560} --- !u!114 &386902760 MonoBehaviour: @@ -1462,7 +1477,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 1 --- !u!114 &398957869 MonoBehaviour: @@ -1576,7 +1593,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &417044361 MonoBehaviour: @@ -1702,7 +1721,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &447713413 MonoBehaviour: @@ -1827,7 +1848,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &453622102 MonoBehaviour: @@ -1937,7 +1960,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 1 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &472124881 MonoBehaviour: @@ -2062,7 +2087,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &507616643 MonoBehaviour: @@ -2312,7 +2339,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &532650277 MonoBehaviour: @@ -2553,7 +2582,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &560607431 MonoBehaviour: @@ -2667,7 +2698,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &578402861 MonoBehaviour: @@ -2894,7 +2927,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &622855899 MonoBehaviour: @@ -3008,7 +3043,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &682065758 MonoBehaviour: @@ -3140,7 +3177,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 2 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &691119522 MonoBehaviour: @@ -3290,7 +3329,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 1 --- !u!114 &693652210 MonoBehaviour: @@ -3520,7 +3561,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &710649172 MonoBehaviour: @@ -3642,7 +3685,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &715463281 MonoBehaviour: @@ -3894,7 +3939,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &742102919 MonoBehaviour: @@ -4044,7 +4091,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &765692744 MonoBehaviour: @@ -4246,7 +4295,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 2 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &862251732 MonoBehaviour: @@ -4605,7 +4656,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &915027698 MonoBehaviour: @@ -4742,7 +4795,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &930469812 MonoBehaviour: @@ -4879,7 +4934,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &941766762 MonoBehaviour: @@ -5099,7 +5156,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &963299532 MonoBehaviour: @@ -5221,7 +5280,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &973875898 MonoBehaviour: @@ -5407,7 +5468,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1020577514 MonoBehaviour: @@ -5543,7 +5606,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 2 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1022997584 MonoBehaviour: @@ -5708,7 +5773,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1034756296 MonoBehaviour: @@ -5822,7 +5889,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1040405787 MonoBehaviour: @@ -5948,7 +6017,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1095006427 MonoBehaviour: @@ -6066,7 +6137,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1124108399 MonoBehaviour: @@ -6312,7 +6385,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 1 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1163278111 MonoBehaviour: @@ -6547,7 +6622,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1205870746 MonoBehaviour: @@ -6679,7 +6756,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 2 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1214588042 MonoBehaviour: @@ -6930,7 +7009,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1240982805 MonoBehaviour: @@ -7044,7 +7125,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1270391872 MonoBehaviour: @@ -7158,7 +7241,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1285801857 MonoBehaviour: @@ -7382,7 +7467,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1289415146 MonoBehaviour: @@ -7515,7 +7602,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1309379874 MonoBehaviour: @@ -8006,7 +8095,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1385963653 MonoBehaviour: @@ -8124,7 +8215,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1415587573 MonoBehaviour: @@ -8252,7 +8345,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 2 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1416265336 MonoBehaviour: @@ -8454,7 +8549,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1459255744 MonoBehaviour: @@ -8572,7 +8669,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1483915361 MonoBehaviour: @@ -8698,7 +8797,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1501157288 MonoBehaviour: @@ -8824,7 +8925,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1523203268 MonoBehaviour: @@ -8938,7 +9041,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1554471168 MonoBehaviour: @@ -9172,7 +9277,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1675017606 MonoBehaviour: @@ -9430,7 +9537,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1734282117 MonoBehaviour: @@ -9660,7 +9769,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 1 --- !u!114 &1784924602 MonoBehaviour: @@ -9789,7 +9900,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1786746155 MonoBehaviour: @@ -9899,7 +10012,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 1 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1788165685 MonoBehaviour: @@ -10153,7 +10268,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1827159054 MonoBehaviour: @@ -10278,7 +10395,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1833870568 MonoBehaviour: @@ -10399,7 +10518,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1879847997 MonoBehaviour: @@ -10521,7 +10642,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1886540602 MonoBehaviour: @@ -10646,7 +10769,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1894861327 MonoBehaviour: @@ -10760,7 +10885,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1941301956 MonoBehaviour: @@ -10990,7 +11117,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &1966691761 MonoBehaviour: @@ -11366,7 +11495,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &2039331331 MonoBehaviour: @@ -11492,7 +11623,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &2052524203 MonoBehaviour: @@ -11750,7 +11883,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &2082711421 MonoBehaviour: @@ -12011,7 +12146,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &2113948604 MonoBehaviour: @@ -12168,7 +12305,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 6 + diamondsGO: {fileID: 0} Damage: 2 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &2125037896 MonoBehaviour: @@ -12359,7 +12498,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Diamonds: 0 + diamondsGO: {fileID: 0} Damage: 0 + chestGO: {fileID: 0} Chest: 0 --- !u!114 &2138486833 MonoBehaviour: diff --git a/PuzzleGameProject/Assets/Scripts/DungeonGenerator/DungeonMapLoader.cs b/PuzzleGameProject/Assets/Scripts/DungeonGenerator/DungeonMapLoader.cs index e82497f..29451eb 100644 --- a/PuzzleGameProject/Assets/Scripts/DungeonGenerator/DungeonMapLoader.cs +++ b/PuzzleGameProject/Assets/Scripts/DungeonGenerator/DungeonMapLoader.cs @@ -135,7 +135,7 @@ namespace DungeonGenerator private void AddRewardsToRoomObject(GameObject roomGO, List loot) { - RoomRewards rewards = roomGO.AddComponent(); + RoomRewards rewards = roomGO.GetComponent(); foreach (LootType type in loot) { switch (type) diff --git a/PuzzleGameProject/Assets/Scripts/Player.cs b/PuzzleGameProject/Assets/Scripts/Player.cs index 4b00972..96f321e 100644 --- a/PuzzleGameProject/Assets/Scripts/Player.cs +++ b/PuzzleGameProject/Assets/Scripts/Player.cs @@ -5,6 +5,7 @@ using UnityEngine; public class Player : MonoBehaviour { [SerializeField] private int maxHealth; + [SerializeField] private int diamonds; [SerializeField] private GameObject healthGameObject; private int _healthIndex = 0; private readonly int[] _healthBar = {0, 0, -1, -2, -4, -6, -9, -12, -16, -20}; @@ -13,6 +14,11 @@ public class Player : MonoBehaviour UpdateGUI(); } + public void GetDiamonds(int count) + { + diamonds += count; + } + public void TakeDamage(int damage) { if (_healthIndex + damage < _healthBar.Length) diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/RoomRewards.cs b/PuzzleGameProject/Assets/Scripts/Rooms/RoomRewards.cs index b3c97c4..039e3f2 100644 --- a/PuzzleGameProject/Assets/Scripts/Rooms/RoomRewards.cs +++ b/PuzzleGameProject/Assets/Scripts/Rooms/RoomRewards.cs @@ -8,9 +8,25 @@ public class RoomRewards : MonoBehaviour public static event Action DamageDealt; [SerializeField] public int Diamonds = 0; + [SerializeField] private GameObject diamondsGO; [SerializeField] public int Damage = 0; + [SerializeField] private GameObject chestGO; [SerializeField] public bool Chest = false; - + + private void Start() + { + if (chestGO != null) + { + chestGO.SetActive(Chest); + } + + if (diamondsGO != null) + { + diamondsGO.SetActive(Diamonds > 0); + } + + } + public void TriggerGetReward() { if (Diamonds > 0) diff --git a/PuzzleGameProject/Assets/Sprites/Loot.meta b/PuzzleGameProject/Assets/Sprites/Loot.meta new file mode 100644 index 0000000..6491ad0 --- /dev/null +++ b/PuzzleGameProject/Assets/Sprites/Loot.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc14e1e540e29e14a8bdc7ddef6aa597 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Sprites/Loot/BossLoot.png b/PuzzleGameProject/Assets/Sprites/Loot/BossLoot.png new file mode 100644 index 0000000..804f877 Binary files /dev/null and b/PuzzleGameProject/Assets/Sprites/Loot/BossLoot.png differ diff --git a/PuzzleGameProject/Assets/Sprites/Loot/BossLoot.png.meta b/PuzzleGameProject/Assets/Sprites/Loot/BossLoot.png.meta new file mode 100644 index 0000000..fd7c6a3 --- /dev/null +++ b/PuzzleGameProject/Assets/Sprites/Loot/BossLoot.png.meta @@ -0,0 +1,247 @@ +fileFormatVersion: 2 +guid: 73c4fdf91ba912f46b2f65fd8045cff3 +TextureImporter: + internalIDToNameTable: + - first: + 213: -3130836436711522647 + second: BossLoot_0 + - first: + 213: 1624215951482189108 + second: BossLoot_1 + - first: + 213: 6593275572562594911 + second: BossLoot_2 + - first: + 213: -9134421534877013981 + second: BossLoot_3 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: BossLoot_0 + rect: + serializedVersion: 2 + x: 0 + y: 329 + width: 20 + height: 19 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 9aeb5f349d80d84d0800000000000000 + internalID: -3130836436711522647 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: BossLoot_1 + rect: + serializedVersion: 2 + x: 5 + y: 0 + width: 665 + height: 731 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 4357e9a6dcf5a8610800000000000000 + internalID: 1624215951482189108 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: BossLoot_2 + rect: + serializedVersion: 2 + x: 241 + y: 14 + width: 58 + height: 113 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f5c8ad85335008b50800000000000000 + internalID: 6593275572562594911 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: BossLoot_3 + rect: + serializedVersion: 2 + x: 333 + y: 93 + width: 6 + height: 11 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 3282af0a2040c3180800000000000000 + internalID: -9134421534877013981 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + BossLoot_0: -3130836436711522647 + BossLoot_1: 1624215951482189108 + BossLoot_2: 6593275572562594911 + BossLoot_3: -9134421534877013981 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 1.png b/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 1.png new file mode 100644 index 0000000..e570470 Binary files /dev/null and b/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 1.png differ diff --git a/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 1.png.meta b/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 1.png.meta new file mode 100644 index 0000000..aee52e7 --- /dev/null +++ b/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 1.png.meta @@ -0,0 +1,195 @@ +fileFormatVersion: 2 +guid: a172635daf0b3db4b90e10824a7b920c +TextureImporter: + internalIDToNameTable: + - first: + 213: -7190181604308839107 + second: Chest (1x1) 1_0 + - first: + 213: -2047444714636044383 + second: Chest (1x1) 1_1 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Chest (1x1) 1_0 + rect: + serializedVersion: 2 + x: 146 + y: 273 + width: 6 + height: 14 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d359f941de7573c90800000000000000 + internalID: -7190181604308839107 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Chest (1x1) 1_1 + rect: + serializedVersion: 2 + x: 5 + y: 29 + width: 287 + height: 236 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1a71ede31e30693e0800000000000000 + internalID: -2047444714636044383 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Chest (1x1) 1_0: -7190181604308839107 + Chest (1x1) 1_1: -2047444714636044383 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 5.png b/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 5.png new file mode 100644 index 0000000..197a285 Binary files /dev/null and b/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 5.png differ diff --git a/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 5.png.meta b/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 5.png.meta new file mode 100644 index 0000000..134ce7f --- /dev/null +++ b/PuzzleGameProject/Assets/Sprites/Loot/Chest (1x1) 5.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: 36cbc13325177f24996bb0e77c507c65 +TextureImporter: + internalIDToNameTable: + - first: + 213: -6056782884515290803 + second: Chest (1x1) 5_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Chest (1x1) 5_0 + rect: + serializedVersion: 2 + x: 18 + y: 0 + width: 280 + height: 300 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d41ecc68e0cf1fba0800000000000000 + internalID: -6056782884515290803 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Chest (1x1) 5_0: -6056782884515290803 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Sprites/Loot/Crystal (1x1) 1.png b/PuzzleGameProject/Assets/Sprites/Loot/Crystal (1x1) 1.png new file mode 100644 index 0000000..5a688a4 Binary files /dev/null and b/PuzzleGameProject/Assets/Sprites/Loot/Crystal (1x1) 1.png differ diff --git a/PuzzleGameProject/Assets/Sprites/Loot/Crystal (1x1) 1.png.meta b/PuzzleGameProject/Assets/Sprites/Loot/Crystal (1x1) 1.png.meta new file mode 100644 index 0000000..0cd77af --- /dev/null +++ b/PuzzleGameProject/Assets/Sprites/Loot/Crystal (1x1) 1.png.meta @@ -0,0 +1,195 @@ +fileFormatVersion: 2 +guid: 12c75eb8a2e326b4e9c47b9f7cb06a2c +TextureImporter: + internalIDToNameTable: + - first: + 213: 4550406555847589884 + second: Crystal (1x1) 1_0 + - first: + 213: -5112139106897652565 + second: Crystal (1x1) 1_1 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Crystal (1x1) 1_0 + rect: + serializedVersion: 2 + x: 46 + y: 108 + width: 10 + height: 19 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: cff77e847aa462f30800000000000000 + internalID: 4550406555847589884 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Crystal (1x1) 1_1 + rect: + serializedVersion: 2 + x: 72 + y: 72 + width: 167 + height: 228 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ba49bfa41980e09b0800000000000000 + internalID: -5112139106897652565 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Crystal (1x1) 1_0: 4550406555847589884 + Crystal (1x1) 1_1: -5112139106897652565 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Sprites/Loot/Crystals (1x1) 1.png b/PuzzleGameProject/Assets/Sprites/Loot/Crystals (1x1) 1.png new file mode 100644 index 0000000..5af8c34 Binary files /dev/null and b/PuzzleGameProject/Assets/Sprites/Loot/Crystals (1x1) 1.png differ diff --git a/PuzzleGameProject/Assets/Sprites/Loot/Crystals (1x1) 1.png.meta b/PuzzleGameProject/Assets/Sprites/Loot/Crystals (1x1) 1.png.meta new file mode 100644 index 0000000..a5c20e2 --- /dev/null +++ b/PuzzleGameProject/Assets/Sprites/Loot/Crystals (1x1) 1.png.meta @@ -0,0 +1,299 @@ +fileFormatVersion: 2 +guid: aedbf87768c9f0a49a48c840e6f44192 +TextureImporter: + internalIDToNameTable: + - first: + 213: -7654158699331675263 + second: Crystals (1x1) 1_0 + - first: + 213: 3729278577950256473 + second: Crystals (1x1) 1_1 + - first: + 213: 1279412527912424909 + second: Crystals (1x1) 1_2 + - first: + 213: 1796087095009925650 + second: Crystals (1x1) 1_3 + - first: + 213: 2172862123307043318 + second: Crystals (1x1) 1_4 + - first: + 213: 5382745765997960625 + second: Crystals (1x1) 1_5 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Crystals (1x1) 1_0 + rect: + serializedVersion: 2 + x: 30 + y: 199 + width: 19 + height: 24 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 18b9ed76737f6c590800000000000000 + internalID: -7654158699331675263 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Crystals (1x1) 1_1 + rect: + serializedVersion: 2 + x: 65 + y: 142 + width: 136 + height: 121 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 95de23bab1f01c330800000000000000 + internalID: 3729278577950256473 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Crystals (1x1) 1_2 + rect: + serializedVersion: 2 + x: 216 + y: 164 + width: 70 + height: 112 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: dc5976f5ae261c110800000000000000 + internalID: 1279412527912424909 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Crystals (1x1) 1_3 + rect: + serializedVersion: 2 + x: 35 + y: 43 + width: 90 + height: 91 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 21adab362bbfce810800000000000000 + internalID: 1796087095009925650 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Crystals (1x1) 1_4 + rect: + serializedVersion: 2 + x: 151 + y: 32 + width: 50 + height: 46 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 6f90e9db69e872e10800000000000000 + internalID: 2172862123307043318 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Crystals (1x1) 1_5 + rect: + serializedVersion: 2 + x: 179 + y: 55 + width: 91 + height: 84 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1bddb8251ca53ba40800000000000000 + internalID: 5382745765997960625 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Crystals (1x1) 1_0: -7654158699331675263 + Crystals (1x1) 1_1: 3729278577950256473 + Crystals (1x1) 1_2: 1279412527912424909 + Crystals (1x1) 1_3: 1796087095009925650 + Crystals (1x1) 1_4: 2172862123307043318 + Crystals (1x1) 1_5: 5382745765997960625 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/PuzzleGameProject/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset index 6e70bcd..653a151 100644 --- a/PuzzleGameProject/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset +++ b/PuzzleGameProject/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset @@ -11,7 +11,8 @@ Material: m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - OUTLINE_ON m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -36,7 +37,7 @@ Material: - _MaskSoftnessX: 0 - _MaskSoftnessY: 0 - _OutlineSoftness: 0 - - _OutlineWidth: 0 + - _OutlineWidth: 0.15 - _PerspectiveFilter: 0.875 - _ScaleRatioA: 0.9 - _ScaleRatioB: 1