From 2959b3f6e48141b044507ab3cec38454217976fb Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Sat, 2 Oct 2021 13:42:24 +0200 Subject: [PATCH] added minimap --- Assets/Minimap.meta | 8 + Assets/Minimap/Minimap.cs | 17 +++ .../Minimap.cs.meta} | 2 +- Assets/Minimap/MinimapTexture.renderTexture | 38 +++++ .../Minimap/MinimapTexture.renderTexture.meta | 8 + Assets/Minimap/cirlce_mask.png | Bin 0 -> 5362 bytes Assets/Minimap/cirlce_mask.png.meta | 144 ++++++++++++++++++ Assets/Scenes/SampleScene.unity | 120 +-------------- .../Buildings/House/HouseConstruction.cs | 3 - Assets/Scripts/EventLog.cs | 78 ---------- Assets/Scripts/EventScript.cs | 31 ---- Assets/Scripts/EventScript.cs.meta | 11 -- Assets/Scripts/LightSwitch.cs | 9 -- Assets/Scripts/TimeSwitchBtn.cs | 5 +- Packages/manifest.json | 1 + Packages/packages-lock.json | 6 + ProjectSettings/ProjectVersion.txt | 4 +- 17 files changed, 228 insertions(+), 257 deletions(-) create mode 100644 Assets/Minimap.meta create mode 100644 Assets/Minimap/Minimap.cs rename Assets/{Scripts/EventLog.cs.meta => Minimap/Minimap.cs.meta} (83%) create mode 100644 Assets/Minimap/MinimapTexture.renderTexture create mode 100644 Assets/Minimap/MinimapTexture.renderTexture.meta create mode 100644 Assets/Minimap/cirlce_mask.png create mode 100644 Assets/Minimap/cirlce_mask.png.meta delete mode 100644 Assets/Scripts/EventLog.cs delete mode 100644 Assets/Scripts/EventScript.cs delete mode 100644 Assets/Scripts/EventScript.cs.meta 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 0000000000000000000000000000000000000000..3a6f88a3524e6245ebc0926ec405fe05a21a37e0 GIT binary patch literal 5362 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 literal 0 HcmV?d00001 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)