From b298adec90cb3319b2492644e7b84e49986083d6 Mon Sep 17 00:00:00 2001 From: dddushesss <37773701+dddushesss@users.noreply.github.com> Date: Wed, 5 Jan 2022 22:36:27 +0300 Subject: [PATCH] final item fixes --- Assets/Prefab/PauseMenu.prefab | 8 ++++---- Assets/Resources/Data/ItemData.asset | 6 +++--- Assets/Scripts/GameUI/PlayerInventoryView.cs | 2 +- Assets/Scripts/Units/Views/UnitView.cs | 4 +--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Assets/Prefab/PauseMenu.prefab b/Assets/Prefab/PauseMenu.prefab index 03403767..9d947b3e 100644 --- a/Assets/Prefab/PauseMenu.prefab +++ b/Assets/Prefab/PauseMenu.prefab @@ -155,8 +155,8 @@ RectTransform: 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: -300, y: -1900} + m_AnchoredPosition: {x: 0, y: 10} + m_SizeDelta: {x: -300, y: -1680} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1469258782187354179 CanvasRenderer: @@ -407,10 +407,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1080, y: 1920} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Assets/Resources/Data/ItemData.asset b/Assets/Resources/Data/ItemData.asset index 7b36bfea..79ad2d8d 100644 --- a/Assets/Resources/Data/ItemData.asset +++ b/Assets/Resources/Data/ItemData.asset @@ -11,7 +11,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: effbc11b6ae8444c8d20e929ce28183e, type: 3} m_Name: ItemData - m_EditorClassIdentifier: + m_EditorClassIdentifier: itemInfos: - prefab: {fileID: 919132149155446097, guid: 4166c606d638610418dc9ead794d697b, type: 3} isInstantUse: 0 @@ -19,7 +19,7 @@ MonoBehaviour: icon: {fileID: 21300000, guid: 543c4732bd2d47a41bdbbf2156eb358c, type: 3} spawnablePrefab: {fileID: 4774919592469818776, guid: 0dbed8f974ba44a42af9d8fcae504ce0, type: 3} - values: + values: spawnChance: 0.2 - prefab: {fileID: 3197816592181874056, guid: 2704c4f795b0d7748a3e3fa53be4d893, type: 3} @@ -27,7 +27,7 @@ MonoBehaviour: type: AttackBonus icon: {fileID: 21300000, guid: caf8bc0311dd2fc4ca1528a82a063754, type: 3} spawnablePrefab: {fileID: 0} - values: 030000000f000000 + values: 0300000064000000 spawnChance: 0.516 - prefab: {fileID: 8639522512577941448, guid: 7b6a7f64e52da514d88aa97ad8f863df, type: 3} diff --git a/Assets/Scripts/GameUI/PlayerInventoryView.cs b/Assets/Scripts/GameUI/PlayerInventoryView.cs index 799c3e42..72b3e897 100644 --- a/Assets/Scripts/GameUI/PlayerInventoryView.cs +++ b/Assets/Scripts/GameUI/PlayerInventoryView.cs @@ -76,7 +76,7 @@ namespace GameUI _freeButtons[i] = button; break; } - + button.onClick.RemoveAllListeners(); button.gameObject.SetActive(false); } else diff --git a/Assets/Scripts/Units/Views/UnitView.cs b/Assets/Scripts/Units/Views/UnitView.cs index b65cf6ff..3439c88f 100644 --- a/Assets/Scripts/Units/Views/UnitView.cs +++ b/Assets/Scripts/Units/Views/UnitView.cs @@ -31,9 +31,7 @@ public class UnitView : MonoBehaviour private Action _startRegen; private Coroutine _previosRegen; private Coroutine _previosReload; - // - private WaitForSeconds regenTick = new WaitForSeconds(0.5f); - // + private int _mana; private Action _capureHex; private Sequence _sequence;