diff --git a/Assets/Data/Cards/Card_New Card 1.asset b/Assets/Data/Cards/Card_New Card 1.asset index 7a0ff941..62926c8d 100644 --- a/Assets/Data/Cards/Card_New Card 1.asset +++ b/Assets/Data/Cards/Card_New Card 1.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Card_New Card 1 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition Id: f3faeebd-41fd-4a5c-b021-366ed5170f0c - Name: New awesome card + Name: Test #1 Description: Description goes here Rarity: 4 Zone: 2 diff --git a/Assets/Data/Cards/Card_New Card.asset b/Assets/Data/Cards/Card_New Card.asset index db7489a9..6c4d6d2d 100644 --- a/Assets/Data/Cards/Card_New Card.asset +++ b/Assets/Data/Cards/Card_New Card.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Card_New Card m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition Id: c392baeb-f816-4482-8b9c-2e2b81e36527 - Name: Test example card + Name: Test #2 Description: Some example description Rarity: 4 Zone: 4 diff --git a/Assets/Data/Cards/Card_Test example card (Copy) 1.asset b/Assets/Data/Cards/Card_Test example card (Copy) 1.asset index aa26d282..1d14fcdf 100644 --- a/Assets/Data/Cards/Card_Test example card (Copy) 1.asset +++ b/Assets/Data/Cards/Card_Test example card (Copy) 1.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Card_Test example card (Copy) 1 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition Id: 629423af-af60-495b-8c89-36709e063acd - Name: Test example card (Copy) + Name: Test #3 Description: Some example description Rarity: 0 Zone: 0 diff --git a/Assets/Data/Cards/Card_Test example card (Copy).asset b/Assets/Data/Cards/Card_Test example card (Copy).asset index a998a949..113baaf2 100644 --- a/Assets/Data/Cards/Card_Test example card (Copy).asset +++ b/Assets/Data/Cards/Card_Test example card (Copy).asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Card_Test example card (Copy) m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition Id: 6aa0d454-47f5-4617-ae30-50614fd2fa94 - Name: Test example card 2 + Name: Test #4 Description: Some example description Rarity: 1 Zone: 0 diff --git a/Assets/Data/Cards/Card_Test example card 2 (Copy) 1.asset b/Assets/Data/Cards/Card_Test example card 2 (Copy) 1.asset index 2428db58..bfc2c6bb 100644 --- a/Assets/Data/Cards/Card_Test example card 2 (Copy) 1.asset +++ b/Assets/Data/Cards/Card_Test example card 2 (Copy) 1.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Card_Test example card 2 (Copy) 1 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition Id: ee76a6fc-d86d-469f-9b0f-c19286228357 - Name: Test example card 2 (Copy) + Name: Test #5 Description: Some example description Rarity: 1 Zone: 3 diff --git a/Assets/Data/Cards/Card_Test example card 2 (Copy).asset b/Assets/Data/Cards/Card_Test example card 2 (Copy).asset index ca74c2f0..d62d9ba2 100644 --- a/Assets/Data/Cards/Card_Test example card 2 (Copy).asset +++ b/Assets/Data/Cards/Card_Test example card 2 (Copy).asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Card_Test example card 2 (Copy) m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition Id: ee1e2aec-bdb6-4c68-8d7a-061c7f5e8583 - Name: Test example card 3 + Name: Test #6 Description: Some example description Rarity: 2 Zone: 0 diff --git a/Assets/Data/Cards/Card_Test example card 3 (Copy).asset b/Assets/Data/Cards/Card_Test example card 3 (Copy).asset index 319e0230..65f340a6 100644 --- a/Assets/Data/Cards/Card_Test example card 3 (Copy).asset +++ b/Assets/Data/Cards/Card_Test example card 3 (Copy).asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Card_Test example card 3 (Copy) m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition Id: 1afdfea7-ca85-45ae-bd2c-3814729e628d - Name: Test example card 3 (Copy) + Name: Test #7 Description: Some example description Rarity: 2 Zone: 4 diff --git a/Assets/Editor/CardSystem/CardEditorWindow.cs b/Assets/Editor/CardSystem/CardEditorWindow.cs index d94fc5d9..52c5e47e 100644 --- a/Assets/Editor/CardSystem/CardEditorWindow.cs +++ b/Assets/Editor/CardSystem/CardEditorWindow.cs @@ -18,7 +18,7 @@ namespace AppleHills.Editor.CardSystem // Paths private const string CardDefinitionsPath = "Assets/Data/Cards"; private const string MenuPath = "AppleHills/Card Editor"; - private const string CardUIPrefabPath = "Assets/Prefabs/UI/Cards/CardUI.prefab"; + private const string CardUIPrefabPath = "Assets/Prefabs/UI/Cards/SIngleCardDisplayUI.prefab"; private const string CardVisualConfigPath = CardDefinitionsPath + "/CardVisualConfig.asset"; // Editor state diff --git a/Assets/Prefabs/Managers/CardSystemManager.prefab b/Assets/Prefabs/Managers/CardSystemManager.prefab index 2960eaaf..3e12d06b 100644 --- a/Assets/Prefabs/Managers/CardSystemManager.prefab +++ b/Assets/Prefabs/Managers/CardSystemManager.prefab @@ -44,13 +44,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d80347e4bd04c87be23a9399860783d, type: 3} m_Name: m_EditorClassIdentifier: AppleHillsScripts::Data.CardSystem.CardSystemManager - availableCards: - - {fileID: 11400000, guid: 91031de62f795884e8e2ccbaebeebf9b, type: 2} - - {fileID: 11400000, guid: 5d8121cdf52bfe9488b40ed22d649209, type: 2} - - {fileID: 11400000, guid: 8f02c3699de87014bac8c03b96772a4b, type: 2} - - {fileID: 11400000, guid: 8fdeae7881d130f408e0f31c101ab41f, type: 2} - - {fileID: 11400000, guid: 28dbfbd7a6b2cd84b8274bd1126b220b, type: 2} - - {fileID: 11400000, guid: dec49537f6ae6d241acf8275eaa6c653, type: 2} - - {fileID: 11400000, guid: 6afed7a67f64404418f905e7808bf5cb, type: 2} + availableCards: [] + autoLoadCardDefinitions: 1 + cardDataPath: Data/Cards playerInventory: boosterPackCount: 0 diff --git a/Assets/Prefabs/UI/Cards/AlbumViewPage.prefab b/Assets/Prefabs/UI/Cards/AlbumViewPage.prefab index 2ba3eb05..78590e43 100644 --- a/Assets/Prefabs/UI/Cards/AlbumViewPage.prefab +++ b/Assets/Prefabs/UI/Cards/AlbumViewPage.prefab @@ -2284,13 +2284,13 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 + m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 100, y: 200} - m_Spacing: {x: 25, y: 25} - m_Constraint: 0 - m_ConstraintCount: 2 + m_CellSize: {x: 200, y: 300} + m_Spacing: {x: 50, y: 50} + m_Constraint: 1 + m_ConstraintCount: 3 --- !u!1 &5579817347513481407 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/Cards/BoosterOpeningPage.prefab b/Assets/Prefabs/UI/Cards/BoosterOpeningPage.prefab index 27a430a5..8b34baa1 100644 --- a/Assets/Prefabs/UI/Cards/BoosterOpeningPage.prefab +++ b/Assets/Prefabs/UI/Cards/BoosterOpeningPage.prefab @@ -88,7 +88,6 @@ GameObject: m_Component: - component: {fileID: 8941221421597332096} - component: {fileID: 418545990734724097} - - component: {fileID: 8234492749045289478} m_Layer: 5 m_Name: CardRevealContainer m_TagString: Untagged @@ -116,7 +115,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 700, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &418545990734724097 MonoBehaviour: @@ -139,25 +138,11 @@ MonoBehaviour: m_Spacing: 50 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!114 &8234492749045289478 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3540414444069180921} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.ContentSizeFitter - m_HorizontalFit: 2 - m_VerticalFit: 2 --- !u!1 &4219171218593530538 GameObject: m_ObjectHideFlags: 0 @@ -351,7 +336,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7186235186651138941 RectTransform: m_ObjectHideFlags: 0 @@ -1056,6 +1041,10 @@ PrefabInstance: propertyPath: m_Name value: CardBack objectReference: {fileID: 0} + - target: {fileID: 1385409402919571665, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1070,7 +1059,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchorMin.x @@ -1078,15 +1067,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_SizeDelta.x - value: 150 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_LocalPosition.x @@ -1118,11 +1107,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -150 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1136,6 +1125,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6372631110979469063, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1158,6 +1151,10 @@ PrefabInstance: propertyPath: m_Name value: CardBack3 objectReference: {fileID: 0} + - target: {fileID: 1385409402919571665, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1172,7 +1169,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchorMin.x @@ -1180,15 +1177,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_SizeDelta.x - value: 150 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_LocalPosition.x @@ -1220,11 +1217,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 600 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -150 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1238,6 +1235,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6372631110979469063, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1260,6 +1261,10 @@ PrefabInstance: propertyPath: m_Name value: CardBack2 objectReference: {fileID: 0} + - target: {fileID: 1385409402919571665, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1274,7 +1279,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchorMin.x @@ -1282,15 +1287,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_SizeDelta.x - value: 150 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_LocalPosition.x @@ -1322,11 +1327,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 350 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -150 objectReference: {fileID: 0} - target: {fileID: 4459518969173100332, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1340,6 +1345,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6372631110979469063, guid: 1d048f366a1113d4ab16b5d332bfc11d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Prefabs/UI/Cards/CardBack.prefab b/Assets/Prefabs/UI/Cards/CardBack.prefab index 92c155b4..ca8bd225 100644 --- a/Assets/Prefabs/UI/Cards/CardBack.prefab +++ b/Assets/Prefabs/UI/Cards/CardBack.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 6372631110979469063} - component: {fileID: 7263329479413350620} - component: {fileID: 1924940828255795114} + - component: {fileID: 740275584674789932} m_Layer: 5 m_Name: CardBackImage m_TagString: Untagged @@ -75,6 +76,20 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &740275584674789932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1123573611284110918} + 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: 2 + m_AspectRatio: 0.7 --- !u!1 &1385409402919571665 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/Cards/CardSystem.prefab b/Assets/Prefabs/UI/Cards/CardSystem.prefab index e455e928..a863ca97 100644 --- a/Assets/Prefabs/UI/Cards/CardSystem.prefab +++ b/Assets/Prefabs/UI/Cards/CardSystem.prefab @@ -648,76 +648,7 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4629474234990118368, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4629474234990118368, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4629474234990118368, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 4629474234990118368, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchoredPosition.y - value: -150 - objectReference: {fileID: 0} - - target: {fileID: 4937963996820091238, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4937963996820091238, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4937963996820091238, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 600 - objectReference: {fileID: 0} - - target: {fileID: 4937963996820091238, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchoredPosition.y - value: -150 - objectReference: {fileID: 0} - - target: {fileID: 6502272725549189819, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7664491371311212187, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7990969126200070685, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8423460607813885254, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8423460607813885254, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8423460607813885254, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 8423460607813885254, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_AnchoredPosition.y - value: -150 - objectReference: {fileID: 0} - - target: {fileID: 8941221421597332096, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_SizeDelta.x - value: 700 - objectReference: {fileID: 0} - - target: {fileID: 8941221421597332096, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} - propertyPath: m_SizeDelta.y - value: 300 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8234492749045289478, guid: 06de8e223a669fe48b043983963d1e6a, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -746,30 +677,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4224770106652410837} m_Modifications: - - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_SizeDelta.x - value: 233.33333 - objectReference: {fileID: 0} - - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_SizeDelta.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchoredPosition.x - value: 499.99997 - objectReference: {fileID: 0} - - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - target: {fileID: 2088943967680250180, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -850,66 +757,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_SizeDelta.x - value: 233.33333 - objectReference: {fileID: 0} - - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_SizeDelta.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchoredPosition.x - value: 216.66666 - objectReference: {fileID: 0} - - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_SizeDelta.x - value: 233.33333 - objectReference: {fileID: 0} - - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_SizeDelta.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchoredPosition.x - value: 783.3333 - objectReference: {fileID: 0} - - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 5995069628669089193, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_SizeDelta.x - value: -700 - objectReference: {fileID: 0} - target: {fileID: 8841772996182652387, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} propertyPath: m_Name value: AlbumViewPage objectReference: {fileID: 0} - - target: {fileID: 8841772996182652387, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -943,10 +794,6 @@ PrefabInstance: propertyPath: m_Name value: MainMenuPage objectReference: {fileID: 0} - - target: {fileID: 215586258230015996, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3784919015553725210, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1027,78 +874,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6825096203099742481, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6825096203099742481, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6825096203099742481, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_SizeDelta.x - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 6825096203099742481, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 6825096203099742481, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchoredPosition.x - value: 150 - objectReference: {fileID: 0} - - target: {fileID: 6825096203099742481, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchoredPosition.y - value: -40 - objectReference: {fileID: 0} - - target: {fileID: 7359584553354036269, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7359584553354036269, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7359584553354036269, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_SizeDelta.x - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 7359584553354036269, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7359584553354036269, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchoredPosition.x - value: 150 - objectReference: {fileID: 0} - - target: {fileID: 7359584553354036269, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchoredPosition.y - value: -150 - objectReference: {fileID: 0} - - target: {fileID: 9087503811150501775, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9087503811150501775, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9087503811150501775, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_SizeDelta.x - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 9087503811150501775, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 9087503811150501775, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchoredPosition.x - value: 150 - objectReference: {fileID: 0} - - target: {fileID: 9087503811150501775, guid: 43be0f1cce1e5ae4d86def9da1fe2822, type: 3} - propertyPath: m_AnchoredPosition.y - value: -260 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Prefabs/UI/Cards/MainMenuPage.prefab b/Assets/Prefabs/UI/Cards/MainMenuPage.prefab index df9a9196..c9c428b2 100644 --- a/Assets/Prefabs/UI/Cards/MainMenuPage.prefab +++ b/Assets/Prefabs/UI/Cards/MainMenuPage.prefab @@ -34,10 +34,10 @@ RectTransform: - {fileID: 3003605026999030427} m_Father: {fileID: 1666992978469506438} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -150} + m_SizeDelta: {x: 300, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8262356594320332946 CanvasRenderer: @@ -138,7 +138,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3784919015553725210 RectTransform: m_ObjectHideFlags: 0 @@ -228,10 +228,10 @@ RectTransform: - {fileID: 935304982975062306} m_Father: {fileID: 1666992978469506438} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -260} + m_SizeDelta: {x: 300, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3411861085081790681 CanvasRenderer: @@ -535,10 +535,10 @@ RectTransform: - {fileID: 5534139074864658841} m_Father: {fileID: 1666992978469506438} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -40} + m_SizeDelta: {x: 300, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3774508876281835580 CanvasRenderer: diff --git a/Assets/Prefabs/UI/Cards/SIngleCardDisplayUI.prefab b/Assets/Prefabs/UI/Cards/SIngleCardDisplayUI.prefab index c2dc0eeb..607d78e6 100644 --- a/Assets/Prefabs/UI/Cards/SIngleCardDisplayUI.prefab +++ b/Assets/Prefabs/UI/Cards/SIngleCardDisplayUI.prefab @@ -11,6 +11,9 @@ GameObject: - component: {fileID: 8321041088571283042} - component: {fileID: 8657710833814654092} - component: {fileID: 3062587662617271504} + - component: {fileID: 773682364924707625} + - component: {fileID: 5465547774692166910} + - component: {fileID: 2506092559548033437} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -33,7 +36,6 @@ RectTransform: - {fileID: 7987423280633120294} - {fileID: 6467154550771149323} - {fileID: 5853287755371765300} - - {fileID: 1376284209458560831} m_Father: {fileID: 2699789555794789249} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -65,7 +67,7 @@ MonoBehaviour: m_Color: {r: 0.8, g: 0.9, b: 0.8, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -79,6 +81,66 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2.5 +--- !u!114 &773682364924707625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674595570562273386} + 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: 2 + m_AspectRatio: 0.6666667 +--- !u!223 &5465547774692166910 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674595570562273386} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &2506092559548033437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674595570562273386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!1 &2060536854119323360 GameObject: m_ObjectHideFlags: 0 @@ -111,10 +173,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7987423280633120294} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 17.972} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -2.9004517, y: 8.941284} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 0.1, y: 0.1} + m_AnchorMax: {x: 0.9, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2165315952716078155 CanvasRenderer: @@ -171,10 +233,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 + m_fontSize: 31.75 m_fontSizeBase: 15 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 @@ -248,10 +310,10 @@ RectTransform: - {fileID: 8124520331884430719} m_Father: {fileID: 8321041088571283042} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 54.599976} - m_SizeDelta: {x: 250, y: 77.5} + m_AnchorMin: {x: 0.1, y: 0.1} + m_AnchorMax: {x: 0.9, y: 0.3} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8745186166470585342 CanvasRenderer: @@ -317,7 +379,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3326706725254864107} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -403,6 +465,7 @@ GameObject: - component: {fileID: 5853287755371765300} - component: {fileID: 8909872439431770690} - component: {fileID: 8871089254192903045} + - component: {fileID: 3888758318642584746} m_Layer: 5 m_Name: BackgroundShape m_TagString: Untagged @@ -421,13 +484,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1376284209458560831} m_Father: {fileID: 8321041088571283042} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 29} - m_SizeDelta: {x: 250, y: 250} + m_AnchorMin: {x: 0.1, y: 0.3} + m_AnchorMax: {x: 0.9, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8909872439431770690 CanvasRenderer: @@ -467,6 +531,20 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3888758318642584746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3429746996164215956} + 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: 1 + m_AspectRatio: 1 --- !u!1 &5412331388939213537 GameObject: m_ObjectHideFlags: 0 @@ -492,17 +570,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5412331388939213537} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8321041088571283042} + m_Father: {fileID: 5853287755371765300} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 29} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0.3, y: 0.3} + m_AnchorMax: {x: 0.7, y: 0.7} + m_AnchoredPosition: {x: 0, y: -28} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9097459168520965074 CanvasRenderer: @@ -603,7 +681,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0.19755316, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Scenes/TestingStuff/UIAuthoring.unity b/Assets/Scenes/TestingStuff/UIAuthoring.unity index 72268162..b4dab1e5 100644 --- a/Assets/Scenes/TestingStuff/UIAuthoring.unity +++ b/Assets/Scenes/TestingStuff/UIAuthoring.unity @@ -350,10 +350,70 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 889687949741099485, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1151296155612236777, guid: 840f3d8a936b39a41b5896328a692005, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1361024943544906240, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1361024943544906240, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1361024943544906240, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_SizeDelta.x + value: 233.33333 + objectReference: {fileID: 0} + - target: {fileID: 1361024943544906240, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_SizeDelta.y + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 1361024943544906240, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchoredPosition.x + value: 783.3333 + objectReference: {fileID: 0} + - target: {fileID: 1361024943544906240, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1576060703544730775, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_VerticalFit + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1576060703544730775, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_HorizontalFit + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1610963376915695238, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1610963376915695238, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1610963376915695238, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_SizeDelta.x + value: 233.33333 + objectReference: {fileID: 0} + - target: {fileID: 1610963376915695238, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_SizeDelta.y + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 1610963376915695238, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchoredPosition.x + value: 499.99997 + objectReference: {fileID: 0} + - target: {fileID: 1610963376915695238, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2111181035997726038, guid: 840f3d8a936b39a41b5896328a692005, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -378,6 +438,50 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2486651258353458720, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2486651258353458720, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2486651258353458720, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_SizeDelta.x + value: 233.33333 + objectReference: {fileID: 0} + - target: {fileID: 2486651258353458720, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_SizeDelta.y + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 2486651258353458720, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchoredPosition.x + value: 216.66666 + objectReference: {fileID: 0} + - target: {fileID: 2486651258353458720, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773289799931145123, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3058473479125701094, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3058473479125701094, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3058473479125701094, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3058473479125701094, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchoredPosition.y + value: 25 + objectReference: {fileID: 0} - target: {fileID: 3334079986954822490, guid: 840f3d8a936b39a41b5896328a692005, type: 3} propertyPath: m_text value: Card Album Main Page @@ -386,6 +490,18 @@ PrefabInstance: propertyPath: m_text value: Browse your cards! objectReference: {fileID: 0} + - target: {fileID: 3804308400671653276, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_ShowMaskGraphic + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4071774110803644795, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4339718129419331069, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4460458858467128264, guid: 840f3d8a936b39a41b5896328a692005, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -414,6 +530,50 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5120903670385010187, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_SizeDelta.x + value: -23.333328 + objectReference: {fileID: 0} + - target: {fileID: 6028773654600990567, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_Padding.m_Left + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6028773654600990567, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_ChildScaleWidth + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6028773654600990567, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_Padding.m_Right + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6028773654600990567, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_Padding.m_Bottom + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6028773654600990567, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_ChildControlWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6028773654600990567, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_ChildControlHeight + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6028773654600990567, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_ChildForceExpandWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6028773654600990567, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_ChildForceExpandHeight + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6615777721816985793, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6615777721816985793, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_AnchoredPosition.y + value: -275 + objectReference: {fileID: 0} - target: {fileID: 6895404274863911569, guid: 840f3d8a936b39a41b5896328a692005, type: 3} propertyPath: m_Name value: CardSystem @@ -482,6 +642,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7441755022443304607, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7541386484585061304, guid: 840f3d8a936b39a41b5896328a692005, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -578,6 +742,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8342931793201872557, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_SizeDelta.x + value: -23.333328 + objectReference: {fileID: 0} + - target: {fileID: 8476664949448215981, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_ChildAlignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8606398803908872747, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_SizeDelta.x + value: -23.333328 + objectReference: {fileID: 0} + - target: {fileID: 9041513747714235439, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_Inertia + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9041513747714235439, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_Viewport + value: + objectReference: {fileID: 0} + - target: {fileID: 9041513747714235439, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_Horizontal + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9041513747714235439, guid: 840f3d8a936b39a41b5896328a692005, type: 3} + propertyPath: m_MovementType + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9085933292592690902, guid: 840f3d8a936b39a41b5896328a692005, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/Scripts/Data/CardSystem/CardSystemManager.cs b/Assets/Scripts/Data/CardSystem/CardSystemManager.cs index d36578d4..7ced670a 100644 --- a/Assets/Scripts/Data/CardSystem/CardSystemManager.cs +++ b/Assets/Scripts/Data/CardSystem/CardSystemManager.cs @@ -1,9 +1,13 @@ using System; using System.Collections.Generic; +using System.Linq; using AppleHills.Data.CardSystem; using Bootstrap; using Core; using UnityEngine; +#if UNITY_EDITOR +using UnityEditor; +#endif namespace Data.CardSystem { @@ -20,6 +24,10 @@ namespace Data.CardSystem [Header("Card Collection")] [SerializeField] private List availableCards = new List(); + [Header("Auto-Loading Configuration")] + [SerializeField] private bool autoLoadCardDefinitions = true; + [SerializeField] private string cardDataPath = "Data/Cards"; + // Runtime data - will be serialized for save/load [SerializeField] private CardInventory playerInventory = new CardInventory(); @@ -36,6 +44,12 @@ namespace Data.CardSystem { _instance = this; + // Auto-load card definitions if enabled + if (autoLoadCardDefinitions) + { + LoadCardDefinitionsFromFolder(); + } + // Build lookup dictionary BuildDefinitionLookup(); @@ -54,6 +68,47 @@ namespace Data.CardSystem _isQuitting = true; } + /// + /// Loads all card definitions from the specified folder + /// + private void LoadCardDefinitionsFromFolder() + { + // Initialize list if needed + if (availableCards == null) + { + availableCards = new List(); + } + +#if UNITY_EDITOR + // In editor we can load assets directly from the project folder + string folderPath = "Assets/" + cardDataPath; + string[] guids = AssetDatabase.FindAssets("t:CardDefinition", new[] { folderPath }); + + List loadedDefinitions = new List(); + foreach (string guid in guids) + { + string assetPath = AssetDatabase.GUIDToAssetPath(guid); + CardDefinition cardDef = AssetDatabase.LoadAssetAtPath(assetPath); + if (cardDef != null && !string.IsNullOrEmpty(cardDef.Id)) + { + loadedDefinitions.Add(cardDef); + } + } + + // Replace the existing list with loaded definitions + availableCards = loadedDefinitions; +#else + // In build, load from Resources folder + CardDefinition[] resourceCards = Resources.LoadAll(cardDataPath); + if (resourceCards != null && resourceCards.Length > 0) + { + availableCards = resourceCards.Where(card => card != null && !string.IsNullOrEmpty(card.Id)).ToList(); + } +#endif + + Logging.Debug($"[CardSystemManager] Loaded {availableCards.Count} card definitions from {cardDataPath}"); + } + /// /// Builds a lookup dictionary for quick access to card definitions by ID /// diff --git a/Assets/Scripts/UI/CardSystem/BoosterOpeningPage.cs b/Assets/Scripts/UI/CardSystem/BoosterOpeningPage.cs index e9aa63c2..ab61fb57 100644 --- a/Assets/Scripts/UI/CardSystem/BoosterOpeningPage.cs +++ b/Assets/Scripts/UI/CardSystem/BoosterOpeningPage.cs @@ -497,20 +497,38 @@ namespace AppleHills.UI.CardSystem /// private IEnumerator MoveCardsToBackpack() { - // Find the backpack icon position if available + // Find the backpack button GameObject + GameObject backpackButton = null; Transform backpackTransform = null; + if (_cardAlbumUI != null && _cardAlbumUI.BackpackIcon != null) { - backpackTransform = _cardAlbumUI.BackpackIcon.transform; + // Get the backpack icon + GameObject backpackIcon = _cardAlbumUI.BackpackIcon; + backpackTransform = backpackIcon.transform; + + // Find the parent button that controls visibility + backpackButton = backpackIcon.transform.parent.gameObject; + + // Make sure the backpack button is visible for the animation + if (backpackButton != null) + { + backpackButton.SetActive(true); + Debug.Log("[BoosterOpeningPage] Made backpack button visible for animation"); + } } - + if (backpackTransform == null) { // If no backpack is found, just return to the menu UIPageController.Instance.PopPage(); yield break; } - + + // Speed up the animation by reducing the delay + float animationDuration = 0.3f; // Faster animation duration + float cardDelay = 0.15f; // Even shorter delay between cards + // Move each card to the backpack with slight delay between cards for (int i = 0; i < _revealedCards.Count; i++) { @@ -519,25 +537,34 @@ namespace AppleHills.UI.CardSystem { // Get the world position of the backpack Vector3 backpackWorldPos = backpackTransform.position; - + // Convert to local space of the card's parent for Tween Vector3 targetPos = card.transform.parent.InverseTransformPoint(backpackWorldPos); - - // Start the move animation - Tween.LocalPosition(card.transform, targetPos, 0.5f, cardMoveToBackpackDelay * i); - Tween.LocalScale(card.transform, Vector3.zero, 0.5f, cardMoveToBackpackDelay * i); + + // Start the move animation - ensure no cancellation between animations + Tween.LocalPosition(card.transform, targetPos, animationDuration, cardDelay * i, Tween.EaseInOut); + Tween.LocalScale(card.transform, Vector3.zero, animationDuration, cardDelay * i, Tween.EaseIn); + + Debug.Log($"[BoosterOpeningPage] Starting animation for card {i}"); + } + + // Only wait after starting each animation (don't wait after the last one) + if (i < _revealedCards.Count - 1) + { + yield return new WaitForSeconds(cardDelay); } - - // Wait before starting the next card - yield return new WaitForSeconds(cardMoveToBackpackDelay); } - - // Wait a bit after the last card - yield return new WaitForSeconds(0.5f); - + + // Calculate total animation time and wait for it to complete + float totalAnimationTime = cardDelay * (_revealedCards.Count - 1) + animationDuration; + yield return new WaitForSeconds(totalAnimationTime + 0.1f); // Small buffer to ensure animations complete + + // The backpack visibility will be handled by CardAlbumUI's OnPageChanged after popping this page + // We don't need to explicitly hide it here as the system will handle it properly + // Update state _currentState = OpeningState.Completed; - + // Return to the menu UIPageController.Instance.PopPage(); }