From a23d6a313446e249c0e6b362dd6760587ddb30e0 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sat, 27 Apr 2019 20:13:28 +0200 Subject: [PATCH] Commit stuff? --- Assets/Animations.meta | 8 ++ Assets/Animators.meta | 8 ++ Assets/Assets.meta | 8 ++ Assets/PhysMats.meta | 8 ++ Assets/Prefabs/Enemy.prefab | 51 +++++++++ Assets/Prefabs/Enemy.prefab.meta | 7 ++ Assets/Prefabs/GameController.prefab | 164 ++++++++++++++++++++++++++- Assets/Prefabs/Player.prefab | 49 ++++++++ Assets/Prefabs/Player.prefab.meta | 7 ++ Assets/Scenes/Steffo.unity | 58 ++-------- Assets/Scripts/Map.cs | 2 +- Assets/Sounds.meta | 8 ++ 12 files changed, 325 insertions(+), 53 deletions(-) create mode 100644 Assets/Animations.meta create mode 100644 Assets/Animators.meta create mode 100644 Assets/Assets.meta create mode 100644 Assets/PhysMats.meta create mode 100644 Assets/Prefabs/Enemy.prefab create mode 100644 Assets/Prefabs/Enemy.prefab.meta create mode 100644 Assets/Prefabs/Player.prefab create mode 100644 Assets/Prefabs/Player.prefab.meta create mode 100644 Assets/Sounds.meta diff --git a/Assets/Animations.meta b/Assets/Animations.meta new file mode 100644 index 0000000..b2a79e2 --- /dev/null +++ b/Assets/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef3d86d84c224344a94715cdfa9fe32c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animators.meta b/Assets/Animators.meta new file mode 100644 index 0000000..7ff80b8 --- /dev/null +++ b/Assets/Animators.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 043f304edcc831c4ea9fcf0e1a2e520d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets.meta b/Assets/Assets.meta new file mode 100644 index 0000000..4eba494 --- /dev/null +++ b/Assets/Assets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0460346d99d385241a6d87bbd10aceb8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PhysMats.meta b/Assets/PhysMats.meta new file mode 100644 index 0000000..bc5b1b2 --- /dev/null +++ b/Assets/PhysMats.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e823a56cb429e4b49becdc740fba66b9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab new file mode 100644 index 0000000..6f6dade --- /dev/null +++ b/Assets/Prefabs/Enemy.prefab @@ -0,0 +1,51 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1164136568549368904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2043533519980591455} + - component: {fileID: 7440667849060313208} + m_Layer: 0 + m_Name: Enemy + m_TagString: Untagged + m_Icon: {fileID: 7174288486110832750, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2043533519980591455 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164136568549368904} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.7943853, y: 1.0483005, z: -91.41211} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7440667849060313208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164136568549368904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a72ad0eb2136f284bab78f19fa561bb8, type: 3} + m_Name: + m_EditorClassIdentifier: + hpMax: 0 + hp: 0 + isUndead: 0 + movesPerTurn: 0 + hasSpottedPlayer: 0 + sprite: {fileID: 0} diff --git a/Assets/Prefabs/Enemy.prefab.meta b/Assets/Prefabs/Enemy.prefab.meta new file mode 100644 index 0000000..feab3cc --- /dev/null +++ b/Assets/Prefabs/Enemy.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a4aeecfb369f0974490d158ef9489335 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab index e2319f9..9bfde67 100644 --- a/Assets/Prefabs/GameController.prefab +++ b/Assets/Prefabs/GameController.prefab @@ -23,10 +23,168 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2866215097817665852} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.18855336, y: 0.26111984, z: 34.533203} + 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_Children: [] + m_Children: + - {fileID: 5874724150191971617} + - {fileID: 368318821130531976} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1819628990077898199 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3211721187637284538} + m_Modifications: + - target: {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_Name + value: Enemy + objectReference: {fileID: 0} + - target: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_LocalPosition.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a4aeecfb369f0974490d158ef9489335, type: 3} +--- !u!4 &368318821130531976 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2043533519980591455, guid: a4aeecfb369f0974490d158ef9489335, + type: 3} + m_PrefabInstance: {fileID: 1819628990077898199} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8735699022713547399 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3211721187637284538} + m_Modifications: + - target: {fileID: 2935319493830293412, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293412, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: -5397416234189338067, guid: 0000000000000000d000000000000000, + type: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e8ff38be23e53db40a793f6959c6f4ec, type: 3} +--- !u!4 &5874724150191971617 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + m_PrefabInstance: {fileID: 8735699022713547399} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab new file mode 100644 index 0000000..d5ee144 --- /dev/null +++ b/Assets/Prefabs/Player.prefab @@ -0,0 +1,49 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2935319493830293412 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2935319493830293414} + - component: {fileID: 2935319493830293413} + m_Layer: 0 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2935319493830293414 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2935319493830293412} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2935319493830293413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2935319493830293412} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4de6b97c3d785d146a0df2c1c078fe91, type: 3} + m_Name: + m_EditorClassIdentifier: + exp: 0 + level: 0 + hpMax: 0 + hp: 0 diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta new file mode 100644 index 0000000..87e72f3 --- /dev/null +++ b/Assets/Prefabs/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e8ff38be23e53db40a793f6959c6f4ec +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Steffo.unity b/Assets/Scenes/Steffo.unity index 7dd5a86..3c5f20b 100644 --- a/Assets/Scenes/Steffo.unity +++ b/Assets/Scenes/Steffo.unity @@ -201,9 +201,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &5874724150884597007 +--- !u!1001 &1591665583 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -218,32 +218,32 @@ PrefabInstance: - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalPosition.x - value: 0.18855336 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalPosition.y - value: 0.26111984 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalPosition.z - value: 34.533203 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} @@ -253,7 +253,7 @@ PrefabInstance: - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} @@ -339,45 +339,5 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6907631410461015020, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: floorSprites.Array.size - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 6907631410461015020, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: roomsToGenerate - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 6907631410461015020, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: floorSprites.Array.data[2] - value: - objectReference: {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, - type: 3} - - target: {fileID: 6907631410461015020, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: floorSprites.Array.data[3] - value: - objectReference: {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, - type: 3} - - target: {fileID: 6907631410461015020, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: floorSprites.Array.data[4] - value: - objectReference: {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, - type: 3} - - target: {fileID: 6907631410461015020, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: floorSprites.Array.data[5] - value: - objectReference: {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, - type: 3} - - target: {fileID: 6907631410461015020, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: floorSprites.Array.data[1] - value: - objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, - type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd714ea41cb7c454994bf0f5ad99abd1, type: 3} diff --git a/Assets/Scripts/Map.cs b/Assets/Scripts/Map.cs index 7267d2f..d8ec176 100644 --- a/Assets/Scripts/Map.cs +++ b/Assets/Scripts/Map.cs @@ -120,7 +120,7 @@ public class Map : MonoBehaviour Tile tile = GetTile(position); tile.walkable = walkable; tile.sprite = tileSprite; - tile.roomPart = roomPart; + tile.roomPart |= roomPart; } private void FillWithWalls() { diff --git a/Assets/Sounds.meta b/Assets/Sounds.meta new file mode 100644 index 0000000..5fd147f --- /dev/null +++ b/Assets/Sounds.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19c0d85909aede34bb371863f187b9e0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: