tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed most horrifying scaling issues with the book

Browse Source
This commit is contained in:
journaliciouz
2025-11-08 22:16:43 +01:00
parent 2ec53629c6
commit eda7361702
6 changed files with 293 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/Prefabs/UI/CardsSystem/AlbumViewPage.prefab
View File

@@ -1180,6 +1180,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1349376136600192763, guid: 0809b88801c54604aac49ad1d382a0e5, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1355374512808105630, guid: 0809b88801c54604aac49ad1d382a0e5, type: 3}
propertyPath: m_SizeDelta.y
value: 0
@@ -1380,6 +1384,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2885251706062949998, guid: 0809b88801c54604aac49ad1d382a0e5, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2898357846280299605, guid: 0809b88801c54604aac49ad1d382a0e5, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1624,6 +1632,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4595147288479534988, guid: 0809b88801c54604aac49ad1d382a0e5, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4611364690555967749, guid: 0809b88801c54604aac49ad1d382a0e5, type: 3}
propertyPath: m_AnchorMax.x
value: 0
@@ -2060,6 +2072,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7517486580377140092, guid: 0809b88801c54604aac49ad1d382a0e5, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7520427665364819965, guid: 0809b88801c54604aac49ad1d382a0e5, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -2316,6 +2332,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8914746431081002364, guid: 0809b88801c54604aac49ad1d382a0e5, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8922411832989560754, guid: 0809b88801c54604aac49ad1d382a0e5, type: 3}
propertyPath: m_SizeDelta.x
value: 0

38
Assets/Prefabs/UI/CardsSystem/InteractiveBook.prefab
View File

@@ -160,9 +160,8 @@ RectTransform:
- {fileID: 8738498528538518214}
- {fileID: 5608536918715673995}
- {fileID: 4540680730086645190}
- {fileID: 3104894377099463254}
- {fileID: 6887684199047822036}
- {fileID: 7201557514015239806}
- {fileID: 3104894377099463254}
- {fileID: 933791406979012170}
- {fileID: 3480404968808584556}
- {fileID: 2762656953123736875}
@@ -171,6 +170,7 @@ RectTransform:
- {fileID: 8076611052546744446}
- {fileID: 5806046929178438317}
- {fileID: 2847302862365774990}
- {fileID: 6887684199047822036}
- {fileID: 1712632483313425995}
- {fileID: 1712632479955404759}
- {fileID: 1712632483092814581}
@@ -248,7 +248,7 @@ MonoBehaviour:
interactable: 0
enableShadowEffect: 0
hasTransparentPages: 0
currentPaper: 0
currentPaper: 5
papers:
- Front: {fileID: 7113261502207715443}
Back: {fileID: 6797866010987677939}
@@ -1231,7 +1231,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.00003512056, y: 0}
m_AnchoredPosition: {x: -0.000043282475, y: 0}
m_SizeDelta: {x: -0.00000011920929, y: -0.000023126602}
m_Pivot: {x: 0.00000008009374, y: -0.00000007264316}
--- !u!222 &508081904394904736
@@ -1333,7 +1333,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.000061035156, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.00000008009374, y: -0.00000007264316}
--- !u!222 &2296939288493081011
@@ -1435,7 +1435,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.000061035156, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.00000008009374, y: -0.00000007264316}
--- !u!222 &8211049298767349921
@@ -1537,7 +1537,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.00003512056, y: 0}
m_AnchoredPosition: {x: -0.000043282475, y: 0}
m_SizeDelta: {x: -0.00000011920929, y: -0.000023126602}
m_Pivot: {x: 0.00000008009374, y: -0.00000007264316}
--- !u!222 &7462669267008339969
@@ -1843,7 +1843,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.00003512056, y: 0}
m_AnchoredPosition: {x: -0.000043282475, y: 0}
m_SizeDelta: {x: -0.00000011920929, y: -0.000023126602}
m_Pivot: {x: 0.00000008009374, y: -0.00000007264316}
--- !u!222 &3398264804711496438
@@ -1945,7 +1945,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.000061035156, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.00000008009374, y: -0.00000007264316}
--- !u!222 &6504874021037615344
@@ -2007,9 +2007,9 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4997443806488891708}
m_Enabled: 1
m_Alpha: 0
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 0
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &5403100520341228566
GameObject:
@@ -2047,7 +2047,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.00003512056, y: 0}
m_AnchoredPosition: {x: -0.000043282475, y: 0}
m_SizeDelta: {x: -0.00000011920929, y: -0.000023126602}
m_Pivot: {x: 0.00000008009374, y: -0.00000007264316}
--- !u!222 &6568871061924215906
@@ -2109,9 +2109,9 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5403100520341228566}
m_Enabled: 1
m_Alpha: 0
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 0
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &6797866010987677939
GameObject:
@@ -2149,7 +2149,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.000061035156, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.00000008009374, y: -0.00000007264316}
--- !u!222 &8612384795192217732
@@ -2313,9 +2313,9 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7113261502207715443}
m_Enabled: 1
m_Alpha: 1
m_Alpha: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_BlocksRaycasts: 0
m_IgnoreParentGroups: 0
--- !u!1 &7771389999338048105
GameObject:
@@ -2455,7 +2455,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.00003512056, y: 0}
m_AnchoredPosition: {x: -0.000043282475, y: 0}
m_SizeDelta: {x: -0.00000011920929, y: -0.000023126602}
m_Pivot: {x: 0.00000008009374, y: -0.00000007264316}
--- !u!222 &3704846763203543944
@@ -2557,7 +2557,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.000061035156, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.00000008009374, y: -0.00000007264316}
--- !u!222 &546922297833014509

