From a31c6a16ddca150766dcb0e0a9d9d3cf970c71fe Mon Sep 17 00:00:00 2001 From: Janis Date: Fri, 3 Jun 2022 22:53:35 +0200 Subject: [PATCH] a --- Assets/Items.meta | 8 + Assets/Items/testItem.meta | 8 + Assets/Items/testItem/TestItemPrefab.prefab | 99 +++ .../Items/testItem/TestItemPrefab.prefab.meta | 7 + Assets/Items/testItem/TestItemSO.asset | 18 + Assets/Items/testItem/TestItemSO.asset.meta | 8 + Assets/Items/testItem/testItem.png | Bin 0 -> 146 bytes Assets/Items/testItem/testItem.png.meta | 122 ++++ Assets/Items/testItem/testItemObject.cs | 3 + Assets/Items/testItem/testItemObject.cs.meta | 11 + Assets/Scenes/SampleScene.unity | 629 ++++++++++++++++++ Assets/Scripts/Dictionaries/ItemDictionary.cs | 4 + .../Dictionaries/ItemDictionary.cs.meta | 11 + .../Scripts/GridSystem/GridBuildingSystem.cs | 1 - Assets/Scripts/HUD.meta | 8 + Assets/Scripts/Items.meta | 8 + Assets/Scripts/Items/ItemObject.cs | 7 + Assets/Scripts/Items/ItemObject.cs.meta | 11 + Assets/Scripts/Items/ItemSO.cs | 16 + Assets/Scripts/Items/ItemSO.cs.meta | 11 + Assets/Scripts/Player/PlayerController.cs | 22 +- 21 files changed, 1005 insertions(+), 7 deletions(-) create mode 100644 Assets/Items.meta create mode 100644 Assets/Items/testItem.meta create mode 100644 Assets/Items/testItem/TestItemPrefab.prefab create mode 100644 Assets/Items/testItem/TestItemPrefab.prefab.meta create mode 100644 Assets/Items/testItem/TestItemSO.asset create mode 100644 Assets/Items/testItem/TestItemSO.asset.meta create mode 100644 Assets/Items/testItem/testItem.png create mode 100644 Assets/Items/testItem/testItem.png.meta create mode 100644 Assets/Items/testItem/testItemObject.cs create mode 100644 Assets/Items/testItem/testItemObject.cs.meta create mode 100644 Assets/Scripts/Dictionaries/ItemDictionary.cs create mode 100644 Assets/Scripts/Dictionaries/ItemDictionary.cs.meta create mode 100644 Assets/Scripts/HUD.meta create mode 100644 Assets/Scripts/Items.meta create mode 100644 Assets/Scripts/Items/ItemObject.cs create mode 100644 Assets/Scripts/Items/ItemObject.cs.meta create mode 100644 Assets/Scripts/Items/ItemSO.cs create mode 100644 Assets/Scripts/Items/ItemSO.cs.meta diff --git a/Assets/Items.meta b/Assets/Items.meta new file mode 100644 index 0000000..f1b9a06 --- /dev/null +++ b/Assets/Items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fea206c2c84eaf4ead0373989d28aed +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/testItem.meta b/Assets/Items/testItem.meta new file mode 100644 index 0000000..6465040 --- /dev/null +++ b/Assets/Items/testItem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a67032ccbaef1f4685749bf9208f3f2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/testItem/TestItemPrefab.prefab b/Assets/Items/testItem/TestItemPrefab.prefab new file mode 100644 index 0000000..2dbc1e7 --- /dev/null +++ b/Assets/Items/testItem/TestItemPrefab.prefab @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8936059402275091554 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8936059402275091559} + - component: {fileID: 8936059402275091552} + - component: {fileID: 8936059402275091553} + m_Layer: 0 + m_Name: TestItemPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8936059402275091559 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8936059402275091554} + 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_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8936059402275091552 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8936059402275091554} + 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_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: f703c137a9648eb4bbffb1f6b1aed05e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.16, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &8936059402275091553 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8936059402275091554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13d2bec61636f894382663d9818c4fc9, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Items/testItem/TestItemPrefab.prefab.meta b/Assets/Items/testItem/TestItemPrefab.prefab.meta new file mode 100644 index 0000000..0616e65 --- /dev/null +++ b/Assets/Items/testItem/TestItemPrefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 984beb37a1541ed40a2271c6ecb1162d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/testItem/TestItemSO.asset b/Assets/Items/testItem/TestItemSO.asset new file mode 100644 index 0000000..5977826 --- /dev/null +++ b/Assets/Items/testItem/TestItemSO.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 91bfeda1bf899b140a446b5d5e85504c, type: 3} + m_Name: TestItemSO + m_EditorClassIdentifier: + id: item_test + name: TestItem + prefab: {fileID: 0} + icon: {fileID: 21300000, guid: f703c137a9648eb4bbffb1f6b1aed05e, type: 3} diff --git a/Assets/Items/testItem/TestItemSO.asset.meta b/Assets/Items/testItem/TestItemSO.asset.meta new file mode 100644 index 0000000..90440ef --- /dev/null +++ b/Assets/Items/testItem/TestItemSO.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0f55babfac9e40449a536985ff95fa9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/testItem/testItem.png b/Assets/Items/testItem/testItem.png new file mode 100644 index 0000000000000000000000000000000000000000..845e59ab45c27a4c8e0b75d424ea3abc0880ebd8 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|d^}woLo9le z6C^SYba+3i`nvA_iJG%v=4-MxaxKa}md??}pm%l$PvW8FGb9W?ux&UX(ekH{+hEda sNwFC{Pj2xTw +{ + public override ItemSO GetEntryById(string id) => entries.Find(entry => entry.id == id); +} diff --git a/Assets/Scripts/Dictionaries/ItemDictionary.cs.meta b/Assets/Scripts/Dictionaries/ItemDictionary.cs.meta new file mode 100644 index 0000000..ba6a567 --- /dev/null +++ b/Assets/Scripts/Dictionaries/ItemDictionary.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8b622d1e196b7dd49ac167a5ab14be35 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GridSystem/GridBuildingSystem.cs b/Assets/Scripts/GridSystem/GridBuildingSystem.cs index 76d3b9f..f17fa0c 100644 --- a/Assets/Scripts/GridSystem/GridBuildingSystem.cs +++ b/Assets/Scripts/GridSystem/GridBuildingSystem.cs @@ -207,7 +207,6 @@ public class GridBuildingSystem : MonoBehaviour ClearConveyorPath(); List pathPoints = VectorDrawing.FindVectorPath(conveyorStartPosition, endPosition); - Debug.Log(pathPoints.Count); foreach (Vector2Int position in pathPoints) { GameObject conveyorBlueprint = Instantiate(selectedPlacedObjectTypeSO.prefab.gameObject, new Vector3(position.x, position.y), Quaternion.identity); diff --git a/Assets/Scripts/HUD.meta b/Assets/Scripts/HUD.meta new file mode 100644 index 0000000..c7c8b2c --- /dev/null +++ b/Assets/Scripts/HUD.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85e60c6cf9544ec4b894b75552d3cb91 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Items.meta b/Assets/Scripts/Items.meta new file mode 100644 index 0000000..981b557 --- /dev/null +++ b/Assets/Scripts/Items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 86655ae5bc954a14fa411b0b8d0c7f04 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Items/ItemObject.cs b/Assets/Scripts/Items/ItemObject.cs new file mode 100644 index 0000000..d0e2f6f --- /dev/null +++ b/Assets/Scripts/Items/ItemObject.cs @@ -0,0 +1,7 @@ +using UnityEngine; + +public class ItemObject : ScriptableObject +{ + public ItemSO itemSO; + +} diff --git a/Assets/Scripts/Items/ItemObject.cs.meta b/Assets/Scripts/Items/ItemObject.cs.meta new file mode 100644 index 0000000..7d6165d --- /dev/null +++ b/Assets/Scripts/Items/ItemObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8ef5c356495e3ed4c8b0df5bdb15c9d5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Items/ItemSO.cs b/Assets/Scripts/Items/ItemSO.cs new file mode 100644 index 0000000..650b73f --- /dev/null +++ b/Assets/Scripts/Items/ItemSO.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +[CreateAssetMenu(menuName = "ScriptableObjects/ItemSO")] +public class ItemSO : ScriptableObject +{ + public string id; + public string name; + public GameObject prefab; + public Sprite icon; + + public void Spawn(Vector3 position) + { + GameObject item = Instantiate(prefab, position, Quaternion.identity); + item.name = name; + } +} diff --git a/Assets/Scripts/Items/ItemSO.cs.meta b/Assets/Scripts/Items/ItemSO.cs.meta new file mode 100644 index 0000000..1deae75 --- /dev/null +++ b/Assets/Scripts/Items/ItemSO.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 91bfeda1bf899b140a446b5d5e85504c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 263e8c1..f04aff2 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -17,9 +17,7 @@ public class PlayerController : MonoBehaviour // demolish if (Input.GetButtonDown("Demolish")) { - Debug.Log("Demolish"); - demolishMode = !demolishMode; - movingMode = false; + ToggleDemolishMode(); } if (demolishMode && Input.GetMouseButton(0) && MenuManager.AllMenusClosed()) @@ -31,9 +29,7 @@ public class PlayerController : MonoBehaviour // moving if (Input.GetButtonDown("Move")) { - Debug.Log("Move"); - movingMode = !movingMode; - demolishMode = false; + ToggleMovingMode(); } if (movingMode && Input.GetMouseButtonDown(0) && MenuManager.AllMenusClosed()) @@ -44,4 +40,18 @@ public class PlayerController : MonoBehaviour movingMode = false; } } + + public void ToggleDemolishMode() + { + Debug.Log("Demolish"); + demolishMode = !demolishMode; + movingMode = false; + } + + public void ToggleMovingMode() + { + Debug.Log("Move"); + movingMode = !movingMode; + demolishMode = false; + } }