From 79a2b56a74abd57fdb0a855bda5a0cd017c261b2 Mon Sep 17 00:00:00 2001 From: David Finol Date: Sat, 21 Oct 2023 11:33:03 -0500 Subject: [PATCH 1/8] Add footer to main menu --- Assets/Prefabs/Components/Footer.meta | 8 + .../Components/Footer/Company Text.prefab | 81 +++ .../Footer/Company Text.prefab.meta | 7 + .../Components/Footer/Version Text.prefab | 81 +++ .../Footer/Version Text.prefab.meta | 7 + Assets/Scenes/MainMenu.unity | 460 +++++++++++++++++- Assets/Scenes/TitleScreen.unity | 394 +++++++++------ Assets/Scripts/Cgs/Menu/MainMenu.cs | 3 + .../Decorators/Footer 0 Landscape.png.meta | 88 ---- .../Decorators/Footer 0 Portrait.png.meta | 88 ---- .../Decorators/Footer 1 Landscape.png | Bin 2376 -> 0 bytes .../Decorators/Footer 1 Portrait.png | Bin 1935 -> 0 bytes .../Decorators/Footer 1 Portrait.png.meta | 88 ---- .../Decorators/Footer 2.png.meta | 88 ---- ...r 0 Landscape.png => Footer Landscape.png} | Bin ...ape.png.meta => Footer Landscape.png.meta} | 287 ++++++----- ...ter 0 Portrait.png => Footer Portrait.png} | Bin .../Decorators/Footer Portrait.png.meta | 166 +++++++ .../Decorators/{Footer 2.png => Footer.png} | Bin .../Decorators/Footer.png.meta | 166 +++++++ docs/pages/roadmap.md | 8 +- 21 files changed, 1390 insertions(+), 630 deletions(-) create mode 100644 Assets/Prefabs/Components/Footer.meta create mode 100644 Assets/Prefabs/Components/Footer/Company Text.prefab create mode 100644 Assets/Prefabs/Components/Footer/Company Text.prefab.meta create mode 100644 Assets/Prefabs/Components/Footer/Version Text.prefab create mode 100644 Assets/Prefabs/Components/Footer/Version Text.prefab.meta delete mode 100644 Assets/Sprites and Textures/Decorators/Footer 0 Landscape.png.meta delete mode 100644 Assets/Sprites and Textures/Decorators/Footer 0 Portrait.png.meta delete mode 100644 Assets/Sprites and Textures/Decorators/Footer 1 Landscape.png delete mode 100644 Assets/Sprites and Textures/Decorators/Footer 1 Portrait.png delete mode 100644 Assets/Sprites and Textures/Decorators/Footer 1 Portrait.png.meta delete mode 100644 Assets/Sprites and Textures/Decorators/Footer 2.png.meta rename Assets/Sprites and Textures/Decorators/{Footer 0 Landscape.png => Footer Landscape.png} (100%) rename Assets/Sprites and Textures/Decorators/{Footer 1 Landscape.png.meta => Footer Landscape.png.meta} (61%) rename Assets/Sprites and Textures/Decorators/{Footer 0 Portrait.png => Footer Portrait.png} (100%) create mode 100644 Assets/Sprites and Textures/Decorators/Footer Portrait.png.meta rename Assets/Sprites and Textures/Decorators/{Footer 2.png => Footer.png} (100%) create mode 100644 Assets/Sprites and Textures/Decorators/Footer.png.meta diff --git a/Assets/Prefabs/Components/Footer.meta b/Assets/Prefabs/Components/Footer.meta new file mode 100644 index 000000000..aca8a28f5 --- /dev/null +++ b/Assets/Prefabs/Components/Footer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e31626ef41735540b7ecadc7d1d99f1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Components/Footer/Company Text.prefab b/Assets/Prefabs/Components/Footer/Company Text.prefab new file mode 100644 index 000000000..67b0ee7a5 --- /dev/null +++ b/Assets/Prefabs/Components/Footer/Company Text.prefab @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2394453274100076769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8148115609625756720} + - component: {fileID: 231392729102158953} + - component: {fileID: 7177719679463343299} + m_Layer: 5 + m_Name: Company Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8148115609625756720 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2394453274100076769} + 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: 0} + 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: -550, y: 0} + m_SizeDelta: {x: 300, y: 75} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &231392729102158953 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2394453274100076769} + m_CullTransparentMesh: 0 +--- !u!114 &7177719679463343299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2394453274100076769} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.2627451, g: 0.18039216, b: 0.08627451, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9620f61733f65c749a22b0e4f59b6615, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 46 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: FINOL DIGITAL LLC diff --git a/Assets/Prefabs/Components/Footer/Company Text.prefab.meta b/Assets/Prefabs/Components/Footer/Company Text.prefab.meta new file mode 100644 index 000000000..2ba319165 --- /dev/null +++ b/Assets/Prefabs/Components/Footer/Company Text.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d2e78dd463da065408903b597c1d1333 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Components/Footer/Version Text.prefab b/Assets/Prefabs/Components/Footer/Version Text.prefab new file mode 100644 index 000000000..1d221b691 --- /dev/null +++ b/Assets/Prefabs/Components/Footer/Version Text.prefab @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4711632372673869445 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2960542575557885926} + - component: {fileID: 4004695019063181391} + - component: {fileID: 7724970348257012245} + m_Layer: 5 + m_Name: Version Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2960542575557885926 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4711632372673869445} + 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: 0} + 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: 550, y: 0} + m_SizeDelta: {x: 250, y: 75} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &4004695019063181391 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4711632372673869445} + m_CullTransparentMesh: 0 +--- !u!114 &7724970348257012245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4711632372673869445} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.2627451, g: 0.18039216, b: 0.08627451, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9620f61733f65c749a22b0e4f59b6615, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 46 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: VERSION 0.0.0 diff --git a/Assets/Prefabs/Components/Footer/Version Text.prefab.meta b/Assets/Prefabs/Components/Footer/Version Text.prefab.meta new file mode 100644 index 000000000..a4013e83b --- /dev/null +++ b/Assets/Prefabs/Components/Footer/Version Text.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fd471243b9f5d054e89c705b32ed2b06 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 7bb48edba..d1e554815 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -291,6 +291,7 @@ RectTransform: m_Children: - {fileID: 2048750634} - {fileID: 1190853730} + - {fileID: 828762961} - {fileID: 1731540962} - {fileID: 850950076} - {fileID: 1463328265} @@ -330,6 +331,7 @@ MonoBehaviour: - {fileID: 179463890} joinButton: {fileID: 223206894} quitButton: {fileID: 1328835476} + versionText: {fileID: 1766486735} --- !u!1001 &223206891 PrefabInstance: m_ObjectHideFlags: 0 @@ -809,8 +811,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2076869371} + m_Children: [] m_Father: {fileID: 1731540962} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -939,6 +940,160 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b35199c418c8f9546b6899c6f4e3f6b0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &783217847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 783217848} + - component: {fileID: 783217850} + - component: {fileID: 783217849} + m_Layer: 5 + m_Name: Footer Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &783217848 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783217847} + 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: + - {fileID: 1426684015} + - {fileID: 1766486734} + - {fileID: 2076869371} + m_Father: {fileID: 828762961} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &783217849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783217847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 298aea84d189340cdbd40ad9800d8027, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &783217850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783217847} + m_CullTransparentMesh: 1 +--- !u!1 &828762960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 828762961} + - component: {fileID: 828762963} + - component: {fileID: 828762962} + m_Layer: 5 + m_Name: Footer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &828762961 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 828762960} + 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: + - {fileID: 783217848} + m_Father: {fileID: 222978327} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &828762962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 828762960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.6862745, g: 0.58431375, b: 0.37254903, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &828762963 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 828762960} + m_CullTransparentMesh: 1 --- !u!224 &834215179 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1636765640200764539, guid: 1ab22cc3401977e43821548819f8b3ef, @@ -979,7 +1134,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 100} m_SizeDelta: {x: 0, y: 85} m_Pivot: {x: 0.5, y: 0} --- !u!1 &885528638 @@ -1823,6 +1978,130 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1328835475} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1426684014 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 783217848} + m_Modifications: + - target: {fileID: 2394453274100076769, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_Name + value: Company Text + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d2e78dd463da065408903b597c1d1333, type: 3} +--- !u!224 &1426684015 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + m_PrefabInstance: {fileID: 1426684014} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1463328263 PrefabInstance: m_ObjectHideFlags: 0 @@ -2071,9 +2350,145 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -125} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 0, y: 350} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1766486733 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 783217848} + m_Modifications: + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4711632372673869445, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_Name + value: Version Text + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fd471243b9f5d054e89c705b32ed2b06, type: 3} +--- !u!224 &1766486734 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + m_PrefabInstance: {fileID: 1766486733} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1766486735 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7724970348257012245, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + m_PrefabInstance: {fileID: 1766486733} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &2048750634 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8266031536408079399, guid: 79e94f8a015a0e242a9b4cc04523d574, @@ -2086,7 +2501,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 735687764} + m_TransformParent: {fileID: 783217848} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} @@ -2096,7 +2511,7 @@ PrefabInstance: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} propertyPath: m_Pivot.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} @@ -2106,27 +2521,27 @@ PrefabInstance: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} propertyPath: m_SizeDelta.x - value: 400 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} @@ -2176,7 +2591,7 @@ PrefabInstance: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} propertyPath: m_AnchoredPosition.y - value: -125 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} @@ -2198,6 +2613,27 @@ PrefabInstance: propertyPath: m_Text value: objectReference: {fileID: 0} + - target: {fileID: 6960506880217691888, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_Color.b + value: 0.078431375 + objectReference: {fileID: 0} + - target: {fileID: 6960506880217691888, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_Color.g + value: 0.019607844 + objectReference: {fileID: 0} + - target: {fileID: 6960506880217691888, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_Color.r + value: 0.37647063 + objectReference: {fileID: 0} + - target: {fileID: 6960506880217691888, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: c0c8191c95e1fed44ac9f08b5901d39e, + type: 3} - target: {fileID: 7755028453825778640, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} propertyPath: m_Name diff --git a/Assets/Scenes/TitleScreen.unity b/Assets/Scenes/TitleScreen.unity index df16ee220..cec9cd6de 100644 --- a/Assets/Scenes/TitleScreen.unity +++ b/Assets/Scenes/TitleScreen.unity @@ -124,164 +124,42 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &27048718 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 27048719} - - component: {fileID: 27048721} - - component: {fileID: 27048720} - m_Layer: 5 - m_Name: Version Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &27048719 +--- !u!224 &27048719 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + m_PrefabInstance: {fileID: 3116474775620743452} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 27048718} - 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: 1943692645} - 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: 550, y: 0} - m_SizeDelta: {x: 250, y: 75} - m_Pivot: {x: 0.5, y: 0} ---- !u!114 &27048720 +--- !u!114 &27048720 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7724970348257012245, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + m_PrefabInstance: {fileID: 3116474775620743452} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 27048718} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2627451, g: 0.18039216, b: 0.08627451, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 9620f61733f65c749a22b0e4f59b6615, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 46 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: VERSION 0.0.0 ---- !u!222 &27048721 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 27048718} - m_CullTransparentMesh: 0 ---- !u!1 &289522313 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 289522314} - - component: {fileID: 289522316} - - component: {fileID: 289522315} - m_Layer: 5 - m_Name: Company Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &289522314 +--- !u!224 &289522314 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + m_PrefabInstance: {fileID: 5744212419557552259} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 289522313} - 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: 1943692645} - 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: -550, y: 0} - m_SizeDelta: {x: 300, y: 75} - m_Pivot: {x: 0.5, y: 0} ---- !u!114 &289522315 +--- !u!114 &289522315 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7177719679463343299, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + m_PrefabInstance: {fileID: 5744212419557552259} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 289522313} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2627451, g: 0.18039216, b: 0.08627451, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 9620f61733f65c749a22b0e4f59b6615, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 46 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: FINOL DIGITAL LLC ---- !u!222 &289522316 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 289522313} - m_CullTransparentMesh: 0 --- !u!1 &345117219 GameObject: m_ObjectHideFlags: 0 @@ -976,6 +854,242 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: -500} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &3116474775620743452 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1943692645} + m_Modifications: + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 550 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2960542575557885926, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4711632372673869445, guid: fd471243b9f5d054e89c705b32ed2b06, + type: 3} + propertyPath: m_Name + value: Version Text + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fd471243b9f5d054e89c705b32ed2b06, type: 3} +--- !u!1001 &5744212419557552259 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1943692645} + m_Modifications: + - target: {fileID: 2394453274100076769, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_Name + value: Company Text + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -550 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8148115609625756720, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d2e78dd463da065408903b597c1d1333, type: 3} --- !u!1001 &7182009478193420948 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Cgs/Menu/MainMenu.cs b/Assets/Scripts/Cgs/Menu/MainMenu.cs index adb64bf44..cf5e4b187 100644 --- a/Assets/Scripts/Cgs/Menu/MainMenu.cs +++ b/Assets/Scripts/Cgs/Menu/MainMenu.cs @@ -47,6 +47,7 @@ private static bool HasSeenWelcome public GameObject gamesManagementMenuPrefab; + public Text versionText; public Text currentGameNameText; public Image currentCardImage; public Image currentBannerImage; @@ -70,6 +71,8 @@ private void OnEnable() private void Start() { + versionText.text = TitleScreen.VersionMessage; + #if UNITY_WEBGL joinButton.interactable = false; #endif diff --git a/Assets/Sprites and Textures/Decorators/Footer 0 Landscape.png.meta b/Assets/Sprites and Textures/Decorators/Footer 0 Landscape.png.meta deleted file mode 100644 index 85f3f867b..000000000 --- a/Assets/Sprites and Textures/Decorators/Footer 0 Landscape.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 7ee797950f73e0e42b4110155610c58a -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 9a1ad28138dd6b0429a726ef20543f3f - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites and Textures/Decorators/Footer 0 Portrait.png.meta b/Assets/Sprites and Textures/Decorators/Footer 0 Portrait.png.meta deleted file mode 100644 index b74a912e7..000000000 --- a/Assets/Sprites and Textures/Decorators/Footer 0 Portrait.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 298aea84d189340cdbd40ad9800d8027 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 6fbd0cbb5489675468314336ebd20f54 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites and Textures/Decorators/Footer 1 Landscape.png b/Assets/Sprites and Textures/Decorators/Footer 1 Landscape.png deleted file mode 100644 index f1cba6c2e4816f1013758b412d6d27ab003391c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2376 zcmW-jc|4Ts8^&MtD@Adp()3eOqfi)8B0|c9vXm?lLyM4RELlPtr837_k$r60LWV43 z7N!oVtfR5S7(`=CV_(8p<~(!$c|XtdKG*xbulsuLKiO)eR(qc%!xep z!}<+;SnlC=bcA?zl-B+zC0COQcS6cbn`~ux>#3uwU*9Ihb){w27g6cnCzpJrcM<4Mz3!d6J=`CR4iLu78Wz{{CPDh%E@q=)hJI~~>; zg0Wuc2>l}{)e;UQavBh%j9le0C3F58OoD(GyVzlQatKLaYTuKce1o;q6go|hepo}f z74Wvc>AW|HTJ#{EuU@;WPqksTBj|Ou!n3$Kul;SUEQck(*L|h7L=;BYl~;&uThR<~ zs9IYKytYR}MP+~<8_+{8ktJiwy&P=Q-IBD6*e~kQsu^_;>fD`)OF@L>C zCpq?PDIk&>KDgr^n{WMDh=(5>L-M#Mxw$NNxFg2x4xYqR{xg9rJT9%wE zT?91=?&+7vucUY4!&>yxt2VOP$W%?e^CqYFXz_ctIXz$oJa&cm;oy-CaS<;BcO)Ck zv31lz_0-@rBI%zt1_8G*s;o#>67R|(C$wTB!Z0WKE&HRTl%sP07=``GVRuW_Wo@4P zJMwu;NO`Ft$>!x*IUQ%=Joo$V#22bKSr|PU?{cwm$Wihuu6-gVvmW#9z)Q7W`OC;( zw0RkOB5j%HpN1QQzXdi<4@0u)xfrx^GD z5NdysL0Dz`ybFO)9aiZ=N$M;1R-9=i-9|p#+gJZie5L7$36A0AAAqed&UAL;{_al+ zGB3!-=aO+3+c?GjR(38jvlFkKBk%pP@Mr7O@s52P%HHS zEGy4tuLc5as^s#A{Tx^^k&I1Ha4+*6Vzv1d0|qfB@5(-!D*w_UzddIQBw%YS59n-D zgUVAraW9?&Wo|Zq;-Z;$ECs;!iT}<+)QH~xjPk!ZrG}{q2H*@U^7NWA0_#C)+vNxi zuN8RCoM~A1ehKQdynC@q&s{%#0er%dBU^Qj0kn^Xy|quUkzQFcP{8fctT|sw&vPx9 zBjl=u%^SWoL{XI83)vOYK8=WD%WDsU5~V%9#@{4(%r7{I^=Hg~JRPH6d*v_C&8>eGRv z9yQ1q<0=8j*!l?snmNT40Rw62TXSw70-4kl?mz}r3r~m`R>8MF%cB}q1g;vQlad|C zX-Q=CcEAa<_3YODxA7I+m+RT);kir~84ggKK%xY;uY8?kfv) z5g~=<3L~TV+Da=gMbY8$rCE97Mz7Tmf!Bg!{}*0on`bnB7dHF3jF{&wQtO**I}Y$x zWk3Qx`=;`lC_U;l9E^$2Kp*F(5IELRRWGb?3dH`v0f$mnXYNgPFlU5%qLFD>i1nxE zCI`7qigZrNOf6(kP|lVZ<|Ziey(xS=?y)L-s0xB!HTeaf8mn*u$!5=mP~1E7HEQr6 zxh}RP5KSp{g2Wg$8%G3i-n0kE{9OB0K@*2{+f$Bya1%sHbivYg!Gy7RbrSoMNLpyx zOQ!t=%kr+w&j5lKwaJeis;bk~Kr$b%bgM^~-GBQT)EYipmY=SMUCTt3d5S^pUTIVI z3r7(3{Wg5i>_^RJN&k4}I5}Rs^Qon@7zCdkD?l=29HH=N3gIH7uBJU{57^k&zD6?i z(e_@Hf-TVXH)fP`B-$WHz65J4>a66?A%wvtIIk=Qv{TyPOKEp=+uSL_Q=BY5asC`n znoipbxe|(>{1-Z^dDcP_D#vo3lcg0#BBGtR2mnc+yF~dpa=9fD%s7&Zn@BJ(V}!NY=X{KH)^mw;}R zhZxk9ZTfaRiLNR*8_U=H!aEGPnxicWqsvb7f29LM_tEA*Ifk&=09$QvtNY&0-DeQ+ oI>nZ7k@b`?KCc=Hix*0d{?quWWI6vj_(OusP?pAJ=Ut!v3m7hP9co4j2P09T}sK`m8~$Av83$DR!$w1tb?4&iQ(9$ z$kMqq4kN>)8Db()CJjH!jN%NxcmDaV=Y5|0zMuPf-tW7VEeW!=6 z%lp&k_&NW{_xft~%SfQSCTz4y*}TK~he}OlZD}Ue;S)67{?uz)eaG8l_0afX;Owkw z%SOXi$5w~oO}aLFrM`?hBslbWMbIu&yyoG5-mQK8MrE_pWH(hV9)HC)tzA zcg?rk-7c8ic4c-JbpI8d`t0?ff2vhS$WEgBjwyy8M_prFBF-i#o{SM#G5dC!%+#+1 zlS>|8iybA#`(j@10NPfBOLnQLIAdF}@nX8TQxhJd`V&vrNq94B zREw{uF;VJ{xO-Tg{aVe?vQdyg z;_IB{tHn3-LzC3T`nn)2o)pBU6Y(vL?h$GiuiU_|u>ZzupLy??HE~ssYWP{kYPeip z`y-f_NNqlNI@0GAkLQcEl&whlttolm_7#Dq-DrD()%D>HYh$F>Kw{dbt=^^O)15C6e2rKHOsMAhqrI>UK(`<{G;{AYh2a`k0t0Ol;>rUB;*2 zOjPsZdye^~2+TNndNgV11;fPf~bo53oU_)fMf9xry zdBdnKJm^R+1sgpn4pl$_E%eIz-mq2&98{@3V8n1E!2sn&vTnM^s#AgW^YP&`Pt=YQ zoJD!>1Z#r7hvE@s!ov4V68ljUMFaLZF@8U`G7%j@0W4Vc5k%l5Z{uozI&(sP!o9vpSNgGJPNW~|Lp-a09 zrF>V67)LABp}M1fXW5|JUKoXiE0kAx&{5(bHoqctNy)zd>I7GW4ZJmT#M(dvem<); z!*oMHsp2=qS(Q&72u1afTQf3b)m3;$>*>*C)mh7oeGuW_XC0NNJbelY7Rnr#J{fmm zVbaw%mVsV4DJoAqE#z;%Hilj;@$3ydkG*1GbE&@5V$3lUfbVkq{G-WQ-;`_sh#xN- zplmewqs2i0BdgZC;KHUm7Gj*t4{<&0pC><4fuLrVb{FdEIKKnh?_I8v&1lnS??D0Z zQ{Z^Rmsw3={Q?hfvh}Y%KbKDWsRo{-Gy-@I1(!W7(Sin} zvpHSj4Q0U@3Lx#;cxT>p>^tXHN!a^+;?!G{*cWs@`a3cj;xU*tFk zUZ1NTGb8U7OADSbneNvX9_8K(VxNSRw>V;X0J-)iy*^c63eme-9#1~#^ z%@F15M+jpGh7mYz!Yk!s+ z_Stuu5xlAo^J%gfS3HVJ4dFQCAGGG%-xKgTj_N|2{Jf}4E%au>*3Ea3Lv(yB7J?X z^{XQMKt_C5)}#fUQXlTUvm2b(0t?-RORFR4>wm;x01*D~k?gHhwD5qYXfWaB#_ezi oRa$X2-1Gt&OYN7b-P+mZe6-|TT#>Oe{LupY(=N6Yn}Ce}13I{8RsaA1 diff --git a/Assets/Sprites and Textures/Decorators/Footer 1 Portrait.png.meta b/Assets/Sprites and Textures/Decorators/Footer 1 Portrait.png.meta deleted file mode 100644 index bdfb4d381..000000000 --- a/Assets/Sprites and Textures/Decorators/Footer 1 Portrait.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 493730d426cf2460082dd86291a8c4ae -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 6fbd0cbb5489675468314336ebd20f54 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites and Textures/Decorators/Footer 2.png.meta b/Assets/Sprites and Textures/Decorators/Footer 2.png.meta deleted file mode 100644 index 2c27a715a..000000000 --- a/Assets/Sprites and Textures/Decorators/Footer 2.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 93add7b6da86513438dc095dc1d1feb2 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 75, y: 0, z: 75, w: 20} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 2288f8db06ae94e44af78e1092deaa40 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites and Textures/Decorators/Footer 0 Landscape.png b/Assets/Sprites and Textures/Decorators/Footer Landscape.png similarity index 100% rename from Assets/Sprites and Textures/Decorators/Footer 0 Landscape.png rename to Assets/Sprites and Textures/Decorators/Footer Landscape.png diff --git a/Assets/Sprites and Textures/Decorators/Footer 1 Landscape.png.meta b/Assets/Sprites and Textures/Decorators/Footer Landscape.png.meta similarity index 61% rename from Assets/Sprites and Textures/Decorators/Footer 1 Landscape.png.meta rename to Assets/Sprites and Textures/Decorators/Footer Landscape.png.meta index 9c64ac159..abb2b9287 100644 --- a/Assets/Sprites and Textures/Decorators/Footer 1 Landscape.png.meta +++ b/Assets/Sprites and Textures/Decorators/Footer Landscape.png.meta @@ -1,121 +1,166 @@ -fileFormatVersion: 2 -guid: 4e12caa72158fff40b1b79e73f2ecc15 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: a282dba092c9d7e48975a848cda89a5e - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 7ee797950f73e0e42b4110155610c58a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 9a1ad28138dd6b0429a726ef20543f3f + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites and Textures/Decorators/Footer 0 Portrait.png b/Assets/Sprites and Textures/Decorators/Footer Portrait.png similarity index 100% rename from Assets/Sprites and Textures/Decorators/Footer 0 Portrait.png rename to Assets/Sprites and Textures/Decorators/Footer Portrait.png diff --git a/Assets/Sprites and Textures/Decorators/Footer Portrait.png.meta b/Assets/Sprites and Textures/Decorators/Footer Portrait.png.meta new file mode 100644 index 000000000..1eae46a90 --- /dev/null +++ b/Assets/Sprites and Textures/Decorators/Footer Portrait.png.meta @@ -0,0 +1,166 @@ +fileFormatVersion: 2 +guid: 298aea84d189340cdbd40ad9800d8027 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6fbd0cbb5489675468314336ebd20f54 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites and Textures/Decorators/Footer 2.png b/Assets/Sprites and Textures/Decorators/Footer.png similarity index 100% rename from Assets/Sprites and Textures/Decorators/Footer 2.png rename to Assets/Sprites and Textures/Decorators/Footer.png diff --git a/Assets/Sprites and Textures/Decorators/Footer.png.meta b/Assets/Sprites and Textures/Decorators/Footer.png.meta new file mode 100644 index 000000000..65516e61f --- /dev/null +++ b/Assets/Sprites and Textures/Decorators/Footer.png.meta @@ -0,0 +1,166 @@ +fileFormatVersion: 2 +guid: 93add7b6da86513438dc095dc1d1feb2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 75, y: 0, z: 75, w: 20} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2288f8db06ae94e44af78e1092deaa40 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md index 35fd7cba7..991a6194f 100644 --- a/docs/pages/roadmap.md +++ b/docs/pages/roadmap.md @@ -4,17 +4,15 @@ permalink: roadmap.html # Roadmap -## What's New - v1.92 -- Bug-Fix: Tapping Cards -- Game-Play: Rotate Tokens/Dice/Stacks +## What's New - v1.93 + ## Active Sprint +- Deck-Editor: Card Zone should move containing scrollrect - Game-Play: Combine Stacks when dropped on each other - Game-Play: Put Card on bottom of Stack when Stack is dropped on Card - Game-Play: Face-Up Stacks (Always reveal the top card); default based on bottom - Game-Play: Rename Stacks -- Deck-Editor: Card Zone should move containing scrollrect -- Main Menu: Add setting for footer ## Backlog - 2023 Q4 - Game-Creation: Edit Button in Games Management Menu From 95a54c7057be93134d7e3b98eafc4a911331addf Mon Sep 17 00:00:00 2001 From: davidmfinol Date: Tue, 24 Oct 2023 04:38:15 +0000 Subject: [PATCH 2/8] [create-pull-request] automated change --- Assets/Plugins/FinolDigital.Cgs.CardGameDef.dll | 2 +- docs/schema/CardGameDef.json | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Assets/Plugins/FinolDigital.Cgs.CardGameDef.dll b/Assets/Plugins/FinolDigital.Cgs.CardGameDef.dll index c412b11b6..0d8accac3 100644 --- a/Assets/Plugins/FinolDigital.Cgs.CardGameDef.dll +++ b/Assets/Plugins/FinolDigital.Cgs.CardGameDef.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6da13709e8e3cda6c0712f083ab6e7466dfb3598ecd4d8b5e93bf5d1ff0651b8 +oid sha256:81c74959ca3a63e011c73821888d2fec5e74764e681f98bab8304462edebc3eb size 72704 diff --git a/docs/schema/CardGameDef.json b/docs/schema/CardGameDef.json index 6aa3a4615..ec3593f17 100644 --- a/docs/schema/CardGameDef.json +++ b/docs/schema/CardGameDef.json @@ -1,6 +1,6 @@ { - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "https://cardgamesim.finoldigital.com/schema/CardGameDef.json", + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "https://cardgamesim.finoldigital.com/schema/CardGameDef.json", "title": "CGS Custom Card Game", "type": "object", "description": "Card Game Simulator (CGS) custom card game specification", @@ -247,6 +247,10 @@ "description": "cgsGamesLink is a clickable url that will take the user directly to this game on the CGS Games website, which can be shared between users.", "format": "uri" }, + "copyright": { + "type": "string", + "description": "copyright indicates the legal owner of this Card Game. CGS will display this value in the bottom-left corner of the Main Menu." + }, "deckFileAltId": { "type": "string", "description": "When saving or loading a deck with NOT txt, deckFileAltId refers to the *Card:Property* used to uniquely identify each Card. For hsd, this is stored as a varint within the deck string.", From a9bf1ab3bd46d80b7ee032a284efd5e37f057f32 Mon Sep 17 00:00:00 2001 From: David Finol Date: Tue, 24 Oct 2023 08:50:46 -0500 Subject: [PATCH 3/8] Update card game def --- .github/pull_request_template.md | 3 +++ Assets/Scenes/MainMenu.unity | 4 ++-- Assets/Scripts/Cgs/AotTypeEnforcer.cs | 1 + Assets/Scripts/Cgs/Menu/MainMenu.cs | 1 + docs/pages/roadmap.md | 4 ++-- docs/schema/CardGameDef.json | 4 ++-- 6 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..46b787447 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,3 @@ +#### Changes + +- ... diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index d1e554815..aa24525d7 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -317,6 +317,7 @@ MonoBehaviour: m_EditorClassIdentifier: gamesManagementMenuPrefab: {fileID: 622408515558105024, guid: a8f47c13e131e5942b6e88f7f829ea47, type: 3} + versionText: {fileID: 1766486735} currentGameNameText: {fileID: 2076869372} currentCardImage: {fileID: 735687766} currentBannerImage: {fileID: 1186619955} @@ -331,7 +332,6 @@ MonoBehaviour: - {fileID: 179463890} joinButton: {fileID: 223206894} quitButton: {fileID: 1328835476} - versionText: {fileID: 1766486735} --- !u!1001 &223206891 PrefabInstance: m_ObjectHideFlags: 0 @@ -970,8 +970,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1426684015} - {fileID: 1766486734} + - {fileID: 1426684015} - {fileID: 2076869371} m_Father: {fileID: 828762961} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Cgs/AotTypeEnforcer.cs b/Assets/Scripts/Cgs/AotTypeEnforcer.cs index 340e4b6fe..dc2057d14 100644 --- a/Assets/Scripts/Cgs/AotTypeEnforcer.cs +++ b/Assets/Scripts/Cgs/AotTypeEnforcer.cs @@ -60,6 +60,7 @@ public void Awake() cardGame.CardSetsInListIsCsv = false; cardGame.CardSize = new Float2(1, 1); cardGame.CgsGamesLink = new Uri(UnityFileMethods.FilePrefix); + cardGame.Copyright = string.Empty; cardGame.DeckFileAltId = string.Empty; cardGame.DeckFileTxtId = DeckFileTxtId.Id; cardGame.DeckFileType = DeckFileType.Dec; diff --git a/Assets/Scripts/Cgs/Menu/MainMenu.cs b/Assets/Scripts/Cgs/Menu/MainMenu.cs index cf5e4b187..8cdd19086 100644 --- a/Assets/Scripts/Cgs/Menu/MainMenu.cs +++ b/Assets/Scripts/Cgs/Menu/MainMenu.cs @@ -48,6 +48,7 @@ private static bool HasSeenWelcome public GameObject gamesManagementMenuPrefab; public Text versionText; + public Text copyrightText; public Text currentGameNameText; public Image currentCardImage; public Image currentBannerImage; diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md index 991a6194f..8dbad9cba 100644 --- a/docs/pages/roadmap.md +++ b/docs/pages/roadmap.md @@ -5,13 +5,13 @@ permalink: roadmap.html # Roadmap ## What's New - v1.93 - +- Game-Play: Face-Up Stacks (Always reveal the top card); default based on bottom +- Main Menu: Footer with copyright ## Active Sprint - Deck-Editor: Card Zone should move containing scrollrect - Game-Play: Combine Stacks when dropped on each other - Game-Play: Put Card on bottom of Stack when Stack is dropped on Card -- Game-Play: Face-Up Stacks (Always reveal the top card); default based on bottom - Game-Play: Rename Stacks ## Backlog - 2023 Q4 diff --git a/docs/schema/CardGameDef.json b/docs/schema/CardGameDef.json index ec3593f17..c936db6a4 100644 --- a/docs/schema/CardGameDef.json +++ b/docs/schema/CardGameDef.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-04/schema#", - "id": "https://cardgamesim.finoldigital.com/schema/CardGameDef.json", + "$schema": "https://json-schema.org/draft/2019-09/schema", + "$id": "https://cardgamesim.finoldigital.com/schema/CardGameDef.json", "title": "CGS Custom Card Game", "type": "object", "description": "Card Game Simulator (CGS) custom card game specification", From 5f3f7cccac74df15f91b2750c84ac9f5227685e8 Mon Sep 17 00:00:00 2001 From: David Finol Date: Tue, 24 Oct 2023 21:32:33 -0500 Subject: [PATCH 4/8] Update workflow --- .github/workflows/main.yml | 2 +- docs/pages/roadmap.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0f0dab085..3edc3a49f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -184,7 +184,7 @@ jobs: large-packages: false - name: Build Unity Project id: build - uses: game-ci/unity-builder@fix/android-tools + uses: game-ci/unity-builder@main env: UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md index 8dbad9cba..c17cfc8f1 100644 --- a/docs/pages/roadmap.md +++ b/docs/pages/roadmap.md @@ -6,6 +6,7 @@ permalink: roadmap.html ## What's New - v1.93 - Game-Play: Face-Up Stacks (Always reveal the top card); default based on bottom +- default rotation for players objects - Main Menu: Footer with copyright ## Active Sprint From 312a0e614934de5a9281eb812bf519fd6e5d2b3e Mon Sep 17 00:00:00 2001 From: David Finol Date: Tue, 24 Oct 2023 22:45:29 -0500 Subject: [PATCH 5/8] Implement copyright --- .../Menus/Card Game Editor Menu.prefab | 630 ++++++++++++++++-- Assets/Scenes/MainMenu.unity | 13 + Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs | 6 +- Assets/Scripts/Cgs/Menu/MainMenu.cs | 7 + docs/games/Arcmage/Arcmage.json | 1 + docs/games/grand_archive/grand_archive.json | 3 + docs/games/zu_tiles/zu_tiles.json | 1 + docs/pages/roadmap.md | 4 +- 8 files changed, 621 insertions(+), 44 deletions(-) diff --git a/Assets/Prefabs/Menus/Card Game Editor Menu.prefab b/Assets/Prefabs/Menus/Card Game Editor Menu.prefab index 27b11fc57..3a6d1b819 100644 --- a/Assets/Prefabs/Menus/Card Game Editor Menu.prefab +++ b/Assets/Prefabs/Menus/Card Game Editor Menu.prefab @@ -32,7 +32,6 @@ RectTransform: - {fileID: 2394752781586355081} - {fileID: 7950189458055319339} m_Father: {fileID: 3851375169604423551} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -75,7 +74,6 @@ RectTransform: - {fileID: 8766467936600512831} - {fileID: 6515621363985167814} m_Father: {fileID: 8039650725797380766} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -151,7 +149,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 589498029896042040} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -233,7 +230,6 @@ RectTransform: - {fileID: 4580504870510547010} - {fileID: 2365551772223340289} m_Father: {fileID: 3250183333955770306} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -347,11 +343,10 @@ RectTransform: - {fileID: 68556434967143463} - {fileID: 3932216164698098769} m_Father: {fileID: 3250183333955770306} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 950, y: -525} + m_AnchoredPosition: {x: 1325, y: -525} m_SizeDelta: {x: 350, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2421573050088728 @@ -457,7 +452,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3135442974859525007} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -533,7 +527,6 @@ RectTransform: - {fileID: 1429764605604225270} - {fileID: 3521830516660800938} m_Father: {fileID: 7499339274736385179} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -576,7 +569,6 @@ RectTransform: - {fileID: 729577630928138020} - {fileID: 8361121955725059939} m_Father: {fileID: 3250183333955770306} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -655,6 +647,119 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!1 &4659952474164604817 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3527161702348128833} + - component: {fileID: 8516911885645753164} + - component: {fileID: 6959557572280714852} + - component: {fileID: 9135763687013837301} + - component: {fileID: 5622130039138251257} + m_Layer: 5 + m_Name: Copyright + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3527161702348128833 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4659952474164604817} + 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: + - {fileID: 4998327718712171330} + - {fileID: 2931790831641177316} + m_Father: {fileID: 3250183333955770306} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 950, y: -525} + m_SizeDelta: {x: 350, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8516911885645753164 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4659952474164604817} + m_CullTransparentMesh: 1 +--- !u!114 &6959557572280714852 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4659952474164604817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 062b85b23e1058941a28497c2519e749, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9135763687013837301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4659952474164604817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 350 + m_MinHeight: 200 + m_PreferredWidth: 350 + m_PreferredHeight: 200 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &5622130039138251257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4659952474164604817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &5016369888901016631 GameObject: m_ObjectHideFlags: 0 @@ -692,7 +797,6 @@ RectTransform: - {fileID: 3022901444140344324} - {fileID: 6864161274752435083} m_Father: {fileID: 3250183333955770306} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -802,7 +906,6 @@ RectTransform: - {fileID: 7596103962206834309} - {fileID: 1237961360904805402} m_Father: {fileID: 7499339274736385179} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -841,7 +944,6 @@ RectTransform: - {fileID: 7523910500989835574} - {fileID: 9035054129047389011} m_Father: {fileID: 3851375169604423551} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -879,7 +981,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4169596470616190412} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -961,7 +1062,6 @@ RectTransform: - {fileID: 3666106508915618790} - {fileID: 2737375154686674318} m_Father: {fileID: 3250183333955770306} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1071,7 +1171,6 @@ RectTransform: - {fileID: 4701616176055797302} - {fileID: 2782622543387560542} m_Father: {fileID: 7359350795810481114} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1109,7 +1208,6 @@ RectTransform: - {fileID: 6532323074283462557} - {fileID: 3970632001607652696} m_Father: {fileID: 7499339274736385179} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1153,7 +1251,6 @@ RectTransform: - {fileID: 931868322581639823} - {fileID: 8693532075719656647} m_Father: {fileID: 3250183333955770306} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1267,7 +1364,6 @@ RectTransform: - {fileID: 2199485113357132946} - {fileID: 7359350795810481114} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1291,7 +1387,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 80 m_TargetDisplay: 0 @@ -1353,6 +1451,7 @@ MonoBehaviour: - {fileID: 2599742076912616912} - {fileID: 2572154789908061191} - {fileID: 7702197066147813048} + - {fileID: 3037167683648316266} - {fileID: 3754865281520780255} bannerImage: {fileID: 5808374412478590082} cardBackImage: {fileID: 2900055768572430823} @@ -1363,6 +1462,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2365551772223340289} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -1481,6 +1581,9 @@ PrefabInstance: value: Playmat Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &1429764605604225270 stripped RectTransform: @@ -1493,6 +1596,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4169596470616190412} m_Modifications: - target: {fileID: 2431982676670645471, guid: 06f7fede5f8506f4aaaca01736a75a9b, @@ -1647,6 +1751,9 @@ PrefabInstance: value: Import objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06f7fede5f8506f4aaaca01736a75a9b, type: 3} --- !u!224 &3022901444140344324 stripped RectTransform: @@ -1659,6 +1766,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7359350795810481114} m_Modifications: - target: {fileID: 66792000574508518, guid: cb34354267e822c41877c9c04f71e643, @@ -1777,6 +1885,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cb34354267e822c41877c9c04f71e643, type: 3} --- !u!224 &8436142406987665874 stripped RectTransform: @@ -1789,6 +1900,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4169596470616190412} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -1912,6 +2024,9 @@ PrefabInstance: value: Banner Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &2184797249179434453 stripped RectTransform: @@ -1924,6 +2039,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3135442974859525007} m_Modifications: - target: {fileID: 2431982676670645471, guid: 06f7fede5f8506f4aaaca01736a75a9b, @@ -2078,6 +2194,9 @@ PrefabInstance: value: Import objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06f7fede5f8506f4aaaca01736a75a9b, type: 3} --- !u!224 &3666106508915618790 stripped RectTransform: @@ -2090,6 +2209,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3851375169604423551} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -2208,6 +2328,9 @@ PrefabInstance: value: CardSize Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &192443945858038370 stripped RectTransform: @@ -2220,6 +2343,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5688026884734203119} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -2338,6 +2462,9 @@ PrefabInstance: value: RulesUrl Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &68556434967143463 stripped RectTransform: @@ -2350,6 +2477,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7359350795810481114} m_Modifications: - target: {fileID: 2135092052294433000, guid: a24def208a6cce74eb7f7d07e399041b, @@ -2473,6 +2601,9 @@ PrefabInstance: value: Hide objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a24def208a6cce74eb7f7d07e399041b, type: 3} --- !u!224 &389783558036751893 stripped RectTransform: @@ -2485,6 +2616,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4580504870510547010} m_Modifications: - target: {fileID: 916273688120697700, guid: 8d611347712873941990408a695ae759, @@ -2643,6 +2775,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8d611347712873941990408a695ae759, type: 3} --- !u!224 &1237961360904805402 stripped RectTransform: @@ -2655,6 +2790,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7359350795810481114} m_Modifications: - target: {fileID: 707491489704095531, guid: bcd6c8c8d8b4b004ab05978ff2d32058, @@ -2793,6 +2929,37 @@ PrefabInstance: value: 0.725 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 707491489704095531, guid: bcd6c8c8d8b4b004ab05978ff2d32058, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3851375169604423551} + - targetCorrespondingSourceObject: {fileID: 707491489704095531, guid: bcd6c8c8d8b4b004ab05978ff2d32058, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7499339274736385179} + - targetCorrespondingSourceObject: {fileID: 707491489704095531, guid: bcd6c8c8d8b4b004ab05978ff2d32058, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4169596470616190412} + - targetCorrespondingSourceObject: {fileID: 707491489704095531, guid: bcd6c8c8d8b4b004ab05978ff2d32058, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3135442974859525007} + - targetCorrespondingSourceObject: {fileID: 707491489704095531, guid: bcd6c8c8d8b4b004ab05978ff2d32058, + type: 3} + insertIndex: -1 + addedObject: {fileID: 589498029896042040} + - targetCorrespondingSourceObject: {fileID: 707491489704095531, guid: bcd6c8c8d8b4b004ab05978ff2d32058, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3527161702348128833} + - targetCorrespondingSourceObject: {fileID: 707491489704095531, guid: bcd6c8c8d8b4b004ab05978ff2d32058, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5688026884734203119} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bcd6c8c8d8b4b004ab05978ff2d32058, type: 3} --- !u!224 &3250183333955770306 stripped RectTransform: @@ -2811,6 +2978,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8361121955725059939} m_Modifications: - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, @@ -3024,6 +3192,9 @@ PrefabInstance: value: Height InputField objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} --- !u!224 &7523910500989835574 stripped RectTransform: @@ -3048,6 +3219,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 589498029896042040} m_Modifications: - target: {fileID: 2431982676670645471, guid: 06f7fede5f8506f4aaaca01736a75a9b, @@ -3202,6 +3374,9 @@ PrefabInstance: value: Import objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06f7fede5f8506f4aaaca01736a75a9b, type: 3} --- !u!224 &931868322581639823 stripped RectTransform: @@ -3214,6 +3389,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 589498029896042040} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -3332,6 +3508,9 @@ PrefabInstance: value: Playmat Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &2878204529677410117 stripped RectTransform: @@ -3344,6 +3523,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6676301045215342878} m_Modifications: - target: {fileID: 916273688120697700, guid: 8d611347712873941990408a695ae759, @@ -3502,6 +3682,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8d611347712873941990408a695ae759, type: 3} --- !u!224 &3970632001607652696 stripped RectTransform: @@ -3514,6 +3697,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2365551772223340289} m_Modifications: - target: {fileID: 916273688120697700, guid: 8d611347712873941990408a695ae759, @@ -3672,6 +3856,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8d611347712873941990408a695ae759, type: 3} --- !u!224 &3521830516660800938 stripped RectTransform: @@ -3684,6 +3871,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6676301045215342878} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -3802,6 +3990,9 @@ PrefabInstance: value: Banner Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &6532323074283462557 stripped RectTransform: @@ -3814,6 +4005,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7359350795810481114} m_Modifications: - target: {fileID: 837295728007186336, guid: 1ab22cc3401977e43821548819f8b3ef, @@ -4104,6 +4296,9 @@ PrefabInstance: value: Create objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1ab22cc3401977e43821548819f8b3ef, type: 3} --- !u!114 &3288109361705386331 stripped MonoBehaviour: @@ -4128,6 +4323,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7499339274736385179} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -4246,6 +4442,9 @@ PrefabInstance: value: ImageFileTypes Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &6618513963490319495 stripped RectTransform: @@ -4258,6 +4457,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3135442974859525007} m_Modifications: - target: {fileID: 2431982676670645471, guid: 06f7fede5f8506f4aaaca01736a75a9b, @@ -4412,6 +4612,9 @@ PrefabInstance: value: Download objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06f7fede5f8506f4aaaca01736a75a9b, type: 3} --- !u!224 &8107115149426779594 stripped RectTransform: @@ -4419,11 +4622,146 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5855349245228155737} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6046493172065823125 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3527161702348128833} + m_Modifications: + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6960506880217691888, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_Text + value: Copyright + objectReference: {fileID: 0} + - target: {fileID: 7755028453825778640, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_Name + value: Copyright Label + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} +--- !u!224 &4998327718712171330 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + m_PrefabInstance: {fileID: 6046493172065823125} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6216116515253389710 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 729577630928138020} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -4542,6 +4880,9 @@ PrefabInstance: value: Width Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &4679451237970819929 stripped RectTransform: @@ -4554,6 +4895,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4173329969716215952} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -4672,6 +5014,9 @@ PrefabInstance: value: GameName Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &4701616176055797302 stripped RectTransform: @@ -4684,6 +5029,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8361121955725059939} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -4804,6 +5150,9 @@ PrefabInstance: value: Height Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &5720176860294135833 stripped RectTransform: @@ -4816,6 +5165,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 729577630928138020} m_Modifications: - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, @@ -5029,6 +5379,9 @@ PrefabInstance: value: Width InputField objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} --- !u!224 &2394752781586355081 stripped RectTransform: @@ -5053,6 +5406,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4169596470616190412} m_Modifications: - target: {fileID: 2431982676670645471, guid: 06f7fede5f8506f4aaaca01736a75a9b, @@ -5207,6 +5561,9 @@ PrefabInstance: value: Download objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06f7fede5f8506f4aaaca01736a75a9b, type: 3} --- !u!224 &5018735542468443228 stripped RectTransform: @@ -5219,6 +5576,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4173329969716215952} m_Modifications: - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, @@ -5372,6 +5730,9 @@ PrefabInstance: value: Name InputField objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} --- !u!114 &2599742076912616912 stripped MonoBehaviour: @@ -5391,11 +5752,193 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7365657982666812309} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7496838231124872495 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3527161702348128833} + m_Modifications: + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_SizeDelta.x + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -85 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_OnSubmit.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_OnSubmit.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2509290508521618914} + - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_OnSubmit.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_Copyright + objectReference: {fileID: 0} + - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2509290508521618914} + - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_Copyright + objectReference: {fileID: 0} + - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_OnSubmit.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Cgs.Menu.CardGameEditorMenu, Cgs + objectReference: {fileID: 0} + - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Cgs.Menu.CardGameEditorMenu, Cgs + objectReference: {fileID: 0} + - target: {fileID: 4768883952711561113, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_Text + value: Enter copyright... + objectReference: {fileID: 0} + - target: {fileID: 4881203083407124929, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + propertyPath: m_Name + value: Copyright InputField + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} +--- !u!224 &2931790831641177316 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + m_PrefabInstance: {fileID: 7496838231124872495} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3037167683648316266 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + m_PrefabInstance: {fileID: 7496838231124872495} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7770434279319204228 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8361121955725059939} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -5514,6 +6057,9 @@ PrefabInstance: value: Inches Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &9035054129047389011 stripped RectTransform: @@ -5526,6 +6072,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8039650725797380766} m_Modifications: - target: {fileID: 1758299397351345693, guid: 40676e8920314bd46b8603e701fc1165, @@ -5664,6 +6211,9 @@ PrefabInstance: value: BackgroundMode objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 40676e8920314bd46b8603e701fc1165, type: 3} --- !u!224 &2199485113357132946 stripped RectTransform: @@ -5676,6 +6226,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5688026884734203119} m_Modifications: - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, @@ -5788,31 +6339,16 @@ PrefabInstance: propertyPath: m_OnSubmit.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 0 objectReference: {fileID: 0} - - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, - type: 3} - propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} propertyPath: m_OnSubmit.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 2509290508521618914} - - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, - type: 3} - propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2509290508521618914} - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} propertyPath: m_OnSubmit.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: set_RulesUrl objectReference: {fileID: 0} - - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, - type: 3} - propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_RulesUrl - objectReference: {fileID: 0} - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -5826,17 +6362,12 @@ PrefabInstance: - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} propertyPath: m_OnSubmit.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Cgs.Menu.GameCreationMenu, Cgs - objectReference: {fileID: 0} - - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, - type: 3} - propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Cgs.Menu.GameCreationMenu, Cgs + value: Cgs.Menu.CardGameEditorMenu, Cgs objectReference: {fileID: 0} - target: {fileID: 4768240308299460165, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Cgs.Menu.GameCreationMenu, Cgs + value: Cgs.Menu.CardGameEditorMenu, Cgs objectReference: {fileID: 0} - target: {fileID: 4768883952711561113, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} @@ -5849,6 +6380,9 @@ PrefabInstance: value: RulesUrl InputField objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} --- !u!114 &3754865281520780255 stripped MonoBehaviour: @@ -5873,6 +6407,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 729577630928138020} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -5991,6 +6526,9 @@ PrefabInstance: value: Inches Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &7950189458055319339 stripped RectTransform: @@ -6003,6 +6541,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3135442974859525007} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -6121,6 +6660,9 @@ PrefabInstance: value: CardBack Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &7770091536602769404 stripped RectTransform: @@ -6133,6 +6675,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 589498029896042040} m_Modifications: - target: {fileID: 2431982676670645471, guid: 06f7fede5f8506f4aaaca01736a75a9b, @@ -6287,6 +6830,9 @@ PrefabInstance: value: Download objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06f7fede5f8506f4aaaca01736a75a9b, type: 3} --- !u!224 &6658134412548995940 stripped RectTransform: @@ -6299,6 +6845,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4580504870510547010} m_Modifications: - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, @@ -6417,6 +6964,9 @@ PrefabInstance: value: CardBack Label objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} --- !u!224 &7596103962206834309 stripped RectTransform: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index aa24525d7..37d9a9bc4 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -318,6 +318,7 @@ MonoBehaviour: gamesManagementMenuPrefab: {fileID: 622408515558105024, guid: a8f47c13e131e5942b6e88f7f829ea47, type: 3} versionText: {fileID: 1766486735} + copyrightText: {fileID: 1426684016} currentGameNameText: {fileID: 2076869372} currentCardImage: {fileID: 735687766} currentBannerImage: {fileID: 1186619955} @@ -2102,6 +2103,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1426684014} m_PrefabAsset: {fileID: 0} +--- !u!114 &1426684016 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7177719679463343299, guid: d2e78dd463da065408903b597c1d1333, + type: 3} + m_PrefabInstance: {fileID: 1426684014} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1463328263 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs b/Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs index 266726c75..390cd17ba 100644 --- a/Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs +++ b/Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs @@ -15,7 +15,6 @@ using Newtonsoft.Json.Serialization; using SFB; using UnityEngine; -using UnityEngine.Serialization; using UnityEngine.UI; using UnityExtensionMethods; @@ -46,7 +45,7 @@ public class CardGameEditorMenu : Modal public Image bannerImage; public Image cardBackImage; public Image playMatImage; - [FormerlySerializedAs("newCardGameButton")] public Button saveButton; + public Button saveButton; private DownloadMenu Downloader => _downloader ??= Instantiate(downloadMenuPrefab).GetOrAddComponent(); @@ -106,6 +105,8 @@ public string Height [UsedImplicitly] public int PlayMatImageFileType { get; set; } + [UsedImplicitly] public string Copyright { get; set; } + [UsedImplicitly] public string RulesUrl { get; set; } private void Update() @@ -372,6 +373,7 @@ private IEnumerator CreateGame() CardSetIdentifier = "setCode", PlayMatImageFileType = PlayMatImageFileType == 0 ? "png" : "jpg", PlayMatImageUrl = _game.PlayMatImageUrl, + Copyright = string.IsNullOrWhiteSpace(Copyright) ? "" : Copyright, RulesUrl = Uri.IsWellFormedUriString(RulesUrl, UriKind.Absolute) ? new Uri(RulesUrl) : null }; diff --git a/Assets/Scripts/Cgs/Menu/MainMenu.cs b/Assets/Scripts/Cgs/Menu/MainMenu.cs index 8cdd19086..61abf1f12 100644 --- a/Assets/Scripts/Cgs/Menu/MainMenu.cs +++ b/Assets/Scripts/Cgs/Menu/MainMenu.cs @@ -68,6 +68,13 @@ private static bool HasSeenWelcome private void OnEnable() { CardGameManager.Instance.OnSceneActions.Add(ResetGameSelectionCarousel); + CardGameManager.Instance.OnSceneActions.Add(SetCopyright); + } + + private void SetCopyright() + { + if (!string.IsNullOrWhiteSpace(CardGameManager.Current.Copyright)) + copyrightText.text = CardGameManager.Current.Copyright; } private void Start() diff --git a/docs/games/Arcmage/Arcmage.json b/docs/games/Arcmage/Arcmage.json index 43a9b3d04..3169298e8 100644 --- a/docs/games/Arcmage/Arcmage.json +++ b/docs/games/Arcmage/Arcmage.json @@ -95,6 +95,7 @@ "y": 3.622 }, "cgsGamesLink": "https://cgs.games/link/arcmage", + "copyright": "Arcmage.org", "deckMaxCount": 45, "deckSharePreference": "individual", "enums": [ diff --git a/docs/games/grand_archive/grand_archive.json b/docs/games/grand_archive/grand_archive.json index 0f1c5aafa..d52291f88 100644 --- a/docs/games/grand_archive/grand_archive.json +++ b/docs/games/grand_archive/grand_archive.json @@ -117,6 +117,7 @@ "cardSetsInList": true, "cardSetIdentifier": "editions", "cgsGamesLink": "https://cgs.games/link/grand_archive", + "copyright": "Weebs of the Shore", "deckSharePreference": "individual", "deckUrls": [ { @@ -252,6 +253,7 @@ ], "gamePlayZones": [ { + "defaultCardAction": "flip", "face": "down", "position": { "x": 0, @@ -264,6 +266,7 @@ "type": "horizontal" }, { + "defaultCardAction": "flip", "face": "down", "position": { "x": 0, diff --git a/docs/games/zu_tiles/zu_tiles.json b/docs/games/zu_tiles/zu_tiles.json index 0b1af7b54..9dbeccad2 100644 --- a/docs/games/zu_tiles/zu_tiles.json +++ b/docs/games/zu_tiles/zu_tiles.json @@ -48,6 +48,7 @@ "y": 3.0 }, "cgsGamesLink": "https://cgs.games/link/zu_tiles", + "copyright": "ZU Studios", "deckSharePreference": "individual", "deckUrls": [ { diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md index c17cfc8f1..0301a2f91 100644 --- a/docs/pages/roadmap.md +++ b/docs/pages/roadmap.md @@ -5,9 +5,9 @@ permalink: roadmap.html # Roadmap ## What's New - v1.93 -- Game-Play: Face-Up Stacks (Always reveal the top card); default based on bottom -- default rotation for players objects - Main Menu: Footer with copyright +- default rotation for players objects +- Game-Play: Face-Up Stacks (Always reveal the top card); default based on bottom ## Active Sprint - Deck-Editor: Card Zone should move containing scrollrect From fbad39c7759259e3349153f9ed0b2ab0c356f160 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 05:47:31 +0000 Subject: [PATCH 6/8] Bump jlumbroso/free-disk-space from 1.3.0 to 1.3.1 Bumps [jlumbroso/free-disk-space](https://github.com/jlumbroso/free-disk-space) from 1.3.0 to 1.3.1. - [Release notes](https://github.com/jlumbroso/free-disk-space/releases) - [Commits](https://github.com/jlumbroso/free-disk-space/compare/v1.3.0...v1.3.1) --- updated-dependencies: - dependency-name: jlumbroso/free-disk-space dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3edc3a49f..31cd2ac42 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -179,7 +179,7 @@ jobs: restore-keys: Library-buildLinux-${{ matrix.targetPlatform }}- - name: Free Disk Space if: matrix.targetPlatform == 'Android' || matrix.targetPlatform == 'StandaloneLinux64' - uses: jlumbroso/free-disk-space@v1.3.0 + uses: jlumbroso/free-disk-space@v1.3.1 with: large-packages: false - name: Build Unity Project From 58420db981a25dc590d84e07bd085c57d2d302d1 Mon Sep 17 00:00:00 2001 From: David Finol Date: Sat, 28 Oct 2023 01:17:08 -0500 Subject: [PATCH 7/8] Flip top card in Stack --- .../Viewer/Playable Viewer.prefab | 354 +++++++++++++++--- Assets/Scenes/MainMenu.unity | 8 +- .../Cgs/CardGameView/Multiplayer/CardModel.cs | 8 +- .../Cgs/CardGameView/Multiplayer/CardStack.cs | 104 ++++- .../Cgs/CardGameView/Viewer/PlayableViewer.cs | 14 + .../Cgs/Play/Multiplayer/CgsNetPlayer.cs | 13 +- Assets/Scripts/Cgs/Play/PlayController.cs | 16 +- docs/pages/roadmap.md | 4 +- 8 files changed, 442 insertions(+), 79 deletions(-) diff --git a/Assets/Prefabs/CardGameView/Viewer/Playable Viewer.prefab b/Assets/Prefabs/CardGameView/Viewer/Playable Viewer.prefab index 7e64eb327..578023939 100644 --- a/Assets/Prefabs/CardGameView/Viewer/Playable Viewer.prefab +++ b/Assets/Prefabs/CardGameView/Viewer/Playable Viewer.prefab @@ -35,7 +35,6 @@ RectTransform: - {fileID: 8619593738758247335} - {fileID: 6017011295155346931} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -59,7 +58,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 30 m_TargetDisplay: 0 @@ -156,7 +157,6 @@ RectTransform: - {fileID: 7304511014057866539} - {fileID: 8041832690451199686} m_Father: {fileID: 6017011295155346931} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -172,7 +172,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3750639968265570870} - - component: {fileID: 805472597023567565} m_Layer: 5 m_Name: Stack Action Buttons m_TagString: Untagged @@ -195,40 +194,14 @@ RectTransform: - {fileID: 3808477059254410827} - {fileID: 4428188004025886175} - {fileID: 2423677528301809542} + - {fileID: 8550069765624032149} m_Father: {fileID: 6017011295155346931} - m_RootOrder: 2 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: 240, y: 80} + m_SizeDelta: {x: 240, y: 160} m_Pivot: {x: 0, y: 0} ---- !u!114 &805472597023567565 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3718179242149436236} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1 &6741518953216345288 GameObject: m_ObjectHideFlags: 0 @@ -266,7 +239,6 @@ RectTransform: - {fileID: 2701433319441782439} - {fileID: 7512204855791781900} m_Father: {fileID: 224256216305895768} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -356,7 +328,6 @@ RectTransform: m_Children: - {fileID: 1939774884943103800} m_Father: {fileID: 224256216305895768} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -418,6 +389,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2063282424838708590} m_Modifications: - target: {fileID: 60276916285824526, guid: 849115afddf0d7d48b0bd0f145f7349d, @@ -627,6 +599,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} --- !u!224 &7304511014057866539 stripped RectTransform: @@ -639,6 +614,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2063282424838708590} m_Modifications: - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, @@ -827,6 +803,13 @@ PrefabInstance: value: Value InputField objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4881203083407124929, guid: f4698c1a75d36a640afc1bea8b676ff4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2024275820901627387} m_SourcePrefab: {fileID: 100100000, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} --- !u!224 &5858791199866725480 stripped RectTransform: @@ -865,11 +848,227 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1381180623712942666 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3750639968265570870} + m_Modifications: + - target: {fileID: 60276916285824526, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: isBelow + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 60276916285824526, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: tooltip + value: Flip + objectReference: {fileID: 0} + - target: {fileID: 7317508625745834898, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7317508625745834898, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7317508625745834898, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7317508625745834898, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7317508625745834898, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_SizeDelta.x + value: 48 + objectReference: {fileID: 0} + - target: {fileID: 7317508625745834898, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_SizeDelta.y + value: 48 + objectReference: {fileID: 0} + - target: {fileID: 7317508625745834898, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.000019073486 + objectReference: {fileID: 0} + - target: {fileID: 7317508625745834899, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 93ae1e7b545de544581634a7d7503b5f, + type: 3} + - target: {fileID: 7317508625903915484, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915484, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915484, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7043608188858395400} + - target: {fileID: 7317508625903915484, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915484, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: FlipStackTopFace + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915484, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Cgs.CardGameView.Viewer.PlayableViewer, Cgs + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915484, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915486, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_Name + value: Flip Button + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} +--- !u!224 &8550069765624032149 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + m_PrefabInstance: {fileID: 1381180623712942666} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2527135387751995872 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6017011295155346931} m_Modifications: - target: {fileID: 1921475035861756271, guid: e885b7dcac6cff447a150d9f185e8af7, @@ -998,6 +1197,9 @@ PrefabInstance: value: 0.000030517578 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e885b7dcac6cff447a150d9f185e8af7, type: 3} --- !u!114 &4159148351361970319 stripped MonoBehaviour: @@ -1022,6 +1224,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6017011295155346931} m_Modifications: - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, @@ -1211,6 +1414,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 633149931556260070, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7317639397450611250} m_SourcePrefab: {fileID: 100100000, guid: 050b35c711bf97548b7054e54e7b44b4, type: 3} --- !u!1 &2701433319441782438 stripped GameObject: @@ -1242,6 +1452,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2063282424838708590} m_Modifications: - target: {fileID: 2613576563567182751, guid: 0a6d397d5e8fe8140924902ae81023bb, @@ -1380,6 +1591,13 @@ PrefabInstance: value: '-' objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2613576563567182751, guid: 0a6d397d5e8fe8140924902ae81023bb, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3681386022349280471} m_SourcePrefab: {fileID: 100100000, guid: 0a6d397d5e8fe8140924902ae81023bb, type: 3} --- !u!1 &7217063693940575233 stripped GameObject: @@ -1411,6 +1629,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3750639968265570870} m_Modifications: - target: {fileID: 60276916285824526, guid: 849115afddf0d7d48b0bd0f145f7349d, @@ -1456,7 +1675,7 @@ PrefabInstance: - target: {fileID: 7317508625745834898, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.000019073486 + value: 0.000015258789 objectReference: {fileID: 0} - target: {fileID: 7317508625745834899, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -1507,12 +1726,12 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_Pivot.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_Pivot.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -1522,22 +1741,22 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -1587,12 +1806,12 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.x - value: 160 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -1610,6 +1829,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} --- !u!224 &2423677528301809542 stripped RectTransform: @@ -1622,6 +1844,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2063282424838708590} m_Modifications: - target: {fileID: 2613576563567182751, guid: 0a6d397d5e8fe8140924902ae81023bb, @@ -1765,6 +1988,13 @@ PrefabInstance: value: + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2613576563567182751, guid: 0a6d397d5e8fe8140924902ae81023bb, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5202102917289115554} m_SourcePrefab: {fileID: 100100000, guid: 0a6d397d5e8fe8140924902ae81023bb, type: 3} --- !u!1 &7818937809804069982 stripped GameObject: @@ -1796,6 +2026,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3750639968265570870} m_Modifications: - target: {fileID: 60276916285824526, guid: 849115afddf0d7d48b0bd0f145f7349d, @@ -1907,7 +2138,7 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_Pivot.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -1922,7 +2153,7 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -1932,7 +2163,7 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -1987,7 +2218,7 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -2005,6 +2236,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} --- !u!224 &3808477059254410827 stripped RectTransform: @@ -2017,6 +2251,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3750639968265570870} m_Modifications: - target: {fileID: 60276916285824526, guid: 849115afddf0d7d48b0bd0f145f7349d, @@ -2113,12 +2348,12 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_Pivot.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_Pivot.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -2128,22 +2363,22 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -2193,12 +2428,12 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.x - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -2216,6 +2451,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} --- !u!224 &4428188004025886175 stripped RectTransform: @@ -2228,6 +2466,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6017011295155346931} m_Modifications: - target: {fileID: 2135092052294433000, guid: a24def208a6cce74eb7f7d07e399041b, @@ -2361,6 +2600,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a24def208a6cce74eb7f7d07e399041b, type: 3} --- !u!224 &7512204855791781900 stripped RectTransform: @@ -2373,6 +2615,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8619593738758247335} m_Modifications: - target: {fileID: 1921475035861756271, guid: e885b7dcac6cff447a150d9f185e8af7, @@ -2501,6 +2744,9 @@ PrefabInstance: value: 0.000030517578 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e885b7dcac6cff447a150d9f185e8af7, type: 3} --- !u!224 &1939774884943103800 stripped RectTransform: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 37d9a9bc4..f133c689f 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -549,7 +549,7 @@ PrefabInstance: - target: {fileID: 1636765640200764539, guid: 1ab22cc3401977e43821548819f8b3ef, type: 3} propertyPath: m_SizeDelta.y - value: 85 + value: 100 objectReference: {fileID: 0} - target: {fileID: 1636765640200764539, guid: 1ab22cc3401977e43821548819f8b3ef, type: 3} @@ -1136,7 +1136,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 100} - m_SizeDelta: {x: 0, y: 85} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0} --- !u!1 &885528638 GameObject: @@ -2363,7 +2363,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -100} + m_AnchoredPosition: {x: 0, y: -75} m_SizeDelta: {x: 0, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1766486733 @@ -2909,7 +2909,7 @@ PrefabInstance: - target: {fileID: 1636765640200764539, guid: 1ab22cc3401977e43821548819f8b3ef, type: 3} propertyPath: m_SizeDelta.y - value: 84.5246 + value: 100 objectReference: {fileID: 0} - target: {fileID: 1636765640200764539, guid: 1ab22cc3401977e43821548819f8b3ef, type: 3} diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardModel.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardModel.cs index 2db4b42a4..173bc3a3c 100644 --- a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardModel.cs +++ b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardModel.cs @@ -316,9 +316,9 @@ public void OnDrop(CardModel cardModel) var cards = new List {Value, cardModel.Value}; if (IsOnline) CgsNetManager.Instance.LocalPlayer.RequestNewCardStack(PlayController.DefaultStackName, cards, - Position); + Position, !IsFacedown); else - PlayController.Instance.CreateCardStack(PlayController.DefaultStackName, cards, Position); + PlayController.Instance.CreateCardStack(PlayController.DefaultStackName, cards, Position, !IsFacedown); Debug.Log($"Discarding {cardModel.gameObject.name} and {gameObject.name} OnDrop"); cardModel.Discard(); @@ -479,10 +479,10 @@ public override void SnapToGrid() var cards = new List {siblingCardModel.Value, Value}; if (IsOnline) CgsNetManager.Instance.LocalPlayer.RequestNewCardStack(PlayController.DefaultStackName, - cards, siblingCardModel.Position); + cards, siblingCardModel.Position, !siblingCardModel.IsFacedown); else PlayController.Instance.CreateCardStack(PlayController.DefaultStackName, - cards, siblingCardModel.Position); + cards, siblingCardModel.Position, !siblingCardModel.IsFacedown); siblingCardModel.Discard(); Discard(); return; diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs index 8fbe72adf..a28ef3531 100644 --- a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs +++ b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs @@ -43,7 +43,7 @@ public static void Shuffle(this IList list) } [RequireComponent(typeof(CardDropArea))] - public class CardStack : CgsNetPlayable, ICardDropHandler + public class CardStack : CgsNetPlayable, ICardDisplay, ICardDropHandler { private const float DragHoldTime = 0.5f; public const string ShuffleText = "Shuffled!"; @@ -108,12 +108,44 @@ public IReadOnlyList Cards private readonly NetworkVariable _actionText = new(); private readonly NetworkVariable _actionTime = new(); + private UnityCard TopCard + { + get + { + var cards = Cards; + return cards.Count > 0 ? cards[^1] : null; + } + } + + public bool IsTopFaceup + { + get => _isTopFaceup; + set + { + var oldValue = _isTopFaceup; + _isTopFaceup = value; + if (IsOnline) + SetIsTopFaceupServerRpc(_isTopFaceup); + else if (oldValue != _isTopFaceup) + OnChangeIsTopFaceup(oldValue, _isTopFaceup); + } + } + + private bool _isTopFaceup; + private readonly NetworkVariable _isTopFaceupNetworkVariable = new(); + public StackViewer Viewer { get; private set; } + public override void OnNetworkSpawn() + { + _isTopFaceup = _isTopFaceupNetworkVariable.Value; + } + protected override void OnAwakePlayable() { _cardIds = new NetworkList(); _name.OnValueChanged += OnChangeName; + _isTopFaceupNetworkVariable.OnValueChanged += OnChangeIsTopFaceup; } protected override void OnStartPlayable() @@ -133,6 +165,24 @@ protected override void OnStartPlayable() _cardIds.OnListChanged += OnCardsUpdated; topCard.sprite = CardGameManager.Current.CardBackImageSprite; + if (IsTopFaceup) + TopCard?.RegisterDisplay(this); + } + + public void SetImageSprite(Sprite imageSprite) + { + if (imageSprite == null) + { + RemoveImageSprite(); + return; + } + + topCard.sprite = imageSprite; + } + + private void RemoveImageSprite() + { + topCard.sprite = CardGameManager.Current.CardBackImageSprite; } protected override void OnUpdatePlayable() @@ -207,7 +257,7 @@ private void DragCard(PointerEventData eventData) else PopCard(); - CardModel.CreateDrag(eventData, cardModelPrefab, transform, unityCard, true, + CardModel.CreateDrag(eventData, cardModelPrefab, transform, unityCard, !IsTopFaceup, PlayController.Instance.playAreaCardZone); RemovePointer(eventData); @@ -233,6 +283,27 @@ private void UpdateCardsServerRpc(CgsNetString[] cardIds) private void OnCardsUpdated(NetworkListEvent changeEvent) { + if (IsTopFaceup) + { + if (changeEvent.Type.Equals(NetworkListEvent.EventType.RemoveAt) && + changeEvent.Index == _cardIds.Count) + { + if (CardGameManager.Current.Cards.TryGetValue(changeEvent.PreviousValue, out var previous)) + previous.UnregisterDisplay(this); + if (CardGameManager.Current.Cards.TryGetValue(_cardIds[^1], out var current)) + current.RegisterDisplay(this); + } + + if (changeEvent.Type.Equals(NetworkListEvent.EventType.Insert) && + changeEvent.Index == _cardIds.Count -1) + { + if (CardGameManager.Current.Cards.TryGetValue(_cardIds[^2], out var previous)) + previous.UnregisterDisplay(this); + if (CardGameManager.Current.Cards.TryGetValue(changeEvent.Value, out var current)) + current.RegisterDisplay(this); + } + } + countLabel.text = _cardIds.Count.ToString(); if (Viewer != null) Viewer.Sync(this); @@ -267,6 +338,22 @@ public string PopCard() return RemoveAt(_cardIds.Count - 1); } + [ServerRpc(RequireOwnership = false)] + private void SetIsTopFaceupServerRpc(bool isFacedown) + { + _isTopFaceupNetworkVariable.Value = isFacedown; + } + + [PublicAPI] + public void OnChangeIsTopFaceup(bool oldValue, bool newValue) + { + _isTopFaceup = newValue; + if (IsTopFaceup) + TopCard?.RegisterDisplay(this); + else + TopCard?.UnregisterDisplay(this); + } + [UsedImplicitly] public void View() { @@ -334,5 +421,18 @@ private void Save() Debug.LogError(DeckLoadMenu.DeckSaveErrorMessage + e.Message); } } + + [UsedImplicitly] + public void FlipTopFace() + { + IsTopFaceup = !IsTopFaceup; + } + + public override void OnDestroy() + { + TopCard?.UnregisterDisplay(this); + + base.OnDestroy(); + } } } diff --git a/Assets/Scripts/Cgs/CardGameView/Viewer/PlayableViewer.cs b/Assets/Scripts/Cgs/CardGameView/Viewer/PlayableViewer.cs index 7763a792e..62c46bfc5 100644 --- a/Assets/Scripts/Cgs/CardGameView/Viewer/PlayableViewer.cs +++ b/Assets/Scripts/Cgs/CardGameView/Viewer/PlayableViewer.cs @@ -120,6 +120,8 @@ private void Update() ShuffleStack(); else if (Inputs.IsSave) SaveStack(); + else if (Inputs.IsFilter) + FlipStackTopFace(); } if (Inputs.IsCancel) @@ -256,6 +258,18 @@ public void SaveStack() Stack.PromptSave(); } + [UsedImplicitly] + public void FlipStackTopFace() + { + if (Stack == null) + { + Debug.LogWarning("Ignoring flip top face request since there is no stack selected."); + return; + } + + Stack.FlipTopFace(); + } + [UsedImplicitly] public void DeletePlayable() { diff --git a/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs b/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs index abfe1165b..290fd678e 100644 --- a/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs +++ b/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs @@ -268,27 +268,28 @@ private void UpdatePointsServerRpc(int points) #region CardStacks - public void RequestNewDeck(string deckName, IEnumerable cards) + public void RequestNewDeck(string deckName, IEnumerable cards, bool isFaceup) { Debug.Log($"[CgsNet Player] Requesting new deck {deckName}..."); CreateCardStackServerRpc(deckName, cards.Select(card => (CgsNetString) card.Id).ToArray(), true, - PlayController.Instance.NewDeckPosition); + PlayController.Instance.NewDeckPosition, isFaceup); } - public void RequestNewCardStack(string stackName, IEnumerable cards, Vector2 position) + public void RequestNewCardStack(string stackName, IEnumerable cards, Vector2 position, bool isFaceup) { Debug.Log($"[CgsNet Player] Requesting new card stack {stackName}..."); CreateCardStackServerRpc(stackName, cards.Select(card => (CgsNetString) card.Id).ToArray(), false, - position); + position, isFaceup); } [ServerRpc] // ReSharper disable once ParameterTypeCanBeEnumerable.Local - private void CreateCardStackServerRpc(string stackName, CgsNetString[] cardIds, bool isDeck, Vector2 position) + private void CreateCardStackServerRpc(string stackName, CgsNetString[] cardIds, bool isDeck, Vector2 position, + bool isFaceup) { Debug.Log($"[CgsNet Player] Creating new card stack {stackName}..."); var cardStack = PlayController.Instance.CreateCardStack(stackName, - cardIds.Select(cardId => CardGameManager.Current.Cards[cardId]).ToList(), position); + cardIds.Select(cardId => CardGameManager.Current.Cards[cardId]).ToList(), position, isFaceup); if (isDeck) CurrentDeck = cardStack.GetComponent(); Debug.Log($"[CgsNet Player] Created new card stack {stackName}!"); diff --git a/Assets/Scripts/Cgs/Play/PlayController.cs b/Assets/Scripts/Cgs/Play/PlayController.cs index 0549affc8..767691e83 100644 --- a/Assets/Scripts/Cgs/Play/PlayController.cs +++ b/Assets/Scripts/Cgs/Play/PlayController.cs @@ -262,7 +262,7 @@ private void LoadDeck(UnityDeck deck) var newDeckPosition = NewDeckPosition; if (CgsNetManager.Instance.IsOnline && CgsNetManager.Instance.LocalPlayer != null) { - CgsNetManager.Instance.LocalPlayer.RequestNewDeck(deckName, deckCards); + CgsNetManager.Instance.LocalPlayer.RequestNewDeck(deckName, deckCards, false); var i = 1; foreach (var (stackName, cards) in extraGroups) { @@ -279,13 +279,13 @@ private void LoadDeck(UnityDeck deck) } CgsNetManager.Instance.LocalPlayer.RequestNewCardStack(stackName, cards.Cast().Reverse(), - position); + position, false); i++; } } else { - _soloDeckStack = CreateCardStack(deckName, deckCards, newDeckPosition); + _soloDeckStack = CreateCardStack(deckName, deckCards, newDeckPosition, false); var i = 1; foreach (var (groupName, cards) in extraGroups) { @@ -299,7 +299,7 @@ private void LoadDeck(UnityDeck deck) position = CardGameManager.PixelsPerInch * new Vector2(targetPosition.X, targetPosition.Y); } - CreateCardStack(groupName, cards.Cast().Reverse().ToList(), position); + CreateCardStack(groupName, cards.Cast().Reverse().ToList(), position, false); i++; } } @@ -337,7 +337,7 @@ private void CreateGameBoard(GameBoard board) boardRectTransform.localScale = Vector3.one; } - public CardStack CreateCardStack(string stackName, IReadOnlyList cards, Vector2 position) + public CardStack CreateCardStack(string stackName, IReadOnlyList cards, Vector2 position, bool isFaceup) { var cardStack = Instantiate(cardStackPrefab, playAreaCardZone.transform).GetComponent(); if (CgsNetManager.Instance.IsOnline) @@ -350,6 +350,8 @@ public CardStack CreateCardStack(string stackName, IReadOnlyList card if (!Vector2.zero.Equals(position)) rectTransform.localPosition = position; cardStack.Position = rectTransform.localPosition; + if (isFaceup) + cardStack.IsTopFaceup = true; return cardStack; } @@ -411,9 +413,9 @@ private void DisplayResults(string filters, List cards) { var position = Vector2.left * (CardGameManager.PixelsPerInch * CardGameManager.Current.CardSize.X); if (CgsNetManager.Instance.IsOnline && CgsNetManager.Instance.LocalPlayer != null) - CgsNetManager.Instance.LocalPlayer.RequestNewCardStack(filters, cards, position); + CgsNetManager.Instance.LocalPlayer.RequestNewCardStack(filters, cards, position, false); else - CreateCardStack(filters, cards, position); + CreateCardStack(filters, cards, position, false); } public void CreateCardModel(string cardId, Vector3 position, Quaternion rotation, bool isFacedown) diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md index 0301a2f91..aa3803495 100644 --- a/docs/pages/roadmap.md +++ b/docs/pages/roadmap.md @@ -6,10 +6,10 @@ permalink: roadmap.html ## What's New - v1.93 - Main Menu: Footer with copyright -- default rotation for players objects -- Game-Play: Face-Up Stacks (Always reveal the top card); default based on bottom +- Game-Play: Face-Up Stacks ## Active Sprint +- Bug: Apply rotation when spawning players objects - Deck-Editor: Card Zone should move containing scrollrect - Game-Play: Combine Stacks when dropped on each other - Game-Play: Put Card on bottom of Stack when Stack is dropped on Card From 13ab989ae0556b9ac7db0cd6168fe892a571e4bf Mon Sep 17 00:00:00 2001 From: David Finol Date: Sat, 28 Oct 2023 02:08:58 -0500 Subject: [PATCH 8/8] Flip top card in Stack --- .../Viewer/Playable Viewer.prefab | 65 +++++++++++++------ 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/Assets/Prefabs/CardGameView/Viewer/Playable Viewer.prefab b/Assets/Prefabs/CardGameView/Viewer/Playable Viewer.prefab index 578023939..1d819491b 100644 --- a/Assets/Prefabs/CardGameView/Viewer/Playable Viewer.prefab +++ b/Assets/Prefabs/CardGameView/Viewer/Playable Viewer.prefab @@ -172,6 +172,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3750639968265570870} + - component: {fileID: 7812827856268873879} m_Layer: 5 m_Name: Stack Action Buttons m_TagString: Untagged @@ -200,8 +201,34 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 240, y: 160} + m_SizeDelta: {x: 320, y: 80} m_Pivot: {x: 0, y: 0} +--- !u!114 &7812827856268873879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3718179242149436236} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &6741518953216345288 GameObject: m_ObjectHideFlags: 0 @@ -965,7 +992,7 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -975,7 +1002,7 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -1030,7 +1057,7 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 280 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -1741,22 +1768,22 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMin.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -1806,12 +1833,12 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 240 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -80 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -2153,7 +2180,7 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -2163,7 +2190,7 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -2218,7 +2245,7 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -80 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -2363,22 +2390,22 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} @@ -2428,12 +2455,12 @@ PrefabInstance: - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 120 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -80 objectReference: {fileID: 0} - target: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3}