dushes/Run-and-capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Alexei'

Browse Source
This commit is contained in:
dddushesss 2022-01-05 22:52:30 +03:00
commit 5a736a8335
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Prefab/PauseMenu.prefab
View File

@ -155,8 +155,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 10}
m_SizeDelta: {x: -300, y: -1900} m_SizeDelta: {x: -300, y: -1680}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1469258782187354179 --- !u!222 &1469258782187354179
CanvasRenderer: CanvasRenderer:
@ -407,10 +407,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_UiScaleMode: 0 m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100 m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1 m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600} m_ReferenceResolution: {x: 1080, y: 1920}
m_ScreenMatchMode: 0 m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3 m_PhysicalUnit: 3

2
Assets/Resources/Data/ItemData.asset
View File

@ -27,7 +27,7 @@ MonoBehaviour:
type: AttackBonus type: AttackBonus
icon: {fileID: 21300000, guid: caf8bc0311dd2fc4ca1528a82a063754, type: 3} icon: {fileID: 21300000, guid: caf8bc0311dd2fc4ca1528a82a063754, type: 3}
spawnablePrefab: {fileID: 0} spawnablePrefab: {fileID: 0}
values: 030000000f000000 values: 0300000064000000
spawnChance: 0.516 spawnChance: 0.516
- prefab: {fileID: 8639522512577941448, guid: 7b6a7f64e52da514d88aa97ad8f863df, - prefab: {fileID: 8639522512577941448, guid: 7b6a7f64e52da514d88aa97ad8f863df,
type: 3} type: 3}

2
Assets/Scripts/GameUI/PlayerInventoryView.cs
View File

@ -76,7 +76,7 @@ namespace GameUI
_freeButtons[i] = button; _freeButtons[i] = button;
break; break;
} }
button.onClick.RemoveAllListeners();
button.gameObject.SetActive(false); button.gameObject.SetActive(false);
} }
else else

4
Assets/Scripts/Units/Views/UnitView.cs
View File

@ -31,9 +31,7 @@ public class UnitView : MonoBehaviour
private Action _startRegen; private Action _startRegen;
private Coroutine _previosRegen; private Coroutine _previosRegen;
private Coroutine _previosReload; private Coroutine _previosReload;
//
private WaitForSeconds regenTick = new WaitForSeconds(0.5f);
//
private int _mana; private int _mana;
private Action _capureHex; private Action _capureHex;
private Sequence _sequence; private Sequence _sequence;