From 9ff10f8ac9e93813775435f04b364fdcbc62bc8c Mon Sep 17 00:00:00 2001 From: David Finol Date: Mon, 21 Oct 2024 17:09:12 -0500 Subject: [PATCH] Add card backs --- Assets/Prefabs/Menus/Card Editor Menu.prefab | 304 +++++++++++- .../Menus/Card Game Editor Menu.prefab | 448 +++++++++++++++++- Assets/Prefabs/Menus/Set Import Menu.prefab | 309 +++++++++++- Assets/Scripts/Cgs/Cards/CardEditorMenu.cs | 21 +- Assets/Scripts/Cgs/Cards/SetImportMenu.cs | 32 +- Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs | 69 +++ 6 files changed, 1169 insertions(+), 14 deletions(-) diff --git a/Assets/Prefabs/Menus/Card Editor Menu.prefab b/Assets/Prefabs/Menus/Card Editor Menu.prefab index 652f29ea..c579de23 100644 --- a/Assets/Prefabs/Menus/Card Editor Menu.prefab +++ b/Assets/Prefabs/Menus/Card Editor Menu.prefab @@ -116,12 +116,14 @@ RectTransform: - {fileID: 3751717276885688301} - {fileID: 7557410562394956533} - {fileID: 5059895988602915785} + - {fileID: 4930459830660871687} + - {fileID: 9052368778950765492} m_Father: {fileID: 1869253921984234116} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 325, y: -25} - m_SizeDelta: {x: 600, y: 200} + m_SizeDelta: {x: 600, y: 300} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8937589716176591439 CanvasRenderer: @@ -175,9 +177,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: 600 - m_MinHeight: 200 + m_MinHeight: 300 m_PreferredWidth: 600 - m_PreferredHeight: 200 + m_PreferredHeight: 300 m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -661,6 +663,7 @@ MonoBehaviour: - {fileID: 4949916991088919623} cardIdInputField: {fileID: 3934238613493567587} setCodeInputField: {fileID: 4949916991088919623} + backSelector: {fileID: 9162998249089658734} cardImage: {fileID: 7650270232468140256} saveButton: {fileID: 3288109361705386331} --- !u!1001 &476697711553669634 @@ -1951,6 +1954,140 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5537974771124472253} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5969615885701383376 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1749039355795317158} + m_Modifications: + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_Pivot.x + value: 0 + 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: 2 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + 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 + 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: 225 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + 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: -200 + 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: Back + objectReference: {fileID: 0} + - target: {fileID: 7755028453825778640, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_Name + value: Back Label + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} +--- !u!224 &4930459830660871687 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + m_PrefabInstance: {fileID: 5969615885701383376} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6062883361368327702 PrefabInstance: m_ObjectHideFlags: 0 @@ -3033,6 +3170,167 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8291462134345967558} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8328177537136676862 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1749039355795317158} + m_Modifications: + - target: {fileID: 916273688120697700, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_Text + value: + objectReference: {fileID: 0} + - target: {fileID: 917083975517249680, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_Options.m_Options.Array.data[0].m_Text + value: + objectReference: {fileID: 0} + - target: {fileID: 917083975517249680, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 4118894267374975462} + - target: {fileID: 917083975517249680, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_Back + objectReference: {fileID: 0} + - target: {fileID: 917083975517249680, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Cgs.Cards.CardEditorMenu, Cgs + objectReference: {fileID: 0} + - target: {fileID: 948743394630853548, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_Name + value: Back Dropdown + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_SizeDelta.x + value: -225 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 112.5 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -200 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8d611347712873941990408a695ae759, type: 3} +--- !u!224 &9052368778950765492 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + m_PrefabInstance: {fileID: 8328177537136676862} + m_PrefabAsset: {fileID: 0} +--- !u!114 &9162998249089658734 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 917083975517249680, guid: 8d611347712873941990408a695ae759, + type: 3} + m_PrefabInstance: {fileID: 8328177537136676862} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8409637090698706470 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Menus/Card Game Editor Menu.prefab b/Assets/Prefabs/Menus/Card Game Editor Menu.prefab index b452292e..7c36e85e 100644 --- a/Assets/Prefabs/Menus/Card Game Editor Menu.prefab +++ b/Assets/Prefabs/Menus/Card Game Editor Menu.prefab @@ -1569,7 +1569,121 @@ MonoBehaviour: bannerImage: {fileID: 5808374412478590082} cardBackImage: {fileID: 2900055768572430823} playMatImage: {fileID: 5426961772105621355} + backsFolderText: {fileID: 1743191941766219692} saveButton: {fileID: 3288109361705386331} +--- !u!1 &8687566175535138263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5220137667917461443} + - component: {fileID: 6182305803495966476} + - component: {fileID: 4268861079459481347} + - component: {fileID: 5070817642476718311} + - component: {fileID: 5132689289330571789} + m_Layer: 5 + m_Name: Backs Folder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5220137667917461443 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687566175535138263} + 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: 3417297275256032698} + - {fileID: 3100810486699501352} + 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: 575, y: -900} + m_SizeDelta: {x: 350, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6182305803495966476 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687566175535138263} + m_CullTransparentMesh: 1 +--- !u!114 &4268861079459481347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687566175535138263} + 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 &5070817642476718311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687566175535138263} + 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 &5132689289330571789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687566175535138263} + 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!1001 &388257654275461665 PrefabInstance: m_ObjectHideFlags: 0 @@ -2147,6 +2261,198 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 640954355663113986} m_PrefabAsset: {fileID: 0} +--- !u!1001 &904961963566295415 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5220137667917461443} + m_Modifications: + - target: {fileID: 1494664878241574619, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_Text + value: + objectReference: {fileID: 0} + - target: {fileID: 1751753110650578252, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: isBelow + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1751753110650578252, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: tooltip + value: Select Backs Folder + objectReference: {fileID: 0} + - target: {fileID: 2442268098906025027, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 364b003a1bd067f4fb41ea1adfe03b56, + type: 3} + - target: {fileID: 2848342772243254878, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_Name + value: Framed Labeled Button + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_SizeDelta.x + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -85 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7269854554250268640, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7269854554250268640, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7269854554250268640, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2509290508521618914} + - target: {fileID: 7269854554250268640, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7269854554250268640, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SelectBacksFolder + objectReference: {fileID: 0} + - target: {fileID: 7269854554250268640, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Cgs.Menu.CardGameEditorMenu, Cgs + objectReference: {fileID: 0} + - target: {fileID: 7269854554250268640, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 30c175fe170c9e0459ee166821450a03, type: 3} +--- !u!114 &1743191941766219692 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1494664878241574619, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + m_PrefabInstance: {fileID: 904961963566295415} + 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 &3100810486699501352 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2848342772243254879, guid: 30c175fe170c9e0459ee166821450a03, + type: 3} + m_PrefabInstance: {fileID: 904961963566295415} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1378245701644965237 PrefabInstance: m_ObjectHideFlags: 0 @@ -3208,7 +3514,7 @@ PrefabInstance: - target: {fileID: 8441293159771624762, guid: bcd6c8c8d8b4b004ab05978ff2d32058, type: 3} propertyPath: m_Size - value: 0.242 + value: 0.2326923 objectReference: {fileID: 0} - target: {fileID: 8441293161199918481, guid: bcd6c8c8d8b4b004ab05978ff2d32058, type: 3} @@ -3223,7 +3529,7 @@ PrefabInstance: - target: {fileID: 8441293161199918481, guid: bcd6c8c8d8b4b004ab05978ff2d32058, type: 3} propertyPath: m_AnchorMin.y - value: 0.758 + value: 0.7673077 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -3260,6 +3566,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 1758297209062295551} + - targetCorrespondingSourceObject: {fileID: 707491489704095531, guid: bcd6c8c8d8b4b004ab05978ff2d32058, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5220137667917461443} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bcd6c8c8d8b4b004ab05978ff2d32058, type: 3} --- !u!224 &3250183333955770306 stripped @@ -4127,6 +4437,140 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4118925510133051666} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4168214319115730797 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5220137667917461443} + 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: 250 + 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: Backs Folder + objectReference: {fileID: 0} + - target: {fileID: 7755028453825778640, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_Name + value: BacksFolder Label + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} +--- !u!224 &3417297275256032698 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + m_PrefabInstance: {fileID: 4168214319115730797} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4527197461938940384 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Menus/Set Import Menu.prefab b/Assets/Prefabs/Menus/Set Import Menu.prefab index 5026357f..54c8647d 100644 --- a/Assets/Prefabs/Menus/Set Import Menu.prefab +++ b/Assets/Prefabs/Menus/Set Import Menu.prefab @@ -59,7 +59,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 85 @@ -118,6 +118,7 @@ MonoBehaviour: m_EditorClassIdentifier: setNameText: {fileID: 8048555959403378878} cardNamesText: {fileID: 2308992911830701843} + backSelector: {fileID: 3673002717146128287} importButton: {fileID: 6945829736936368772} --- !u!1 &6063335200564067541 GameObject: @@ -154,6 +155,8 @@ RectTransform: - {fileID: 6439626329420470727} - {fileID: 1846003278379482265} - {fileID: 2308992910928662122} + - {fileID: 8687253988483646318} + - {fileID: 3490531258046061381} - {fileID: 1704927231478980121} m_Father: {fileID: 2474638859470940481} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -828,6 +831,172 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2540107421395262872} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4486433530190151439 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3162819817568487429} + m_Modifications: + - target: {fileID: 916273688120697700, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_Text + value: + objectReference: {fileID: 0} + - target: {fileID: 917083975517249680, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_Navigation.m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 917083975517249680, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_Options.m_Options.Array.data[0].m_Text + value: + objectReference: {fileID: 0} + - target: {fileID: 917083975517249680, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 186088718753695776} + - target: {fileID: 917083975517249680, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_Back + objectReference: {fileID: 0} + - target: {fileID: 917083975517249680, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Cgs.Cards.SetImportMenu, Cgs + objectReference: {fileID: 0} + - target: {fileID: 948743394630853548, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_Name + value: Back Dropdown + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_SizeDelta.x + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 182.5 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8d611347712873941990408a695ae759, type: 3} +--- !u!224 &3490531258046061381 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1023399211122107466, guid: 8d611347712873941990408a695ae759, + type: 3} + m_PrefabInstance: {fileID: 4486433530190151439} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3673002717146128287 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 917083975517249680, guid: 8d611347712873941990408a695ae759, + type: 3} + m_PrefabInstance: {fileID: 4486433530190151439} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4527258587213515801 PrefabInstance: m_ObjectHideFlags: 0 @@ -1352,7 +1521,7 @@ PrefabInstance: - target: {fileID: 8614848688831283421, guid: 72c2cddda8f96c04593a8ff521560e3f, type: 3} propertyPath: m_SizeDelta.y - value: -600 + value: -700 objectReference: {fileID: 0} - target: {fileID: 8614848688831283421, guid: 72c2cddda8f96c04593a8ff521560e3f, type: 3} @@ -1496,3 +1665,139 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &7943090163263271353 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3162819817568487429} + 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: 0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_RootOrder + value: 3 + 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: 0 + 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: 0 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + 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: -250 + objectReference: {fileID: 0} + - target: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 182.5 + 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: 'Back + +' + objectReference: {fileID: 0} + - target: {fileID: 7755028453825778640, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + propertyPath: m_Name + value: Back Label + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eb9a84c1b0b6d25479b907acb118cde9, type: 3} +--- !u!224 &8687253988483646318 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1636166841839465175, guid: eb9a84c1b0b6d25479b907acb118cde9, + type: 3} + m_PrefabInstance: {fileID: 7943090163263271353} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/Cgs/Cards/CardEditorMenu.cs b/Assets/Scripts/Cgs/Cards/CardEditorMenu.cs index 79efb60f..1dc23cfa 100644 --- a/Assets/Scripts/Cgs/Cards/CardEditorMenu.cs +++ b/Assets/Scripts/Cgs/Cards/CardEditorMenu.cs @@ -38,6 +38,7 @@ public class CardEditorMenu : Modal public List inputFields; public InputField cardIdInputField; public InputField setCodeInputField; + public Dropdown backSelector; public Image cardImage; public Button saveButton; @@ -75,6 +76,16 @@ public string SetCode private string _setCode = string.Empty; + [UsedImplicitly] public int Back { get; set; } + + private string BackFace => Back < BackFaceOptions.Count ? BackFaceOptions[Back].text : string.Empty; + + private List BackFaceOptions { get; } = new(); + + private string BackFaceId => CardGameManager.Current.CardBackFaceImageSprites.ContainsKey(BackFace) + ? BackFace + : string.Empty; + private Uri CardImageUri { get => _cardImageUri; @@ -129,6 +140,14 @@ public void Show(UnityAction onCreationCallback) { Show(); SetCode = string.Concat(CardGameManager.Current.Name.Where(char.IsLetterOrDigit)); + + BackFaceOptions.Clear(); + BackFaceOptions.Add(new Dropdown.OptionData() {text = string.Empty}); + foreach (var backFaceKey in CardGameManager.Current.CardBackFaceImageSprites.Keys) + BackFaceOptions.Add(new Dropdown.OptionData() {text = backFaceKey}); + backSelector.options = BackFaceOptions; + backSelector.value = 0; + cardImage.sprite = CardImageSprite != null ? CardImageSprite : CardGameManager.Current.CardBackImageSprite; _onCreationCallback = onCreationCallback; @@ -256,7 +275,7 @@ private IEnumerator SaveCard() ? Guid.NewGuid().ToString().ToUpper() : CardId, CardName, string.IsNullOrEmpty(SetCode) ? Set.DefaultCode : SetCode, propertyDefValuePairs, - false) + false, false, BackFaceId) {ImageWebUrl = CardImageUri.AbsoluteUri}; yield return UnityFileMethods.SaveUrlToFile(CardImageUri.AbsoluteUri, card.ImageFilePath); diff --git a/Assets/Scripts/Cgs/Cards/SetImportMenu.cs b/Assets/Scripts/Cgs/Cards/SetImportMenu.cs index f5f2ff44..18a8590a 100644 --- a/Assets/Scripts/Cgs/Cards/SetImportMenu.cs +++ b/Assets/Scripts/Cgs/Cards/SetImportMenu.cs @@ -4,6 +4,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.IO; using System.Linq; using Cgs.Menu; @@ -36,6 +37,7 @@ public class SetImportMenu : Modal, IProgressible public Text setNameText; public TMP_Text cardNamesText; + public Dropdown backSelector; public Button importButton; public float ProgressPercentage { get; private set; } @@ -68,9 +70,8 @@ private string SetFolderPath { var fileName = file.Name; if (fileName.EndsWith(CardGameManager.Current.CardImageFileType)) - fileName = fileName.Substring(0, - fileName.LastIndexOf(CardGameManager.Current.CardImageFileType, - StringComparison.Ordinal) - 1); + fileName = fileName[..(fileName.LastIndexOf(CardGameManager.Current.CardImageFileType, + StringComparison.Ordinal) - 1)]; return current + fileName + "\n"; }); cardNamesText.text = !string.IsNullOrWhiteSpace(cardNames) ? cardNames : SetImportMissingWarningMessage; @@ -80,11 +81,29 @@ private string SetFolderPath private string _setFolderPath; + [UsedImplicitly] public int Back { get; set; } + + private string BackFace => Back < BackFaceOptions.Count ? BackFaceOptions[Back].text : string.Empty; + + private List BackFaceOptions { get; } = new(); + + private string BackFaceId => CardGameManager.Current.CardBackFaceImageSprites.ContainsKey(BackFace) + ? BackFace + : string.Empty; + private UnityAction _onCreationCallback; public void Show(UnityAction onCreationCallback) { Show(); + + BackFaceOptions.Clear(); + BackFaceOptions.Add(new Dropdown.OptionData() {text = string.Empty}); + foreach (var backFaceKey in CardGameManager.Current.CardBackFaceImageSprites.Keys) + BackFaceOptions.Add(new Dropdown.OptionData() {text = backFaceKey}); + backSelector.options = BackFaceOptions; + backSelector.value = 0; + _onCreationCallback = onCreationCallback; } @@ -159,9 +178,10 @@ private IEnumerator ImportSet() var fileName = cardPathsToImport[i].Name; var end = fileName.LastIndexOf(CardGameManager.Current.CardImageFileType, StringComparison.Ordinal); - var cardName = fileName.Substring(0, end - 1); - var cardId = UnityFileMethods.GetSafeFileName(cardName).Replace(" ","_"); - var card = new UnityCard(CardGameManager.Current, cardId, cardName, SetName, null, false); + var cardName = fileName[..(end - 1)]; + var cardId = UnityFileMethods.GetSafeFileName(cardName).Replace(" ", "_"); + var card = new UnityCard(CardGameManager.Current, cardId, cardName, SetName, null, false, false, + BackFaceId); FileBrowserHelpers.CopyFile(cardPathsToImport[i].Path, card.ImageFilePath); if (!File.Exists(card.ImageFilePath)) diff --git a/Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs b/Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs index ba90e754..8672dcfc 100644 --- a/Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs +++ b/Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs @@ -14,6 +14,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using SFB; +using SimpleFileBrowser; using UnityEngine; using UnityEngine.UI; using UnityExtensionMethods; @@ -22,6 +23,10 @@ namespace Cgs.Menu { public class CardGameEditorMenu : Modal { +#if ENABLE_WINMD_SUPPORT + public const string PlatformWarningMessage = "Sorry, Backs Folder is not supported from Windows Store!"; +#endif + public const string DownloadBannerImage = "Download Banner Image"; public const string DownloadBannerImagePrompt = "Enter banner image url..."; public const string DownloadCardBackImage = "Download Card Back Image"; @@ -36,6 +41,9 @@ public class CardGameEditorMenu : Modal public const string SelectPlayMatImageFilePrompt = "Select PlayMat Image File"; #endif public const string ImportImageWarningMessage = "No image file selected for import!"; + public const string SelectFolderPrompt = "Select Folder"; + public const string ImportFolderWarningMessage = "No folder found for import! "; + public const string ImportBackFailedWarningMessage = "Failed to find back: "; public const string CreationWarningMessage = "Failed to create the custom card game! "; public const string CreationCleanupErrorMessage = "Failed to both create and cleanup during creation! "; @@ -44,6 +52,7 @@ public class CardGameEditorMenu : Modal public Image bannerImage; public Image cardBackImage; public Image playMatImage; + public Text backsFolderText; public Button saveButton; private DownloadMenu Downloader => @@ -112,6 +121,26 @@ public string Height [UsedImplicitly] public string CardProperty { get; set; } = "description"; + [UsedImplicitly] + public string BacksFolderPath + { + get => _backsFolderPath; + set + { + if (!FileBrowserHelpers.DirectoryExists(value)) + { + Debug.LogWarning(ImportFolderWarningMessage + value); + CardGameManager.Instance.Messenger.Show(ImportFolderWarningMessage + value); + return; + } + + _backsFolderPath = value; + backsFolderText.text = _backsFolderPath; + } + } + + private string _backsFolderPath = string.Empty; + private bool _isEdit; public void ShowNew() @@ -475,6 +504,9 @@ private IEnumerator CreateGame() File.WriteAllText(unityCardGame.GameFilePath, JsonConvert.SerializeObject(unityCardGame, jsonSerializerSettings)); + if (!string.IsNullOrEmpty(BacksFolderPath) && FileBrowserHelpers.DirectoryExists(BacksFolderPath)) + CopyBacksFolder(); + yield return CardGameManager.Instance.UpdateCardGame(unityCardGame); if (!string.IsNullOrEmpty(unityCardGame.Error)) @@ -496,5 +528,42 @@ private IEnumerator CreateGame() Hide(); } } + + [UsedImplicitly] + public void SelectBacksFolder() + { +#if ENABLE_WINMD_SUPPORT + CardGameManager.Instance.Messenger.Show(PlatformWarningMessage); + Hide(); +#else + FileBrowser.ShowLoadDialog((paths) => { BacksFolderPath = paths[0]; }, () => { }, + FileBrowser.PickMode.Folders, false, null, null, SelectFolderPrompt); +#endif + } + + private void CopyBacksFolder() + { + var backsToImport = FileBrowserHelpers.GetEntriesInDirectory(BacksFolderPath, true) + .Where(fileSystemEntry => !fileSystemEntry.IsDirectory && + !string.IsNullOrEmpty(fileSystemEntry.Extension) && + fileSystemEntry.Extension.EndsWith(CardGameManager.Current + .CardBackImageFileType)) + .ToList(); + for (var i = 0; i < backsToImport.Count; i++) + { + try + { + if (!Directory.Exists(CardGameManager.Current.BacksDirectoryPath)) + Directory.CreateDirectory(CardGameManager.Current.BacksDirectoryPath); + FileBrowserHelpers.CopyFile(backsToImport[i].Path, + Path.Join(CardGameManager.Current.BacksDirectoryPath, backsToImport[i].Name)); + } + catch + { + Debug.LogWarning(ImportBackFailedWarningMessage + backsToImport[i].Name); + CardGameManager.Instance.Messenger.Show(ImportBackFailedWarningMessage + backsToImport[i].Name); + } + } + } } }