From 6516c99f883ec519dfcc75a63c02d390785f76dd Mon Sep 17 00:00:00 2001 From: KeyKoder Date: Thu, 15 Jul 2021 21:57:20 +0200 Subject: [PATCH] Rework card system with uuids --- unity/Assets/Prefabs/CardCanvas.prefab | 26 +--- unity/Assets/Prefabs/CardPrefab.prefab | 8 +- unity/Assets/Scenes/SampleScene.unity | 1 + unity/Assets/Scripts/Card.cs | 82 +++++----- unity/Assets/Scripts/Client.cs | 1 - unity/Assets/Scripts/GameLoader.cs | 200 +++++++++++++++++-------- 6 files changed, 193 insertions(+), 125 deletions(-) diff --git a/unity/Assets/Prefabs/CardCanvas.prefab b/unity/Assets/Prefabs/CardCanvas.prefab index e5cff3e..f67e297 100644 --- a/unity/Assets/Prefabs/CardCanvas.prefab +++ b/unity/Assets/Prefabs/CardCanvas.prefab @@ -10,11 +10,10 @@ GameObject: m_Component: - component: {fileID: 5463950459347836266} - component: {fileID: 5463950459347836267} - - component: {fileID: 5463950459347836260} - component: {fileID: 5463950459347836261} m_Layer: 5 m_Name: CardCanvas - m_TagString: Untagged + m_TagString: Card m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -59,29 +58,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &5463950459347836260 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5463950459347836262} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 --- !u!114 &5463950459347836261 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/unity/Assets/Prefabs/CardPrefab.prefab b/unity/Assets/Prefabs/CardPrefab.prefab index 4a42ef0..d3ff94c 100644 --- a/unity/Assets/Prefabs/CardPrefab.prefab +++ b/unity/Assets/Prefabs/CardPrefab.prefab @@ -159,6 +159,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -433,6 +434,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -488,7 +490,7 @@ GameObject: - component: {fileID: -8289338857814124153} m_Layer: 5 m_Name: CardPrefab - m_TagString: Card + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -536,6 +538,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 0 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -580,3 +583,6 @@ MonoBehaviour: cardCanvas: {fileID: 5463950459347836262, guid: fc20f9d5ae7f3364d8425ba33a8d0c81, type: 3} preparedCard: 0 thrown: 0 + inPileName: + isInCommonPile: 0 + idx: 0 diff --git a/unity/Assets/Scenes/SampleScene.unity b/unity/Assets/Scenes/SampleScene.unity index 1d5f722..931f056 100644 --- a/unity/Assets/Scenes/SampleScene.unity +++ b/unity/Assets/Scenes/SampleScene.unity @@ -209,6 +209,7 @@ MonoBehaviour: - {r: 0.5613208, g: 0.6479967, b: 1, a: 1} - {r: 0.41706753, g: 0.12615702, b: 0.5943396, a: 1} cardPrefab: {fileID: 8916404675478908303, guid: 5a10ceea9da08e942b8e357fed3ca916, type: 3} + cardCanvas: {fileID: 5463950459347836262, guid: fc20f9d5ae7f3364d8425ba33a8d0c81, type: 3} handUI: {fileID: 1854025636} deck: {fileID: 378514925} thrownCards: {fileID: 171776933} diff --git a/unity/Assets/Scripts/Card.cs b/unity/Assets/Scripts/Card.cs index dfc23bb..665c1e9 100644 --- a/unity/Assets/Scripts/Card.cs +++ b/unity/Assets/Scripts/Card.cs @@ -13,16 +13,18 @@ public class Card : MonoBehaviour {//, IPointerEnterHandler, IPointerExitHandler public static GameObject cardBeingPrepared; public bool preparedCard = false; public static Vector3 preparingOffset = new Vector3(0f,40f); - public bool thrown = false; private GameObject actionMenu; private static GameObject thrownCards; private static float yOffsetTable = 0.51f/2; private MainMenuController mmc; + private Quaternion currentRotation; public string inPileName; public bool isInCommonPile; public int idx; + public string uuid; void Start() { + currentRotation = Quaternion.identity; mmc = GameLoader.mmc; cardPreview = GameObject.FindGameObjectsWithTag("CardPreview")[0]; thrownCards = GameObject.Find("ThrownCards"); @@ -31,31 +33,20 @@ public class Card : MonoBehaviour {//, IPointerEnterHandler, IPointerExitHandler GetComponent