diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab new file mode 100644 index 0000000..45735c3 --- /dev/null +++ b/Assets/Prefabs/GameController.prefab @@ -0,0 +1,49 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8523789084967070956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4174800862365466133} + - component: {fileID: 516178593971919101} + m_Layer: 0 + m_Name: GameController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4174800862365466133 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8523789084967070956} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &516178593971919101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8523789084967070956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21512d898f67c404d9a7519c0b7dcba8, type: 3} + m_Name: + m_EditorClassIdentifier: + levels: + - scene: {fileID: 102900000, guid: 6a72d2724c840fd47aab3aea136d312f, type: 3} + enemies: [] diff --git a/Assets/Prefabs/GameController.prefab.meta b/Assets/Prefabs/GameController.prefab.meta new file mode 100644 index 0000000..ef2c120 --- /dev/null +++ b/Assets/Prefabs/GameController.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c70b322607b9da64382c966f9fdf41b1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/LevelController.prefab b/Assets/Prefabs/LevelController.prefab new file mode 100644 index 0000000..1502cee --- /dev/null +++ b/Assets/Prefabs/LevelController.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8523789084967070956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4174800862365466133} + - component: {fileID: 626889921843831083} + m_Layer: 0 + m_Name: LevelController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4174800862365466133 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8523789084967070956} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &626889921843831083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8523789084967070956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67f50dd8d32d83d4891b1a18fd12ec38, type: 3} + m_Name: + m_EditorClassIdentifier: + enemies: [] diff --git a/Assets/Prefabs/LevelController.prefab.meta b/Assets/Prefabs/LevelController.prefab.meta new file mode 100644 index 0000000..f20255c --- /dev/null +++ b/Assets/Prefabs/LevelController.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 235b3ad8eb2fc6b43b3296d18a8a9d06 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Composing.unity b/Assets/Scenes/Composing.unity index ab914c0..f93110e 100644 --- a/Assets/Scenes/Composing.unity +++ b/Assets/Scenes/Composing.unity @@ -1304,7 +1304,7 @@ PrefabInstance: m_TransformParent: {fileID: 690075884} m_Modifications: - target: {fileID: 3284696129798561372, guid: cb78e85aa373c3a4498d453f91e6f5e0, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 9c0109e364aec314e90b4d1b28b893fa, type: 2} - target: {fileID: 3933166166638460809, guid: cb78e85aa373c3a4498d453f91e6f5e0, type: 3} @@ -1531,7 +1531,8 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [{fileID: 2420552906730569295, guid: c919829cf5c2674429d0cd37945d2b13, type: 3}] + m_RemovedGameObjects: + - {fileID: 2420552906730569295, guid: c919829cf5c2674429d0cd37945d2b13, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c919829cf5c2674429d0cd37945d2b13, type: 3} diff --git a/Assets/Scripts/Enemies.meta b/Assets/Scripts/Enemies.meta new file mode 100644 index 0000000..3eccf27 --- /dev/null +++ b/Assets/Scripts/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 775c6554dbb557740af9399208e5e947 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy.cs b/Assets/Scripts/Enemies/Enemy.cs similarity index 100% rename from Assets/Scripts/Enemy.cs rename to Assets/Scripts/Enemies/Enemy.cs diff --git a/Assets/Scripts/Enemy.cs.meta b/Assets/Scripts/Enemies/Enemy.cs.meta similarity index 100% rename from Assets/Scripts/Enemy.cs.meta rename to Assets/Scripts/Enemies/Enemy.cs.meta diff --git a/Assets/Scripts/Game.meta b/Assets/Scripts/Game.meta new file mode 100644 index 0000000..415fa1f --- /dev/null +++ b/Assets/Scripts/Game.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6eda34b3d0947274d9f031e73ca44c4c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game/GameController.cs b/Assets/Scripts/Game/GameController.cs new file mode 100644 index 0000000..4818e4e --- /dev/null +++ b/Assets/Scripts/Game/GameController.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class GameController : MonoBehaviour +{ + public List levels; +} + +[Serializable] +public class LevelInfo { + public SceneAsset scene; + public List enemies; +} + +[Serializable] +public class EnemyInLevel { + public GameObject enemy; + public int count; +} diff --git a/Assets/Scripts/Game/GameController.cs.meta b/Assets/Scripts/Game/GameController.cs.meta new file mode 100644 index 0000000..351264b --- /dev/null +++ b/Assets/Scripts/Game/GameController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 21512d898f67c404d9a7519c0b7dcba8 \ No newline at end of file diff --git a/Assets/Scripts/Game/LevelController.cs b/Assets/Scripts/Game/LevelController.cs new file mode 100644 index 0000000..20f1fd7 --- /dev/null +++ b/Assets/Scripts/Game/LevelController.cs @@ -0,0 +1,8 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +public class LevelController : MonoBehaviour +{ + public List spawnPoints; +} diff --git a/Assets/Scripts/Game/LevelController.cs.meta b/Assets/Scripts/Game/LevelController.cs.meta new file mode 100644 index 0000000..147e791 --- /dev/null +++ b/Assets/Scripts/Game/LevelController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 67f50dd8d32d83d4891b1a18fd12ec38 \ No newline at end of file diff --git a/Assets/Scripts/Player.meta b/Assets/Scripts/Player.meta new file mode 100644 index 0000000..81df1d3 --- /dev/null +++ b/Assets/Scripts/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a78510d754bdf9543b0b23e65b4c14bb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/BulletProjectile.cs b/Assets/Scripts/Player/BulletProjectile.cs similarity index 100% rename from Assets/Scripts/BulletProjectile.cs rename to Assets/Scripts/Player/BulletProjectile.cs diff --git a/Assets/Scripts/BulletProjectile.cs.meta b/Assets/Scripts/Player/BulletProjectile.cs.meta similarity index 100% rename from Assets/Scripts/BulletProjectile.cs.meta rename to Assets/Scripts/Player/BulletProjectile.cs.meta diff --git a/Assets/Scripts/CameraMovement.cs b/Assets/Scripts/Player/CameraMovement.cs similarity index 100% rename from Assets/Scripts/CameraMovement.cs rename to Assets/Scripts/Player/CameraMovement.cs diff --git a/Assets/Scripts/CameraMovement.cs.meta b/Assets/Scripts/Player/CameraMovement.cs.meta similarity index 100% rename from Assets/Scripts/CameraMovement.cs.meta rename to Assets/Scripts/Player/CameraMovement.cs.meta diff --git a/Assets/Scripts/Pistol.cs b/Assets/Scripts/Player/Pistol.cs similarity index 100% rename from Assets/Scripts/Pistol.cs rename to Assets/Scripts/Player/Pistol.cs diff --git a/Assets/Scripts/Pistol.cs.meta b/Assets/Scripts/Player/Pistol.cs.meta similarity index 100% rename from Assets/Scripts/Pistol.cs.meta rename to Assets/Scripts/Player/Pistol.cs.meta diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs similarity index 100% rename from Assets/Scripts/PlayerMovement.cs rename to Assets/Scripts/Player/PlayerMovement.cs diff --git a/Assets/Scripts/PlayerMovement.cs.meta b/Assets/Scripts/Player/PlayerMovement.cs.meta similarity index 100% rename from Assets/Scripts/PlayerMovement.cs.meta rename to Assets/Scripts/Player/PlayerMovement.cs.meta diff --git a/Assets/Scripts/Weapon.cs b/Assets/Scripts/Player/Weapon.cs similarity index 100% rename from Assets/Scripts/Weapon.cs rename to Assets/Scripts/Player/Weapon.cs diff --git a/Assets/Scripts/Weapon.cs.meta b/Assets/Scripts/Player/Weapon.cs.meta similarity index 100% rename from Assets/Scripts/Weapon.cs.meta rename to Assets/Scripts/Player/Weapon.cs.meta diff --git a/Assets/Scripts/WeaponController.cs b/Assets/Scripts/Player/WeaponController.cs similarity index 100% rename from Assets/Scripts/WeaponController.cs rename to Assets/Scripts/Player/WeaponController.cs diff --git a/Assets/Scripts/WeaponController.cs.meta b/Assets/Scripts/Player/WeaponController.cs.meta similarity index 100% rename from Assets/Scripts/WeaponController.cs.meta rename to Assets/Scripts/Player/WeaponController.cs.meta