239
Assets/Prefabs/UI/CardsSystem/ScrapBookMenu.prefab
View File

@@ -323,10 +323,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
@@ -507,6 +507,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 18756421105679799, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.00012207031
objectReference: {fileID: 0}
- target: {fileID: 29674208645476903, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -515,6 +519,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 141969664509312299, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 141969664509312299, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_BlocksRaycasts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 196170205688585301, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchorMax.x
value: 0
@@ -655,6 +667,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1014697653728334450, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000043282475
objectReference: {fileID: 0}
- target: {fileID: 1037692184314297104, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -715,6 +731,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1506385894803683255, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1506385894803683255, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_BlocksRaycasts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1508551478583778048, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -731,10 +755,30 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1566862499612877641, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_Alpha
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1566862499612877641, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_BlocksRaycasts
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1577466077757444846, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1577466077757444846, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_BlocksRaycasts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1601278455770056904, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1610229144386397680, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000043282475
objectReference: {fileID: 0}
- target: {fileID: 1657124502846792304, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchorMax.x
value: 0
@@ -759,6 +803,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1697265395936148565, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000061035156
objectReference: {fileID: 0}
- target: {fileID: 1708553380498254556, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchorMax.x
value: 0
@@ -787,6 +835,18 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1940315556441751218, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1940315556441751218, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_BlocksRaycasts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1952468496567427725, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000043282475
objectReference: {fileID: 0}
- target: {fileID: 2034674448621162522, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -833,11 +893,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2088943967680250180, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: -82
value: -0.0000038146973
objectReference: {fileID: 0}
- target: {fileID: 2088943967680250180, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.y
value: -62
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2088943967680250180, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_LocalPosition.x
@@ -911,6 +971,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2205048512360160678, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2205048512360160678, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_BlocksRaycasts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2221708906791130683, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1099,6 +1167,10 @@ PrefabInstance:
propertyPath: m_fontSize
value: 25.8
objectReference: {fileID: 0}
- target: {fileID: 2685537002028647152, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: currentPaper
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2724445211399786811, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1135,6 +1207,38 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2867171285573283766, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchorMax.x
value: 0.95900005
objectReference: {fileID: 0}
- target: {fileID: 2867171285573283766, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchorMax.y
value: 0.86449116
objectReference: {fileID: 0}
- target: {fileID: 2867171285573283766, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchorMin.x
value: 0.036395837
objectReference: {fileID: 0}
- target: {fileID: 2867171285573283766, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchorMin.y
value: 0.07136394
objectReference: {fileID: 0}
- target: {fileID: 2867171285573283766, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2867171285573283766, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2867171285573283766, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2867171285573283766, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2875677308076062187, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1155,6 +1259,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3107528141541213797, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3107528141541213797, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_BlocksRaycasts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3116730779673537387, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1199,6 +1311,14 @@ PrefabInstance:
propertyPath: m_fontSize
value: 26.5
objectReference: {fileID: 0}
- target: {fileID: 3216425852639169017, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3216425852639169017, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_BlocksRaycasts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3216965586824177543, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1231,10 +1351,22 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3428064805021480863, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: -0.6189537
objectReference: {fileID: 0}
- target: {fileID: 3428064805021480863, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3428064805021480863, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.30950928
objectReference: {fileID: 0}
- target: {fileID: 3428064805021480863, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3445187011920427498, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1295,6 +1427,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3711248631494135488, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3755179700763621843, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1319,6 +1455,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3871155307025912372, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_ShowMaskGraphic
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3898022335892681458, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1379,6 +1519,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4247221605401081122, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.00012207031
objectReference: {fileID: 0}
- target: {fileID: 4289955200477403573, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchorMax.x
value: 0
@@ -1403,6 +1547,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4394173390569488017, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000043282475
objectReference: {fileID: 0}
- target: {fileID: 4463511613479073157, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchorMax.x
value: 0
@@ -1435,6 +1583,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4619463729088497829, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.00012207031
objectReference: {fileID: 0}
- target: {fileID: 4639499717494593384, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1711,6 +1863,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5868736536025379513, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_Alpha
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5868736536025379513, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_BlocksRaycasts
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5902522124336819964, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1735,6 +1895,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6052645878806185637, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.00012207031
objectReference: {fileID: 0}
- target: {fileID: 6113455327807665846, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1751,6 +1915,22 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6146861504845471085, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6146861504845471085, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6146861504845471085, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6146861504845471085, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6157467570958792020, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -1823,6 +2003,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6659441785098915065, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6659441785098915065, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_BlocksRaycasts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6671197569343132680, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.y
value: 0
@@ -1907,6 +2095,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6961856762667876982, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000043282475
objectReference: {fileID: 0}
- target: {fileID: 7022926209870766175, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -2039,6 +2231,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8042227674279907855, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000043282475
objectReference: {fileID: 0}
- target: {fileID: 8094654680393278767, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -2235,6 +2431,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8980232942402161046, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8980232942402161046, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_BlocksRaycasts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8981638067347551175, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -2291,11 +2495,34 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 7626111842947550113, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 6355410762299156325, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
insertIndex: -1
addedObject: {fileID: 5796674954005425481}
m_SourcePrefab: {fileID: 100100000, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
--- !u!1 &1528649409784242380 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6355410762299156325, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}
m_PrefabInstance: {fileID: 5549612182461073321}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5796674954005425481
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1528649409784242380}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.AspectRatioFitter
m_AspectMode: 3
m_AspectRatio: 2.164251
--- !u!224 &5906828909529466605 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2088943967680250180, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3}

11
Assets/Scripts/UI/CardSystem/AlbumViewPage.cs
View File

@@ -1,11 +1,13 @@
using System.Collections.Generic;
using System.Linq;
using AppleHills.Data.CardSystem;
using Core;
using Data.CardSystem;
using Pixelplacement;
using UI.Core;
using UI.DragAndDrop.Core;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
namespace UI.CardSystem
@@ -163,6 +165,15 @@ namespace UI.CardSystem
UIPageController.Instance.PopPage();
}
}
// If album exits while in Overworld, show AppSwitcher. If not, keep it hidden.
if (PlayerHudManager.Instance.currentUIMode == PlayerHudManager.UIMode.Overworld)
{
PlayerHudManager.Instance.appSwitcher.SetActive(true);
}
else
{
PlayerHudManager.Instance.appSwitcher.SetActive(false);
}
}
private void OnBoosterCountChanged(int newCount)

1
Assets/Scripts/UI/CardSystem/CardAlbumOpener.cs
View File

@@ -68,6 +68,7 @@ namespace UI.CardSystem
if (albumViewPage != null)
{
UIPageController.Instance.PushPage(albumViewPage);
PlayerHudManager.Instance.appSwitcher.SetActive(false);
}
}
// If we're already on the album main page, do nothing

9
Assets/Scripts/UI/PlayerHudManager.cs
View File

@@ -6,6 +6,7 @@ using System;
using UnityEngine.UI;
using UnityEngine.Playables;
using Core.Lifecycle;
using JetBrains.Annotations;
public class PlayerHudManager : ManagedBehaviour
{
@@ -118,18 +119,24 @@ public class PlayerHudManager : ManagedBehaviour
switch (mode)
{
case UIMode.Overworld:
// Update currentUIMode var
currentUIMode = UIMode.Overworld;
// Show app switcher
appSwitcher.SetActive(true);
// Hide eagle eye
eagleEye.SetActive(false);
break;
case UIMode.Puzzle:
// Update currentUIMode var
currentUIMode = UIMode.Puzzle;
// Hide app switcher
appSwitcher.SetActive(false);
// show eagle eye
eagleEye.SetActive(true);
break;
case UIMode.Minigame:
// Update currentUIMode var
currentUIMode = UIMode.Minigame;
// Hide app switcher
appSwitcher.SetActive(false);
// Hide birds eye
@@ -137,4 +144,6 @@ public class PlayerHudManager : ManagedBehaviour
break;
}
}
}