diff --git a/Assets/TcgEngine/Prefabs/GameUI.prefab b/Assets/TcgEngine/Prefabs/GameUI.prefab index 652c0e9..36dcfca 100644 --- a/Assets/TcgEngine/Prefabs/GameUI.prefab +++ b/Assets/TcgEngine/Prefabs/GameUI.prefab @@ -8628,8 +8628,6 @@ RectTransform: - {fileID: 1897787767171737189} - {fileID: 3069993990413576890} - {fileID: 2127217837939804811} - - {fileID: 8971355803916875263} - - {fileID: 7535319715250265805} - {fileID: 163971174156453592} m_Father: {fileID: 4484622087145101583} m_RootOrder: 5 @@ -8706,8 +8704,6 @@ MonoBehaviour: - {fileID: 308667158403263142} - {fileID: 3784184267651786361} - {fileID: 260001051122861640} - - {fileID: 7106249599462177084} - - {fileID: 8542208730779062798} --- !u!1 &5555943587244638031 GameObject: m_ObjectHideFlags: 0 @@ -13584,280 +13580,8 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 592163957843233525} m_PrefabAsset: {fileID: 0} ---- !u!1001 &964970366346806803 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5778422219974649078} - m_Modifications: - - target: {fileID: 5915281979180096766, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_Name - value: CardMulligan_4 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 550 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ed2346ea7ffd61e4fb5de1e606313964, type: 3} ---- !u!224 &7535319715250265805 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - m_PrefabInstance: {fileID: 964970366346806803} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8542208730779062798 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8928464303027311645, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - m_PrefabInstance: {fileID: 964970366346806803} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 929e92b16c599754f987b3021561b6c4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &1834722783947828513 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5778422219974649078} - m_Modifications: - - target: {fileID: 5915281979180096766, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_Name - value: CardMulligan_3 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 275 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ed2346ea7ffd61e4fb5de1e606313964, type: 3} ---- !u!114 &7106249599462177084 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8928464303027311645, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - m_PrefabInstance: {fileID: 1834722783947828513} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 929e92b16c599754f987b3021561b6c4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &8971355803916875263 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, - type: 3} - m_PrefabInstance: {fileID: 1834722783947828513} - m_PrefabAsset: {fileID: 0} + + --- !u!1001 &1840157932379711057 PrefabInstance: m_ObjectHideFlags: 0 @@ -14913,7 +14637,7 @@ PrefabInstance: - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, type: 3} propertyPath: m_AnchoredPosition.x - value: -275 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, type: 3} @@ -15991,7 +15715,7 @@ PrefabInstance: - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 275 objectReference: {fileID: 0} - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, type: 3} @@ -16128,7 +15852,7 @@ PrefabInstance: - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, type: 3} propertyPath: m_AnchoredPosition.x - value: -550 + value: -275 objectReference: {fileID: 0} - target: {fileID: 7347224996220770526, guid: ed2346ea7ffd61e4fb5de1e606313964, type: 3} diff --git a/Assets/TcgEngine/Scripts/UI/MulliganSelector.cs b/Assets/TcgEngine/Scripts/UI/MulliganSelector.cs index 14ac0a3..27b5b5f 100644 --- a/Assets/TcgEngine/Scripts/UI/MulliganSelector.cs +++ b/Assets/TcgEngine/Scripts/UI/MulliganSelector.cs @@ -40,6 +40,7 @@ namespace TcgEngine.UI } } + // 处理卡牌选择 private void OnClickCard(CardMulligan card_ui) { card_ui.SetSelected(!card_ui.IsSelected());