diff --git a/Assets/Scenes/TestDragAndDrop.unity b/Assets/Scenes/TestDragAndDrop.unity index d6adc12..8a29ec0 100644 --- a/Assets/Scenes/TestDragAndDrop.unity +++ b/Assets/Scenes/TestDragAndDrop.unity @@ -160,7 +160,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 60, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &34093566 @@ -636,7 +636,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y @@ -676,7 +676,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y @@ -700,7 +700,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y @@ -1477,7 +1477,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: afc444040d3adcf45a882e4882521f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: afc444040d3adcf45a882e4882521f5e, type: 3} propertyPath: m_AnchoredPosition.y @@ -1517,7 +1517,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: afc444040d3adcf45a882e4882521f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: afc444040d3adcf45a882e4882521f5e, type: 3} propertyPath: m_AnchoredPosition.y @@ -1541,7 +1541,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: afc444040d3adcf45a882e4882521f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: afc444040d3adcf45a882e4882521f5e, type: 3} propertyPath: m_AnchoredPosition.y @@ -1670,7 +1670,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 175, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1304104611 @@ -2473,7 +2473,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y @@ -2513,7 +2513,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y @@ -2537,7 +2537,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/Scripts/Resource/ResourceManager.cs b/Assets/Scripts/Resource/ResourceManager.cs index ee984b2..3859a7c 100644 --- a/Assets/Scripts/Resource/ResourceManager.cs +++ b/Assets/Scripts/Resource/ResourceManager.cs @@ -5,12 +5,11 @@ using UnityEngine; /// public class ResourceManager : Singleton { - private static ResourceManager _instance = null; private int _rockAmount = 20; private int _woodAmount = 20; private int _foodAmount = 20; - private const int MAX = 100; + private const int MAX = int.MaxValue; private const int MIN = 0; public int RockAmount