diff --git a/Assets/Prefabs/Play/Play Menu.prefab b/Assets/Prefabs/Play/Play Menu.prefab index 7e515def..1718ab61 100644 --- a/Assets/Prefabs/Play/Play Menu.prefab +++ b/Assets/Prefabs/Play/Play Menu.prefab @@ -30,7 +30,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5402983603619021407} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -94,7 +93,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6125301659200404326} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -175,7 +173,6 @@ RectTransform: - {fileID: 1040194064564028071} - {fileID: 5489046745421019570} m_Father: {fileID: 8661135368498000168} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -216,7 +213,6 @@ RectTransform: - {fileID: 2726473673344675094} - {fileID: 1079372111968069867} m_Father: {fileID: 5402983603619021407} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -295,7 +291,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5489046745421019570} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -375,7 +370,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6125301659200404326} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -457,7 +451,6 @@ RectTransform: m_Children: - {fileID: 5402983603619021407} m_Father: {fileID: 4664577512828430299} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -563,7 +556,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6125301659200404326} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -650,13 +642,12 @@ RectTransform: - {fileID: 8057757558886119890} - {fileID: 3807679212560466141} m_Father: {fileID: 8227187841470613533} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 600, y: 600} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0, y: 1} --- !u!222 &5059510915336010828 CanvasRenderer: m_ObjectHideFlags: 0 @@ -726,7 +717,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3195710852336062400} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -806,7 +796,6 @@ RectTransform: - {fileID: 8661135369251335048} - {fileID: 4664577512828430299} m_Father: {fileID: 8661135368498000168} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -844,7 +833,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4664577512828430299} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -892,8 +880,7 @@ MonoBehaviour: --- !u!1 &8661135368498000175 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1907634493686850, guid: 145fbeecee1cdc74a9c0b8656c098679, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -914,8 +901,7 @@ GameObject: --- !u!224 &8661135368498000168 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224319334060790952, guid: 145fbeecee1cdc74a9c0b8656c098679, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8661135368498000175} @@ -928,7 +914,6 @@ RectTransform: - {fileID: 997653154827725589} - {fileID: 2551385174690193818} 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} @@ -952,7 +937,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: 10 m_TargetDisplay: 0 @@ -1060,7 +1047,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8661135369251335048} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1138,7 +1124,6 @@ RectTransform: - {fileID: 8661135368501943416} - {fileID: 8661135369618641650} m_Father: {fileID: 8227187841470613533} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1218,7 +1203,6 @@ RectTransform: - {fileID: 9222856665422493443} - {fileID: 893085838809724894} m_Father: {fileID: 8661135369251335048} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1285,7 +1269,6 @@ RectTransform: - {fileID: 6125301659200404326} - {fileID: 619187741502722367} m_Father: {fileID: 3807679212560466141} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1348,6 +1331,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4664577512828430299} m_Modifications: - target: {fileID: 1921475035861756271, guid: e885b7dcac6cff447a150d9f185e8af7, @@ -1476,6 +1460,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e885b7dcac6cff447a150d9f185e8af7, type: 3} --- !u!114 &2301027191904681179 stripped MonoBehaviour: @@ -1500,6 +1487,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4664577512828430299} m_Modifications: - target: {fileID: 60276916285824526, guid: 849115afddf0d7d48b0bd0f145f7349d, @@ -1699,6 +1687,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 &8057757558886119890 stripped RectTransform: @@ -1711,6 +1702,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4664577512828430299} m_Modifications: - target: {fileID: 60276916285824526, guid: 849115afddf0d7d48b0bd0f145f7349d, @@ -1915,6 +1907,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 &8000348096968803816 stripped RectTransform: @@ -1927,6 +1922,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8661135369618641650} m_Modifications: - target: {fileID: 1494664878241574619, guid: 30c175fe170c9e0459ee166821450a03, @@ -2126,6 +2122,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 30c175fe170c9e0459ee166821450a03, type: 3} --- !u!224 &511021218724460703 stripped RectTransform: @@ -2138,6 +2137,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2551385174690193818} m_Modifications: - target: {fileID: 7317508625745834909, guid: 849115afddf0d7d48b0bd0f145f7349d, @@ -2291,6 +2291,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4647987424921209051} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} --- !u!224 &5489046745421019570 stripped RectTransform: @@ -2303,6 +2310,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8661135369618641650} m_Modifications: - target: {fileID: 1494664878241574619, guid: 30c175fe170c9e0459ee166821450a03, @@ -2512,6 +2520,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 30c175fe170c9e0459ee166821450a03, type: 3} --- !u!224 &893085838809724894 stripped RectTransform: @@ -2524,6 +2535,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8661135368498000168} m_Modifications: - target: {fileID: 2431982676670645471, guid: 06f7fede5f8506f4aaaca01736a75a9b, @@ -2678,6 +2690,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06f7fede5f8506f4aaaca01736a75a9b, type: 3} --- !u!224 &997653154827725589 stripped RectTransform: @@ -2690,6 +2705,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4664577512828430299} m_Modifications: - target: {fileID: 1921475035861756271, guid: e885b7dcac6cff447a150d9f185e8af7, @@ -2818,6 +2834,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e885b7dcac6cff447a150d9f185e8af7, type: 3} --- !u!114 &3320351255440006170 stripped MonoBehaviour: @@ -2842,6 +2861,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8661135369618641650} m_Modifications: - target: {fileID: 1494664878241574619, guid: 30c175fe170c9e0459ee166821450a03, @@ -3051,6 +3071,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 30c175fe170c9e0459ee166821450a03, type: 3} --- !u!224 &1948188218925334483 stripped RectTransform: @@ -3063,6 +3086,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2551385174690193818} m_Modifications: - target: {fileID: 7317508625745834909, guid: 849115afddf0d7d48b0bd0f145f7349d, @@ -3216,6 +3240,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7317508625903915487, guid: 849115afddf0d7d48b0bd0f145f7349d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8158631012383453499} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 849115afddf0d7d48b0bd0f145f7349d, type: 3} --- !u!224 &3195710852336062400 stripped RectTransform: @@ -3228,6 +3259,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2551385174690193818} m_Modifications: - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, @@ -3537,6 +3569,9 @@ PrefabInstance: value: Points InputField objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f4698c1a75d36a640afc1bea8b676ff4, type: 3} --- !u!114 &929568006857575721 stripped MonoBehaviour: @@ -3561,6 +3596,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4664577512828430299} m_Modifications: - target: {fileID: 4658356562677211595, guid: f4698c1a75d36a640afc1bea8b676ff4, @@ -3754,6 +3790,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!224 &1574711866812663561 stripped RectTransform: @@ -3778,6 +3817,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8661135369618641650} m_Modifications: - target: {fileID: 1494664878241574619, guid: 30c175fe170c9e0459ee166821450a03, @@ -3977,6 +4017,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 30c175fe170c9e0459ee166821450a03, type: 3} --- !u!224 &9222856665422493443 stripped RectTransform: @@ -3989,6 +4032,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8661135369618641650} m_Modifications: - target: {fileID: 1494664878241574619, guid: 30c175fe170c9e0459ee166821450a03, @@ -4198,6 +4242,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 30c175fe170c9e0459ee166821450a03, type: 3} --- !u!224 &8671091650633348084 stripped RectTransform: diff --git a/Assets/Scripts/Cgs/Play/PlayController.cs b/Assets/Scripts/Cgs/Play/PlayController.cs index 6ae81c6a..7d9721be 100644 --- a/Assets/Scripts/Cgs/Play/PlayController.cs +++ b/Assets/Scripts/Cgs/Play/PlayController.cs @@ -144,6 +144,8 @@ private void OnEnable() Instantiate(cardViewerPrefab); Instantiate(playableViewerPrefab); CardViewer.Instance.GetComponent().Show(); + if (Cgs.Menu.Settings.PreviewOnMouseOver) + CardViewer.Instance.Mode = CardViewerMode.Expanded; CardGameManager.Instance.OnSceneActions.Add(ResetPlayArea); } diff --git a/docs/games/grand_archive/PlayMat.jpg b/docs/games/grand_archive/PlayMat.jpg index dfa27600..9511c172 100644 Binary files a/docs/games/grand_archive/PlayMat.jpg and b/docs/games/grand_archive/PlayMat.jpg differ diff --git a/docs/games/grand_archive/grand_archive.json b/docs/games/grand_archive/grand_archive.json index 10ecf59f..d7cfc2ab 100644 --- a/docs/games/grand_archive/grand_archive.json +++ b/docs/games/grand_archive/grand_archive.json @@ -235,20 +235,20 @@ "gamePlayDeckName": "Main Deck", "gamePlayDeckPositions": [ { - "x": 14.5, - "y": -11 + "x": 25, + "y": -5.5 }, { - "x": -14.5, - "y": -11 + "x": -25, + "y": -5.5 }, { - "x": 14.5, - "y": 11 + "x": 25, + "y": 5.5 }, { - "x": -14.5, - "y": 11 + "x": -25, + "y": 5.5 } ], "gamePlayZones": [ @@ -257,10 +257,10 @@ "face": "down", "position": { "x": 0, - "y": -16.5 + "y": -10.5 }, "size": { - "x": 22, + "x": 42, "y": 3.5 }, "type": "horizontal" @@ -270,10 +270,10 @@ "face": "down", "position": { "x": 0, - "y": 16.5 + "y": 10.5 }, "size": { - "x": 22, + "x": 42, "y": 3.5 }, "type": "horizontal" @@ -287,8 +287,8 @@ "y": 0 }, "playMatSize": { - "x": 36.75, - "y": 42.75 + "x": 56, + "y": 30 }, "rulesUrl": "https://www.gatcg.com/article/rules", "setCodeIdentifier": "set.prefix",