try to fix tabs

This commit is contained in:
2023-04-13 23:48:17 +03:00
parent 1f4659c3c0
commit 38cd7752d6
5 changed files with 18 additions and 257 deletions
+1 -237
View File
@@ -841,8 +841,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4329202165643033270}
m_Children: []
m_Father: {fileID: 6601132036907049051}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1050,241 +1049,6 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 1
--- !u!1001 &4745506429519002879
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3731607605728727607}
m_Modifications:
- target: {fileID: 1740965549210461778, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740965549210461778, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740965549210461778, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 32
objectReference: {fileID: 0}
- target: {fileID: 1740965549210461778, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3310662501840371697, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_Name
value: JobItemUiTemplate
objectReference: {fileID: 0}
- target: {fileID: 4104292198911527695, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4104292198911527695, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4104292198911527695, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4104292198911527695, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4104292198911527695, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4899774397145829728, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: _sallary
value:
objectReference: {fileID: 0}
- target: {fileID: 4899774397145829728, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: _descreiption
value:
objectReference: {fileID: 0}
- target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7707189450545850178, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7707189450545850178, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7707189450545850178, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7707189450545850178, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_RootOrder
value: -1
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 10
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 5761646621931476650, guid: 3fd1d54e5064a0841972b791abc6919f, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3fd1d54e5064a0841972b791abc6919f, type: 3}
--- !u!224 &4329202165643033270 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f,
type: 3}
m_PrefabInstance: {fileID: 4745506429519002879}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4885670798789882735
PrefabInstance:
m_ObjectHideFlags: 0
+2
View File
@@ -150,6 +150,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_description: {fileID: 7318951392475720473}
_icon: {fileID: 0}
_jobListItem: {fileID: 0}
--- !u!1 &9054346266596908745
GameObject:
m_ObjectHideFlags: 0
@@ -302,3 +303,4 @@ MonoBehaviour:
m_EditorClassIdentifier:
_description: {fileID: 7318951392475720473}
_icon: {fileID: 0}
_jobListItem: {fileID: 0}
+4 -4
View File
@@ -39,7 +39,7 @@ public class JobSelectorUI : MonoBehaviour
{
var itemUI = Instantiate(_jobTabUItemplate, _tabsContainer);
itemUI.gameObject.SetActive(true);
itemUI.GetComponent<JobTabUITemplate>().SetItem(this,(job.name));
itemUI.GetComponent<JobTabUITemplate>().SetItem(this,job);
}
//foreach (var job in _jobs.JobPositionsList)
//{
@@ -62,16 +62,16 @@ public class JobSelectorUI : MonoBehaviour
public void OnTabEnter(JobTabUITemplate button)
{
print($"enter to {button.name}");
print($"enter to {button._jobListItem.name}");
}
public void OnTabSelected(JobTabUITemplate button)
{
print($"selected {button.name}");
print($"selected {button._jobListItem.name}");
}
public void OnTabExit(JobTabUITemplate button)
{
print($"exit {button.name}");
print($"exit {button._jobListItem.name}");
}
private void CloseDialog()
@@ -9,18 +9,20 @@ public class JobTabUITemplate : MonoBehaviour, IPointerEnterHandler,IPointerClic
private TextMeshProUGUI _description;
[SerializeField]
private Image _icon;
public JobsListSO _jobListItem;
private JobSelectorUI _parent;
public void SetItem(JobSelectorUI parent,string name)
public void SetItem(JobSelectorUI parent, JobsListSO jobListItem)
{
_parent= parent;
_description.text = name;
_jobListItem = jobListItem;
_parent = parent;
_description.text = jobListItem.name;
//_icon.sprite = item.Icon;
}
public void OnPointerClick(PointerEventData eventData)
{
_parent.OnTabSelected(this);
_parent.OnTabSelected(this);
}
public void OnPointerEnter(PointerEventData eventData)
@@ -30,7 +32,7 @@ public class JobTabUITemplate : MonoBehaviour, IPointerEnterHandler,IPointerClic
public void OnPointerExit(PointerEventData eventData)
{
_parent.OnTabExit(this);
_parent.OnTabExit(this);
}
}
+4 -11
View File
@@ -18,15 +18,9 @@ public class TimeSliderUI : MonoBehaviour
private TimeSpan _time;
private void Start()
{
gameObject.SetActive(false);
}
public void ShowTimeSliderDialog(string title, string description, Action onCancel, Action<TimeSpan> onConfirm)
{
TimeManager.Instance.OnFastForwardEnd += CloseDialog;
TimeManager.Instance.OnMinuteChanged += UpdateTime;
TimeManager.Instance.Pause();
UIManager.Instance.Freeze();
@@ -45,11 +39,9 @@ public class TimeSliderUI : MonoBehaviour
Hide();
});
_slider.onValueChanged.AddListener(x=>SliderValueChanger(x));
}
private void UpdateTime()
{
}
private void CloseDialog()
{
@@ -57,17 +49,18 @@ public class TimeSliderUI : MonoBehaviour
Destroy(this);
}
private void Update()
private void SliderValueChanger(float time)
{
if (gameObject.activeSelf)
{
_time = TimeSpan.FromHours(_slider.value);
_time = TimeSpan.FromHours(time);
_description.text = $"{_time.Hours} hours";
}
}
private void Hide()
{
_slider.onValueChanged.RemoveListener(x=>SliderValueChanger(x));
gameObject.SetActive(false);
TimeManager.Instance.Resume();
}