From d94a8b64f3c459f0fc1a867e900337ee638ecb0c Mon Sep 17 00:00:00 2001 From: dddushesss <37773701+dddushesss@users.noreply.github.com> Date: Wed, 29 Dec 2021 20:03:42 +0300 Subject: [PATCH 1/3] some fixes --- Assets/Scripts/Controller/GameInit.cs | 6 +++++- Assets/Scripts/HexFiled/HexGrid.cs | 14 +++++++------- Assets/Scripts/MusicController.cs | 9 ++++++++- Assets/Scripts/Units/Unit.cs | 14 ++++++-------- Assets/Scripts/Units/Views/UnitView.cs | 7 +++---- Assets/Scripts/Weapons/WeaponView.cs | 2 +- 6 files changed, 30 insertions(+), 22 deletions(-) diff --git a/Assets/Scripts/Controller/GameInit.cs b/Assets/Scripts/Controller/GameInit.cs index e20ffe83..631fa0b9 100644 --- a/Assets/Scripts/Controller/GameInit.cs +++ b/Assets/Scripts/Controller/GameInit.cs @@ -51,8 +51,12 @@ namespace Controller var unitFactory = new UnitFactory(units); hexGrid.OnGridLoaded += unitFactory.Spawn; - } + var paintedController = new PaintedController(); + + hexGrid.OnHexPainted += paintedController.SetHexColors; + } + } } \ No newline at end of file diff --git a/Assets/Scripts/HexFiled/HexGrid.cs b/Assets/Scripts/HexFiled/HexGrid.cs index e4a3ecdb..c965e61f 100644 --- a/Assets/Scripts/HexFiled/HexGrid.cs +++ b/Assets/Scripts/HexFiled/HexGrid.cs @@ -100,14 +100,14 @@ namespace HexFiled } } } - } -// #if UNITY_EDITOR -// TMP_Text label = Object.Instantiate(_cellLabelPrefab, _gridCanvas.transform, false); -// label.rectTransform.anchoredPosition = -// new Vector2(position.x, position.z); -// label.text = cell.coordinates.ToStringOnSeparateLines(); -// #endif +#if UNITY_EDITOR + TMP_Text label = Object.Instantiate(_cellLabelPrefab, _gridCanvas.transform, false); + label.rectTransform.anchoredPosition = + new Vector2(position.x, position.z); + label.text = cell.coordinates.ToStringOnSeparateLines(); +#endif + } public void Init() { diff --git a/Assets/Scripts/MusicController.cs b/Assets/Scripts/MusicController.cs index 77c2f47e..3758b90f 100644 --- a/Assets/Scripts/MusicController.cs +++ b/Assets/Scripts/MusicController.cs @@ -22,13 +22,20 @@ public class MusicController _data = data; } - public void PlayerAudioClip(AudioClip clip, GameObject source) + public void PlayAudioClip(AudioClip clip, GameObject source) { _sources[source].clip = clip; _sources[source].volume = _data.Settings.isSFXAllowed ? 1f : 0f; _sources[source].Play(); } + public void PlayRandomClip(List clips, GameObject source) + { + _sources[source].clip = clips[Random.Range(0, clips.Count - 1)]; + _sources[source].volume = _data.Settings.isSFXAllowed ? 1f : 0f; + _sources[source].Play(); + } + public void AddAudioListener(GameObject gameObject) { _audioListener = gameObject.AddComponent(); diff --git a/Assets/Scripts/Units/Unit.cs b/Assets/Scripts/Units/Unit.cs index 2a1fc4b1..0d02615e 100644 --- a/Assets/Scripts/Units/Unit.cs +++ b/Assets/Scripts/Units/Unit.cs @@ -1,7 +1,6 @@ using System; using Chars; using Data; -using DefaultNamespace; using DG.Tweening; using HexFiled; using UnityEngine; @@ -158,12 +157,12 @@ namespace Units } else { - var capturesMusic = MusicController.Instance.MusicData.SfxMusic.Captures; - MusicController.Instance.PlayerAudioClip(capturesMusic[Random.Range(0, capturesMusic.Count - 1)], - _cell.gameObject); + CaptureHex(); + MusicController.Instance.PlayRandomClip(MusicController.Instance.MusicData.SfxMusic.Captures, + _cell.gameObject); } - + _isHardToCapture = false; } @@ -185,7 +184,7 @@ namespace Units _instance.transform.forward + _instance.transform.position + new Vector3(0, 2), _instance.transform.rotation); MusicController.Instance.AddAudioSource(ball); - MusicController.Instance.PlayerAudioClip(_weapon.shotSound, ball); + MusicController.Instance.PlayAudioClip(_weapon.shotSound, ball); ball.AddComponent().SetWeapon(_weapon); ball.transform.DOMove( new Vector3(_direction.normalized.x, @@ -227,7 +226,7 @@ namespace Units _unitView.OnHit -= Damage; _isAlive = false; _animator.SetTrigger("Death"); - MusicController.Instance.PlayerAudioClip(MusicController.Instance.MusicData.SfxMusic.Death, _instance); + MusicController.Instance.PlayAudioClip(MusicController.Instance.MusicData.SfxMusic.Death, _instance); MusicController.Instance.RemoveAudioSource(_instance); } @@ -263,7 +262,6 @@ namespace Units { Death(); } - _hp -= dmg; UpdateBarCanvas(); } diff --git a/Assets/Scripts/Units/Views/UnitView.cs b/Assets/Scripts/Units/Views/UnitView.cs index 7c55ddc4..c1fa77ba 100644 --- a/Assets/Scripts/Units/Views/UnitView.cs +++ b/Assets/Scripts/Units/Views/UnitView.cs @@ -55,7 +55,7 @@ public class UnitView : MonoBehaviour _capureHex.Invoke(); captureBar.DOFillAmount(0f, 0f).SetEase(Ease.Linear); captureBar.gameObject.SetActive(false); - MusicController.Instance.PlayerAudioClip(MusicController.Instance.MusicData.SfxMusic.HardCapture, + MusicController.Instance.PlayRandomClip(MusicController.Instance.MusicData.SfxMusic.Captures, cell.gameObject); })); } @@ -101,9 +101,8 @@ public class UnitView : MonoBehaviour private void Land() { - MusicController.Instance.PlayerAudioClip( - MusicController.Instance.MusicData.SfxMusic.Step[ - Random.Range(0, MusicController.Instance.MusicData.SfxMusic.Step.Count - 1)], gameObject); + MusicController.Instance.PlayRandomClip( + MusicController.Instance.MusicData.SfxMusic.Step, gameObject); } private void AttackEnd() diff --git a/Assets/Scripts/Weapons/WeaponView.cs b/Assets/Scripts/Weapons/WeaponView.cs index 6b654238..5b1794ba 100644 --- a/Assets/Scripts/Weapons/WeaponView.cs +++ b/Assets/Scripts/Weapons/WeaponView.cs @@ -24,6 +24,6 @@ public class WeaponView : MonoBehaviour go.AddComponent(); MusicController.Instance.AddAudioSource(go); MusicController.Instance.RemoveAudioSource(gameObject); - MusicController.Instance.PlayerAudioClip(_weapon.hitSound, go); + MusicController.Instance.PlayAudioClip(_weapon.hitSound, go); } } From d083a5dc9cd8aa4eae9aeaf0d0ef16088890533f Mon Sep 17 00:00:00 2001 From: dddushesss <37773701+dddushesss@users.noreply.github.com> Date: Thu, 30 Dec 2021 19:51:11 +0300 Subject: [PATCH 2/3] fixes --- Assets/Prefab/Hex Cell Label.prefab | 4 ++-- Assets/Scripts/Controller/GameInit.cs | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Assets/Prefab/Hex Cell Label.prefab b/Assets/Prefab/Hex Cell Label.prefab index 06a732c0..4593a8b8 100644 --- a/Assets/Prefab/Hex Cell Label.prefab +++ b/Assets/Prefab/Hex Cell Label.prefab @@ -92,8 +92,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 1 - m_fontSizeBase: 1 + m_fontSize: 0.3 + m_fontSizeBase: 0.3 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/Scripts/Controller/GameInit.cs b/Assets/Scripts/Controller/GameInit.cs index 631fa0b9..27e5f75a 100644 --- a/Assets/Scripts/Controller/GameInit.cs +++ b/Assets/Scripts/Controller/GameInit.cs @@ -51,10 +51,7 @@ namespace Controller var unitFactory = new UnitFactory(units); hexGrid.OnGridLoaded += unitFactory.Spawn; - - var paintedController = new PaintedController(); - - hexGrid.OnHexPainted += paintedController.SetHexColors; + } From 1977ae6d7c4a68e69b27db8482fbbd43619e8169 Mon Sep 17 00:00:00 2001 From: dddushesss <37773701+dddushesss@users.noreply.github.com> Date: Thu, 30 Dec 2021 19:57:59 +0300 Subject: [PATCH 3/3] minor fixes --- Assets/Prefab/PauseMenu.prefab | 86 ++++++++++++++++++-- Assets/Scripts/Controller/GameInit.cs | 4 +- Assets/Scripts/HexFiled/PaintedController.cs | 7 +- Assets/Scripts/Units/Unit.cs | 14 +--- 4 files changed, 90 insertions(+), 21 deletions(-) diff --git a/Assets/Prefab/PauseMenu.prefab b/Assets/Prefab/PauseMenu.prefab index e32fb3ab..7dfa2e85 100644 --- a/Assets/Prefab/PauseMenu.prefab +++ b/Assets/Prefab/PauseMenu.prefab @@ -32,7 +32,7 @@ RectTransform: m_Children: - {fileID: 3205969477031557256} m_Father: {fileID: 7535381195931813741} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -151,7 +151,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7535381195931813741} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -316,7 +316,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 @@ -409,7 +409,7 @@ RectTransform: m_Children: - {fileID: 3258995203638363845} m_Father: {fileID: 7535381195931813741} - m_RootOrder: 1 + 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} @@ -530,7 +530,7 @@ RectTransform: m_Children: - {fileID: 216367779017151113} m_Father: {fileID: 7535381195931813741} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1011,6 +1011,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5443873379656075396 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5855551985023584753} + - component: {fileID: 3505714345849204007} + - component: {fileID: 6130419704230661871} + m_Layer: 5 + m_Name: Back + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5855551985023584753 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5443873379656075396} + 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: 7535381195931813741} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1670} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3505714345849204007 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5443873379656075396} + m_CullTransparentMesh: 1 +--- !u!114 &6130419704230661871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5443873379656075396} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.14117648} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6038652171774885714 GameObject: m_ObjectHideFlags: 0 @@ -1040,6 +1115,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5855551985023584753} - {fileID: 5093098141183363274} - {fileID: 5296751824509684347} - {fileID: 5296751824694007057} diff --git a/Assets/Scripts/Controller/GameInit.cs b/Assets/Scripts/Controller/GameInit.cs index 2c82d9b9..d60b7687 100644 --- a/Assets/Scripts/Controller/GameInit.cs +++ b/Assets/Scripts/Controller/GameInit.cs @@ -52,9 +52,9 @@ namespace Controller hexGrid.OnGridLoaded += unitFactory.Spawn; - var paintedControler = new PaintedController(); + var paintedController = new PaintedController(); - hexGrid.OnHexPainted += paintedControler.SetHexColors; + hexGrid.OnHexPainted += paintedController.SetHexColors; } diff --git a/Assets/Scripts/HexFiled/PaintedController.cs b/Assets/Scripts/HexFiled/PaintedController.cs index d4e64ad8..812d04fd 100644 --- a/Assets/Scripts/HexFiled/PaintedController.cs +++ b/Assets/Scripts/HexFiled/PaintedController.cs @@ -6,10 +6,15 @@ namespace HexFiled public class PaintedController { - public static Dictionary unitCurrentCell = new Dictionary(); + public static Dictionary unitCurrentCell; private HexCell _cell; + public PaintedController() + { + unitCurrentCell = new Dictionary(); + } + public void SetHexColors(HexCell cell) { _cell = cell; diff --git a/Assets/Scripts/Units/Unit.cs b/Assets/Scripts/Units/Unit.cs index f27372cf..dfc7984c 100644 --- a/Assets/Scripts/Units/Unit.cs +++ b/Assets/Scripts/Units/Unit.cs @@ -119,19 +119,7 @@ namespace Units _cell.PaintHex(_data.color); for (int i = 0; i < 6; i++) { - var neighbour = _cell.GetNeighbor((HexDirection)i); - neighbour?.PaintHex(_data.color); - - for (int j = 0; j < 6; j++) - { - var neighbour1 = neighbour?.GetNeighbor((HexDirection)j); - neighbour1?.PaintHex(_data.color); - - - //.PaintHex(_data.color); - } - - //.PaintHex(_data.color); + _cell.GetNeighbor((HexDirection)i)?.PaintHex(_data.color); } //