diff --git a/Assets/Minimap.meta b/Assets/Minimap.meta new file mode 100644 index 0000000..735e219 --- /dev/null +++ b/Assets/Minimap.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 209358740247fa649b9ebac7cb58acb3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Minimap/Minimap.cs b/Assets/Minimap/Minimap.cs new file mode 100644 index 0000000..ac029d7 --- /dev/null +++ b/Assets/Minimap/Minimap.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Minimap : MonoBehaviour +{ + [SerializeField] private Transform player; + + private void LateUpdate() + { + Vector3 newPosition = player.position; + newPosition.y = transform.position.y; + transform.position = newPosition; + + transform.rotation = Quaternion.Euler(90f, player.eulerAngles.y, 0f); + } +} diff --git a/Assets/Scripts/EventLog.cs.meta b/Assets/Minimap/Minimap.cs.meta similarity index 83% rename from Assets/Scripts/EventLog.cs.meta rename to Assets/Minimap/Minimap.cs.meta index 881c62f..ef0e45a 100644 --- a/Assets/Scripts/EventLog.cs.meta +++ b/Assets/Minimap/Minimap.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 41974f676d374a946813f4863f75f978 +guid: cae4d204e179a7d4d87a943ab285ac92 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Minimap/MinimapTexture.renderTexture b/Assets/Minimap/MinimapTexture.renderTexture new file mode 100644 index 0000000..4c02518 --- /dev/null +++ b/Assets/Minimap/MinimapTexture.renderTexture @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MinimapTexture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 256 + m_Height: 256 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/Minimap/MinimapTexture.renderTexture.meta b/Assets/Minimap/MinimapTexture.renderTexture.meta new file mode 100644 index 0000000..bad2175 --- /dev/null +++ b/Assets/Minimap/MinimapTexture.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2528b91a6c8f85e44b612cc07ebb36ae +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Minimap/cirlce_mask.png b/Assets/Minimap/cirlce_mask.png new file mode 100644 index 0000000..3a6f88a Binary files /dev/null and b/Assets/Minimap/cirlce_mask.png differ diff --git a/Assets/Minimap/cirlce_mask.png.meta b/Assets/Minimap/cirlce_mask.png.meta new file mode 100644 index 0000000..a5cc3bd --- /dev/null +++ b/Assets/Minimap/cirlce_mask.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: a66b22992cd93ab42a8322c679eaa976 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 8b84ca7..25aebb3 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -202,7 +202,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 708126143} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -660,7 +660,6 @@ RectTransform: m_Children: - {fileID: 185435515} - {fileID: 1048269304} - - {fileID: 1690461076} - {fileID: 114639928} - {fileID: 1395840125} m_Father: {fileID: 0} @@ -983,7 +982,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 708126143} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1177,105 +1176,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} m_PrefabInstance: {fileID: 1440733975} m_PrefabAsset: {fileID: 0} ---- !u!1 &1690461075 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1690461076} - - component: {fileID: 1690461079} - - component: {fileID: 1690461078} - - component: {fileID: 1690461077} - m_Layer: 5 - m_Name: EventLog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1690461076 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1690461075} - 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: 708126143} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -150, y: 0} - m_SizeDelta: {x: 300, y: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1690461077 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1690461075} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1690461078 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1690461075} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1690461079 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1690461075} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!4 &1735927146 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} @@ -1414,7 +1314,6 @@ GameObject: m_Component: - component: {fileID: 1861247505} - component: {fileID: 1861247504} - - component: {fileID: 1861247506} - component: {fileID: 1861247507} - component: {fileID: 1861247508} m_Layer: 0 @@ -1452,21 +1351,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1861247506 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1861247503} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41974f676d374a946813f4863f75f978, type: 3} - m_Name: - m_EditorClassIdentifier: - eventObject: {fileID: 8681335675325213624, guid: 240f676d062888042ac64a67d71aaa9d, type: 3} - parentEventObject: {fileID: 1690461076} - events: [] --- !u!114 &1861247507 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs b/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs index b26daf9..415604f 100644 --- a/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs +++ b/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs @@ -14,15 +14,12 @@ public class HouseConstruction : BuildingConstruction public override void Init() { - gameManager = GameObject.Find("GameManager"); - gameManager.GetComponent().CreateEvent("Construction: House"); } public override bool CheckForResources() { if (havingWood == neededWood) { - gameManager.GetComponent().CreateEvent("Construction: House: finished"); return true; } return false; diff --git a/Assets/Scripts/EventLog.cs b/Assets/Scripts/EventLog.cs deleted file mode 100644 index e0b30ad..0000000 --- a/Assets/Scripts/EventLog.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class EventLog : MonoBehaviour -{ - [Header("Event Log")] - [SerializeField] private GameObject eventObject; - [SerializeField] private Transform parentEventObject; - Vector3 position = new Vector3 (Screen.width-200, 134f, 0f); - [SerializeField] GameObject[] events; - void Start() - { - - - } - - // Update is called once per frame - void Update() - { - events = GameObject.FindGameObjectsWithTag("Event"); - if(events.Length <= 4) - { - switch (events.Length) - { - case 0: - position.y = 134f; - break; - case 1: - position.y = 174f; - break; - case 2: - position.y = 214f; - break; - case 3: - position.y = 254f; - break; - } - - //Relocate - - for (int i = 0; i < events.Length; i++) - { - switch (events.Length) - { - case 1: - events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); - break; - case 2: - events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); - events[1].transform.position = new Vector3(Screen.width - 200, 174f, 0f); - break; - case 3: - events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); - events[1].transform.position = new Vector3(Screen.width - 200, 174f, 0f); - events[2].transform.position = new Vector3(Screen.width - 200, 214f, 0f); - break; - case 4: - events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); - events[1].transform.position = new Vector3(Screen.width - 200, 174f, 0f); - events[2].transform.position = new Vector3(Screen.width - 200, 214f, 0f); - events[3].transform.position = new Vector3(Screen.width - 200, 254f, 0f); - break; - } - } - - - } - - } - - public void CreateEvent(string msg) - { - Instantiate(eventObject, position, Quaternion.identity, parentEventObject); - eventObject.GetComponent().ChangeText(msg); - } - -} diff --git a/Assets/Scripts/EventScript.cs b/Assets/Scripts/EventScript.cs deleted file mode 100644 index bea6d6d..0000000 --- a/Assets/Scripts/EventScript.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class EventScript : MonoBehaviour -{ - //[SerializeField] private Text text; - void Start() - { - - Invoke("Delete", 5f); - } - - // Update is called once per frame - void Update() - { - - } - - public void ChangeText(string msg) - { - Text t = GetComponentInChildren(); - t.text = msg; - } - - void Delete() - { - Destroy(this.gameObject); - } -} diff --git a/Assets/Scripts/EventScript.cs.meta b/Assets/Scripts/EventScript.cs.meta deleted file mode 100644 index 3e9d7cc..0000000 --- a/Assets/Scripts/EventScript.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9be9743e89535f6429f5773fd772d746 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/LightSwitch.cs b/Assets/Scripts/LightSwitch.cs index 1fef45d..3502939 100644 --- a/Assets/Scripts/LightSwitch.cs +++ b/Assets/Scripts/LightSwitch.cs @@ -4,7 +4,6 @@ using UnityEngine; public class LightSwitch : Interactable { - public GameObject GameManager; public Light m_Light; public bool isOn; @@ -30,14 +29,6 @@ public class LightSwitch : Interactable public override void Interact() { isOn = !isOn; - - if (isOn) { - GameManager.GetComponent().CreateEvent("Licht2"); - } - else - { - GameManager.GetComponent().CreateEvent("Licht1"); - } //Debug.Log("Click Light"); UpdateLight(); diff --git a/Assets/Scripts/TimeSwitchBtn.cs b/Assets/Scripts/TimeSwitchBtn.cs index b12eac0..5db7585 100644 --- a/Assets/Scripts/TimeSwitchBtn.cs +++ b/Assets/Scripts/TimeSwitchBtn.cs @@ -4,9 +4,8 @@ using UnityEngine; public class TimeSwitchBtn: Interactable { - public GameObject GameManager; public bool dark; - + public GameObject GameManager; public override string GetDescription() { @@ -30,12 +29,10 @@ public class TimeSwitchBtn: Interactable if (dark) { - GameManager.GetComponent().CreateEvent("Tag!"); GameManager.GetComponent().secondsOfDay = 0; } else { - GameManager.GetComponent().CreateEvent("Nacht!"); GameManager.GetComponent().secondsOfDay = 30000; } } diff --git a/Packages/manifest.json b/Packages/manifest.json index f83d9a4..44cd762 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.2d.sprite": "1.0.0", "com.unity.collab-proxy": "1.9.0", "com.unity.ide.rider": "3.0.7", "com.unity.ide.visualstudio": "2.0.11", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 316e621..9b20fb1 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,11 @@ { "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.collab-proxy": { "version": "1.9.0", "depth": 0, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index fe1188f..fe53db0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.1.22f1 -m_EditorVersionWithRevision: 2021.1.22f1 (a137e5fb0427) +m_EditorVersion: 2021.1.23f1 +m_EditorVersionWithRevision: 2021.1.23f1 (b50729e604a9)