Skip to content

Fix dog browser pages when all dogs adopted #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
imann24 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix dog browser pages when all dogs adopted #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions Assets/Scenes/Home.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ Prefab:
- target: {fileID: 224856128351561898, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 63.296665
objectReference: {fileID: 0}
- target: {fileID: 224153989083695060, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -316,7 +316,7 @@ Prefab:
- target: {fileID: 224153989083695060, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
value: -149.245
objectReference: {fileID: 0}
- target: {fileID: 224153989083695060, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -326,7 +326,7 @@ Prefab:
- target: {fileID: 224153989083695060, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 155.89667
objectReference: {fileID: 0}
- target: {fileID: 224343989594861986, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -346,7 +346,7 @@ Prefab:
- target: {fileID: 224343989594861986, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
value: -293
objectReference: {fileID: 0}
- target: {fileID: 224343989594861986, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -356,7 +356,7 @@ Prefab:
- target: {fileID: 224343989594861986, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 57.806664
objectReference: {fileID: 0}
- target: {fileID: 224978594526050140, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -381,7 +381,7 @@ Prefab:
- target: {fileID: 224978594526050140, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 63.296665
objectReference: {fileID: 0}
- target: {fileID: 224928207616995372, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -401,7 +401,7 @@ Prefab:
- target: {fileID: 224928207616995372, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
value: -149.245
objectReference: {fileID: 0}
- target: {fileID: 224928207616995372, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -411,7 +411,7 @@ Prefab:
- target: {fileID: 224928207616995372, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 155.89667
objectReference: {fileID: 0}
- target: {fileID: 224891571689356028, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -431,7 +431,7 @@ Prefab:
- target: {fileID: 224891571689356028, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
value: -293
objectReference: {fileID: 0}
- target: {fileID: 224891571689356028, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -441,7 +441,7 @@ Prefab:
- target: {fileID: 224891571689356028, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 57.806664
objectReference: {fileID: 0}
- target: {fileID: 224024026868098546, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -466,7 +466,7 @@ Prefab:
- target: {fileID: 224024026868098546, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 63.296665
objectReference: {fileID: 0}
- target: {fileID: 224187523304882570, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -486,7 +486,7 @@ Prefab:
- target: {fileID: 224187523304882570, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
value: -149.245
objectReference: {fileID: 0}
- target: {fileID: 224187523304882570, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -496,7 +496,7 @@ Prefab:
- target: {fileID: 224187523304882570, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 155.89667
objectReference: {fileID: 0}
- target: {fileID: 224575086644616346, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -516,7 +516,7 @@ Prefab:
- target: {fileID: 224575086644616346, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
value: -293
objectReference: {fileID: 0}
- target: {fileID: 224575086644616346, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -526,7 +526,7 @@ Prefab:
- target: {fileID: 224575086644616346, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 57.806664
objectReference: {fileID: 0}
- target: {fileID: 224206201004695046, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand Down Expand Up @@ -676,7 +676,7 @@ Prefab:
- target: {fileID: 224823253540491168, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 63.296665
objectReference: {fileID: 0}
- target: {fileID: 224874693334606402, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -696,7 +696,7 @@ Prefab:
- target: {fileID: 224874693334606402, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
value: -149.245
objectReference: {fileID: 0}
- target: {fileID: 224874693334606402, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -706,7 +706,7 @@ Prefab:
- target: {fileID: 224874693334606402, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 155.89667
objectReference: {fileID: 0}
- target: {fileID: 224091177309136318, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -726,7 +726,7 @@ Prefab:
- target: {fileID: 224091177309136318, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
value: -293
objectReference: {fileID: 0}
- target: {fileID: 224091177309136318, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand All @@ -736,7 +736,7 @@ Prefab:
- target: {fileID: 224091177309136318, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
value: 57.806664
objectReference: {fileID: 0}
- target: {fileID: 224479789599895554, guid: b266d74ebb57040989170e55fc04a2ff,
type: 2}
Expand Down Expand Up @@ -1520,7 +1520,7 @@ Prefab:
- target: {fileID: 224537566414020800, guid: e14b9533b7158456fb6d73fcdae5d80d,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
value: -40
objectReference: {fileID: 0}
- target: {fileID: 224653813572311808, guid: e14b9533b7158456fb6d73fcdae5d80d,
type: 2}
Expand Down Expand Up @@ -1602,6 +1602,11 @@ Prefab:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114040966375671910, guid: e14b9533b7158456fb6d73fcdae5d80d,
type: 2}
propertyPath: dogBrowser
value:
objectReference: {fileID: 1678609918}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: e14b9533b7158456fb6d73fcdae5d80d, type: 2}
m_IsPrefabParent: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/UI/PickupPup/DogBrowser/DogBrowserButtonController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ void maintainCorrectPageButtonCount(bool onInit)
{
trimPageButtons(pages);
}
refreshPageButtonReferences();
if(numPages > SINGLE_VALUE)
{
pageButtonParent.gameObject.SetActive(true);
Expand All @@ -202,7 +203,6 @@ void maintainCorrectPageButtonCount(bool onInit)
pageButtons[i].Show();
}
}
refreshPageButtonReferences();
}

void trimPageButtons(int desiredLength)
Expand Down