From f0c1643f30ca507877aa494c4377cd522ff653be Mon Sep 17 00:00:00 2001 From: xianyi Date: Wed, 20 Aug 2025 16:08:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=80=BB=E8=B4=B9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Conditions/is_slot_in_range.asset | 3 +- Assets/TcgEngine/Scenes/Game/Game.unity | 998 +----------------- .../Scripts/Conditions/ConditionPlayerStat.cs | 18 - .../Scripts/Conditions/ConditionStat.cs | 39 - .../Scripts/Conditions/FilterHighestStat.cs | 15 - .../Scripts/Conditions/FilterLowestStat.cs | 15 - Assets/TcgEngine/Scripts/Data/CardData.cs | 17 - .../Scripts/Effects/EffectAddStat.cs | 38 +- .../Scripts/Effects/EffectAddStatCount.cs | 36 +- .../Scripts/Effects/EffectAddStatRoll.cs | 23 - .../TcgEngine/Scripts/Effects/EffectMana.cs | 29 +- .../Scripts/Effects/EffectSetStat.cs | 30 +- Assets/TcgEngine/Scripts/GameLogic/Card.cs | 46 - Assets/TcgEngine/Scripts/GameLogic/Game.cs | 27 +- .../TcgEngine/Scripts/GameLogic/GameLogic.cs | 41 +- Assets/TcgEngine/Scripts/GameLogic/Player.cs | 189 ---- Assets/TcgEngine/Scripts/UI/PlayerUI.cs | 47 - 17 files changed, 39 insertions(+), 1572 deletions(-) diff --git a/Assets/TcgEngine/Resources/Conditions/is_slot_in_range.asset b/Assets/TcgEngine/Resources/Conditions/is_slot_in_range.asset index 93eb45b..b98b3ff 100644 --- a/Assets/TcgEngine/Resources/Conditions/is_slot_in_range.asset +++ b/Assets/TcgEngine/Resources/Conditions/is_slot_in_range.asset @@ -13,4 +13,5 @@ MonoBehaviour: m_Name: is_slot_in_range m_EditorClassIdentifier: range_x: 1 - range_p: 1 + range_y: 0 + range_p: 0 diff --git a/Assets/TcgEngine/Scenes/Game/Game.unity b/Assets/TcgEngine/Scenes/Game/Game.unity index 4e910f2..6c165c7 100644 --- a/Assets/TcgEngine/Scenes/Game/Game.unity +++ b/Assets/TcgEngine/Scenes/Game/Game.unity @@ -141,166 +141,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7426997187842496860} m_PrefabAsset: {fileID: 0} ---- !u!1 &110596170 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 110596171} - - component: {fileID: 110596173} - - component: {fileID: 110596172} - m_Layer: 5 - m_Name: Text Water - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &110596171 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 110596170} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1701871965} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 48, y: 48} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &110596172 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 110596170} - 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: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 42 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 42 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 0 ---- !u!222 &110596173 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 110596170} - m_CullTransparentMesh: 1 ---- !u!1 &150613711 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 150613712} - - component: {fileID: 150613714} - - component: {fileID: 150613713} - m_Layer: 5 - m_Name: Text Water - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &150613712 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 150613711} - 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: 586821847} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 48, y: 48} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &150613713 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 150613711} - 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: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 42 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 48 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 0 ---- !u!222 &150613714 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 150613711} - m_CullTransparentMesh: 1 --- !u!850595691 &254397389 LightingSettings: m_ObjectHideFlags: 0 @@ -476,174 +316,12 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &570405431 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - m_PrefabInstance: {fileID: 1701871964} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bf1498eac12d8c14e98918e5ac2baf2c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &572134229 stripped Transform: m_CorrespondingSourceObject: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, type: 3} m_PrefabInstance: {fileID: 5621716279108096101} m_PrefabAsset: {fileID: 0} ---- !u!1001 &586821846 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 962576083989124241} - m_Modifications: - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_SizeDelta.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_SizeDelta.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 135 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 85 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1806244588100620830, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Name - value: ManaBar_2 - objectReference: {fileID: 0} - - target: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: value_text - value: - objectReference: {fileID: 150613713} - - target: {fileID: 4252802152300486646, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} ---- !u!224 &586821847 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - m_PrefabInstance: {fileID: 586821846} - m_PrefabAsset: {fileID: 0} --- !u!1001 &629549709 PrefabInstance: m_ObjectHideFlags: 0 @@ -856,161 +534,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &746266444 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 962576083989124240} - m_Modifications: - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_SizeDelta.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_SizeDelta.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -135 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -55 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 1806244588100620830, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Name - value: ManaBar_1 - objectReference: {fileID: 0} - - target: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: value_text - value: - objectReference: {fileID: 1100957146} - - target: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: icons.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4252802152300486646, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} ---- !u!224 &746266445 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - m_PrefabInstance: {fileID: 746266444} - m_PrefabAsset: {fileID: 0} --- !u!1001 &839364591 PrefabInstance: m_ObjectHideFlags: 0 @@ -1306,86 +829,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 978862161} m_PrefabAsset: {fileID: 0} ---- !u!1 &1100957144 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1100957145} - - component: {fileID: 1100957147} - - component: {fileID: 1100957146} - m_Layer: 5 - m_Name: Text Forest - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1100957145 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1100957144} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 746266445} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 48, y: 48} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1100957146 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1100957144} - 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: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 42 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 42 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 1 ---- !u!222 &1100957147 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1100957144} - m_CullTransparentMesh: 1 --- !u!1001 &1156614218 PrefabInstance: m_ObjectHideFlags: 0 @@ -1546,18 +989,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1189735659} m_CullTransparentMesh: 1 ---- !u!114 &1236539333 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - m_PrefabInstance: {fileID: 586821846} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bf1498eac12d8c14e98918e5ac2baf2c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1307629563 PrefabInstance: m_ObjectHideFlags: 0 @@ -1665,236 +1096,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf1498eac12d8c14e98918e5ac2baf2c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1328217427 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1328217428} - - component: {fileID: 1328217430} - - component: {fileID: 1328217429} - m_Layer: 5 - m_Name: Text Forest - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1328217428 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328217427} - 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: 1452264123} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 48, y: 48} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1328217429 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328217427} - 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: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 42 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 48 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 0 ---- !u!222 &1328217430 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328217427} - m_CullTransparentMesh: 1 ---- !u!1001 &1452264122 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 962576083989124241} - m_Modifications: - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_SizeDelta.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_SizeDelta.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 135 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 55 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1806244588100620830, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Name - value: ManaBar_1 - objectReference: {fileID: 0} - - target: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: value_text - value: - objectReference: {fileID: 1328217429} - - target: {fileID: 4252802152300486646, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} ---- !u!224 &1452264123 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - m_PrefabInstance: {fileID: 1452264122} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1475694346 PrefabInstance: m_ObjectHideFlags: 0 @@ -1975,18 +1176,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 4127392486269000878} m_PrefabAsset: {fileID: 0} ---- !u!114 &1516502394 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - m_PrefabInstance: {fileID: 746266444} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bf1498eac12d8c14e98918e5ac2baf2c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1591726936 PrefabInstance: m_ObjectHideFlags: 0 @@ -2087,161 +1276,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1591726936} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1701871964 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 962576083989124240} - m_Modifications: - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_SizeDelta.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_SizeDelta.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -135 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -85 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 1806244588100620830, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Name - value: ManaBar_2 - objectReference: {fileID: 0} - - target: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: value_text - value: - objectReference: {fileID: 110596172} - - target: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: icons.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4252802152300486646, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} ---- !u!224 &1701871965 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - m_PrefabInstance: {fileID: 1701871964} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1743420990 PrefabInstance: m_ObjectHideFlags: 0 @@ -2504,18 +1538,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1856883457} m_PrefabAsset: {fileID: 0} ---- !u!114 &1858421782 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - m_PrefabInstance: {fileID: 1452264122} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bf1498eac12d8c14e98918e5ac2baf2c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1892906615 GameObject: m_ObjectHideFlags: 0 @@ -2960,12 +1982,12 @@ PrefabInstance: type: 3} propertyPath: team_mana_bars.Array.data[1] value: - objectReference: {fileID: 1516502394} + objectReference: {fileID: 0} - target: {fileID: 8064129199798896601, guid: b2cda006105c05b428bace831c06c984, type: 3} propertyPath: team_mana_bars.Array.data[2] value: - objectReference: {fileID: 570405431} + objectReference: {fileID: 0} - target: {fileID: 8092412741755098697, guid: b2cda006105c05b428bace831c06c984, type: 3} propertyPath: m_IsActive @@ -2990,12 +2012,12 @@ PrefabInstance: type: 3} propertyPath: team_mana_bars.Array.data[1] value: - objectReference: {fileID: 1858421782} + objectReference: {fileID: 0} - target: {fileID: 8236030736308582322, guid: b2cda006105c05b428bace831c06c984, type: 3} propertyPath: team_mana_bars.Array.data[2] value: - objectReference: {fileID: 1236539333} + objectReference: {fileID: 0} - target: {fileID: 8559980341625567388, guid: b2cda006105c05b428bace831c06c984, type: 3} propertyPath: m_AnchoredPosition.x @@ -3033,18 +2055,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2cda006105c05b428bace831c06c984, type: 3} ---- !u!224 &962576083989124240 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4134376404653246773, guid: b2cda006105c05b428bace831c06c984, - type: 3} - m_PrefabInstance: {fileID: 962576083989124239} - m_PrefabAsset: {fileID: 0} ---- !u!224 &962576083989124241 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6667627304093701143, guid: b2cda006105c05b428bace831c06c984, - type: 3} - m_PrefabInstance: {fileID: 962576083989124239} - m_PrefabAsset: {fileID: 0} --- !u!224 &962576083989124242 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3891856200958776947, guid: b2cda006105c05b428bace831c06c984, diff --git a/Assets/TcgEngine/Scripts/Conditions/ConditionPlayerStat.cs b/Assets/TcgEngine/Scripts/Conditions/ConditionPlayerStat.cs index bef7e10..5a6b497 100644 --- a/Assets/TcgEngine/Scripts/Conditions/ConditionPlayerStat.cs +++ b/Assets/TcgEngine/Scripts/Conditions/ConditionPlayerStat.cs @@ -34,24 +34,6 @@ namespace TcgEngine return CompareInt(target.mana, oper, value); } - // 新增：火系法力值检查 - if (type == ConditionStatType.ManaFire) - { - return CompareInt(target.mana_fire, oper, value); - } - - // 新增：森林法力值检查 - if (type == ConditionStatType.ManaForest) - { - return CompareInt(target.mana_forest, oper, value); - } - - // 新增：水系法力值检查 - if (type == ConditionStatType.ManaWater) - { - return CompareInt(target.mana_water, oper, value); - } - return false; } } diff --git a/Assets/TcgEngine/Scripts/Conditions/ConditionStat.cs b/Assets/TcgEngine/Scripts/Conditions/ConditionStat.cs index 6961bef..a062a72 100644 --- a/Assets/TcgEngine/Scripts/Conditions/ConditionStat.cs +++ b/Assets/TcgEngine/Scripts/Conditions/ConditionStat.cs @@ -10,9 +10,6 @@ namespace TcgEngine Attack = 10, HP = 20, Mana = 30, - ManaFire = 40, - ManaForest = 50, - ManaWater = 60, } /// @@ -44,24 +41,6 @@ namespace TcgEngine return CompareInt(target.GetMana(), oper, value); } - // 新增：火系法力值检查 - if (type == ConditionStatType.ManaFire) - { - return CompareInt(target.GetManaFire(), oper, value); - } - - // 新增：森林法力值检查 - if (type == ConditionStatType.ManaForest) - { - return CompareInt(target.GetManaForest(), oper, value); - } - - // 新增：水系法力值检查 - if (type == ConditionStatType.ManaWater) - { - return CompareInt(target.GetManaWater(), oper, value); - } - return false; } @@ -77,24 +56,6 @@ namespace TcgEngine return CompareInt(target.mana, oper, value); } - // 新增：火系法力值检查 - if (type == ConditionStatType.ManaFire) - { - return CompareInt(target.mana_fire, oper, value); - } - - // 新增：森林法力值检查 - if (type == ConditionStatType.ManaForest) - { - return CompareInt(target.mana_forest, oper, value); - } - - // 新增：水系法力值检查 - if (type == ConditionStatType.ManaWater) - { - return CompareInt(target.mana_water, oper, value); - } - return false; } } diff --git a/Assets/TcgEngine/Scripts/Conditions/FilterHighestStat.cs b/Assets/TcgEngine/Scripts/Conditions/FilterHighestStat.cs index 474174d..2e27198 100644 --- a/Assets/TcgEngine/Scripts/Conditions/FilterHighestStat.cs +++ b/Assets/TcgEngine/Scripts/Conditions/FilterHighestStat.cs @@ -47,21 +47,6 @@ namespace TcgEngine { return card.GetMana(); } - // 新增：火系法力值检查 - if (stat == ConditionStatType.ManaFire) - { - return card.GetManaFire(); - } - // 新增：森林法力值检查 - if (stat == ConditionStatType.ManaForest) - { - return card.GetManaForest(); - } - // 新增：水系法力值检查 - if (stat == ConditionStatType.ManaWater) - { - return card.GetManaWater(); - } return 0; } diff --git a/Assets/TcgEngine/Scripts/Conditions/FilterLowestStat.cs b/Assets/TcgEngine/Scripts/Conditions/FilterLowestStat.cs index b36e93f..33c2529 100644 --- a/Assets/TcgEngine/Scripts/Conditions/FilterLowestStat.cs +++ b/Assets/TcgEngine/Scripts/Conditions/FilterLowestStat.cs @@ -47,21 +47,6 @@ namespace TcgEngine { return card.GetMana(); } - // 新增：火系法力值检查 - if (stat == ConditionStatType.ManaFire) - { - return card.GetManaFire(); - } - // 新增：森林法力值检查 - if (stat == ConditionStatType.ManaForest) - { - return card.GetManaForest(); - } - // 新增：水系法力值检查 - if (stat == ConditionStatType.ManaWater) - { - return card.GetManaWater(); - } return 0; } } diff --git a/Assets/TcgEngine/Scripts/Data/CardData.cs b/Assets/TcgEngine/Scripts/Data/CardData.cs index b8282a3..b63a100 100644 --- a/Assets/TcgEngine/Scripts/Data/CardData.cs +++ b/Assets/TcgEngine/Scripts/Data/CardData.cs @@ -48,11 +48,6 @@ namespace TcgEngine public int attack; public int hp; - // 新增：三种元素法力值 - public int mana_fire; - public int mana_forest; - public int mana_water;  - [Header("Traits")] public TraitData[] traits; public TraitStat[] stats; @@ -187,18 +182,6 @@ namespace TcgEngine if (mana > 99) return true; - // 检查火系法力值是否为动态消耗 - if (mana_fire > 99) - return true; - - // 检查森林法力值是否为动态消耗 - if (mana_forest > 99) - return true; - - // 检查水系法力值是否为动态消耗 - if (mana_water > 99) - return true; - return false; } diff --git a/Assets/TcgEngine/Scripts/Effects/EffectAddStat.cs b/Assets/TcgEngine/Scripts/Effects/EffectAddStat.cs index 99c02ae..a605388 100644 --- a/Assets/TcgEngine/Scripts/Effects/EffectAddStat.cs +++ b/Assets/TcgEngine/Scripts/Effects/EffectAddStat.cs @@ -13,9 +13,6 @@ namespace TcgEngine public class EffectAddStat : EffectData { public EffectStatType type; - - [Header("Team Mana (only for Mana type)")] - public string team_id = ""; // 当type为Mana时，指定影响的阵营 public override void DoEffect(GameLogic logic, AbilityData ability, Card caster, Player target) { @@ -27,19 +24,10 @@ namespace TcgEngine if (type == EffectStatType.Mana) { - // 如果指定了阵营，影响阵营mana；否则影响通用mana - if (!string.IsNullOrEmpty(team_id)) - { - target.AddTeamMana(team_id, ability.value, ability.value); - } - else - { - Debug.Log($"AddStat Mana 通用: {ability.value}"); - target.mana += ability.value; - target.mana_max += ability.value; - target.mana = Mathf.Max(target.mana, 0); - target.mana_max = Mathf.Clamp(target.mana_max, 0, GameplayData.Get().mana_max); - } + target.mana += ability.value; + target.mana_max += ability.value; + target.mana = Mathf.Max(target.mana, 0); + target.mana_max = Mathf.Clamp(target.mana_max, 0, GameplayData.Get().mana_max); } } @@ -52,13 +40,6 @@ namespace TcgEngine target.hp += ability.value; if (type == EffectStatType.Mana) target.mana += ability.value; - - if (type == EffectStatType.ManaFire) - target.mana_fire += ability.value; - if (type == EffectStatType.ManaForest) - target.mana_forest += ability.value; - if (type == EffectStatType.ManaWater) - target.mana_water += ability.value; } // 临时效果 @@ -70,13 +51,6 @@ namespace TcgEngine target.hp_ongoing += ability.value; if (type == EffectStatType.Mana) target.mana_ongoing += ability.value; - - if (type == EffectStatType.ManaFire) - target.mana_fire_ongoing += ability.value; - if (type == EffectStatType.ManaForest) - target.mana_forest_ongoing += ability.value; - if (type == EffectStatType.ManaWater) - target.mana_water_ongoing += ability.value; } } @@ -87,9 +61,5 @@ namespace TcgEngine Attack = 10, HP = 20, Mana = 30, - // 新增：三种元素法力值 - ManaFire = 40, - ManaForest = 50, - ManaWater = 60, } } \ No newline at end of file diff --git a/Assets/TcgEngine/Scripts/Effects/EffectAddStatCount.cs b/Assets/TcgEngine/Scripts/Effects/EffectAddStatCount.cs index 3ab4cf1..974328f 100644 --- a/Assets/TcgEngine/Scripts/Effects/EffectAddStatCount.cs +++ b/Assets/TcgEngine/Scripts/Effects/EffectAddStatCount.cs @@ -8,7 +8,7 @@ namespace TcgEngine /// /// Effect that sets stats equal to a dynamic calculated value from a pile (number of cards on board/hand/deck) /// - + [CreateAssetMenu(fileName = "effect", menuName = "TcgEngine/Effect/AddStatCount", order = 10)] public class EffectAddStatCount : EffectData { @@ -19,9 +19,6 @@ namespace TcgEngine public CardType has_type; public TeamData has_team; public TraitData has_trait; - - [Header("Team Mana (only for Mana type)")] - public string team_id = ""; // 当type为Mana时，指定影响的阵营 public override void DoEffect(GameLogic logic, AbilityData ability, Card caster, Player target) { @@ -34,19 +31,10 @@ namespace TcgEngine if (type == EffectStatType.Mana) { - // 如果指定了阵营，影响阵营mana；否则影响通用mana - if (!string.IsNullOrEmpty(team_id)) - { - target.AddTeamMana(team_id, val, val); - } - else - { - Debug.Log($"AddStatCount Mana 通用: {val}"); - target.mana += val; - target.mana_max += val; - target.mana = Mathf.Max(target.mana, 0); - target.mana_max = Mathf.Clamp(target.mana_max, 0, GameplayData.Get().mana_max); - } + target.mana += val; + target.mana_max += val; + target.mana = Mathf.Max(target.mana, 0); + target.mana_max = Mathf.Clamp(target.mana_max, 0, GameplayData.Get().mana_max); } } @@ -59,13 +47,6 @@ namespace TcgEngine target.hp += val; if (type == EffectStatType.Mana) target.mana += val; - - if (type == EffectStatType.ManaFire) - target.mana_fire += val; - if (type == EffectStatType.ManaForest) - target.mana_forest += val; - if (type == EffectStatType.ManaWater) - target.mana_water += val; } public override void DoOngoingEffect(GameLogic logic, AbilityData ability, Card caster, Card target) @@ -77,13 +58,6 @@ namespace TcgEngine target.hp_ongoing += val; if (type == EffectStatType.Mana) target.mana_ongoing += val; - - if (type == EffectStatType.ManaFire) - target.mana_fire_ongoing += val; - if (type == EffectStatType.ManaForest) - target.mana_forest_ongoing += val; - if (type == EffectStatType.ManaWater) - target.mana_water_ongoing += val; } private int GetCount(Game data, Card caster) diff --git a/Assets/TcgEngine/Scripts/Effects/EffectAddStatRoll.cs b/Assets/TcgEngine/Scripts/Effects/EffectAddStatRoll.cs index b1a9d7e..ba437b4 100644 --- a/Assets/TcgEngine/Scripts/Effects/EffectAddStatRoll.cs +++ b/Assets/TcgEngine/Scripts/Effects/EffectAddStatRoll.cs @@ -31,22 +31,6 @@ namespace TcgEngine target.mana = Mathf.Max(target.mana, 0); target.mana_max = Mathf.Clamp(target.mana_max, 0, GameplayData.Get().mana_max); } - - if (type == EffectStatType.ManaFire) - target.mana_fire += data.rolled_value; - target.mana_fire_max += data.rolled_value; - target.mana_fire = Mathf.Max(target.mana_fire, 0); - target.mana_fire_max = Mathf.Clamp(target.mana_fire_max, 0, GameplayData.Get().mana_max); - if (type == EffectStatType.ManaForest) - target.mana_forest += data.rolled_value; - target.mana_forest_max += data.rolled_value; - target.mana_forest = Mathf.Max(target.mana_forest, 0); - target.mana_forest_max = Mathf.Clamp(target.mana_forest_max, 0, GameplayData.Get().mana_max); - if (type == EffectStatType.ManaWater) - target.mana_water += data.rolled_value; - target.mana_water_max += data.rolled_value; - target.mana_water = Mathf.Max(target.mana_water, 0); - target.mana_water_max = Mathf.Clamp(target.mana_water_max, 0, GameplayData.Get().mana_max); } public override void DoEffect(GameLogic logic, AbilityData ability, Card caster, Card target) @@ -59,13 +43,6 @@ namespace TcgEngine target.hp += data.rolled_value; if (type == EffectStatType.Mana) target.mana += data.rolled_value; - - if (type == EffectStatType.ManaFire) - target.mana_fire += data.rolled_value; - if (type == EffectStatType.ManaForest) - target.mana_forest += data.rolled_value; - if (type == EffectStatType.ManaWater) - target.mana_water += data.rolled_value; } } } \ No newline at end of file diff --git a/Assets/TcgEngine/Scripts/Effects/EffectMana.cs b/Assets/TcgEngine/Scripts/Effects/EffectMana.cs index 1c037a7..0b66e69 100644 --- a/Assets/TcgEngine/Scripts/Effects/EffectMana.cs +++ b/Assets/TcgEngine/Scripts/Effects/EffectMana.cs @@ -14,34 +14,19 @@ namespace TcgEngine { public bool increase_value; public bool increase_max; - - [Header("Team Mana")] - public string team_id = ""; // 指定影响的阵营，空值表示影响通用mana public override void DoEffect(GameLogic logic, AbilityData ability, Card caster, Player target) { - // 如果指定了阵营，影响阵营mana；否则影响通用mana - if (!string.IsNullOrEmpty(team_id)) + if (increase_max) { - // 影响阵营mana - int current_add = increase_value ? ability.value : 0; - int max_add = increase_max ? ability.value : 0; - target.AddTeamMana(team_id, current_add, max_add); + target.mana_max += ability.value; + target.mana_max = Mathf.Clamp(target.mana_max, 0, GameplayData.Get().mana_max); } - else + + if (increase_value) { - // 影响通用mana（保持原有逻辑） - if (increase_max) - { - target.mana_max += ability.value; - target.mana_max = Mathf.Clamp(target.mana_max, 0, GameplayData.Get().mana_max); - } - - if(increase_value) - { - target.mana += ability.value; - target.mana = Mathf.Max(target.mana, 0); - } + target.mana += ability.value; + target.mana = Mathf.Max(target.mana, 0); } } diff --git a/Assets/TcgEngine/Scripts/Effects/EffectSetStat.cs b/Assets/TcgEngine/Scripts/Effects/EffectSetStat.cs index 37164b7..df62bd2 100644 --- a/Assets/TcgEngine/Scripts/Effects/EffectSetStat.cs +++ b/Assets/TcgEngine/Scripts/Effects/EffectSetStat.cs @@ -13,9 +13,6 @@ namespace TcgEngine public class EffectSetStat : EffectData { public EffectStatType type; - - [Header("Team Mana (only for Mana type)")] - public string team_id = ""; // 当type为Mana时，指定影响的阵营 public override void DoEffect(GameLogic logic, AbilityData ability, Card caster, Player target) { @@ -26,17 +23,8 @@ namespace TcgEngine if (type == EffectStatType.Mana) { - // 如果指定了阵营，设置阵营mana；否则设置通用mana - if (!string.IsNullOrEmpty(team_id)) - { - target.SetTeamMana(team_id, ability.value); - } - else - { - Debug.Log($"SetStat Mana 通用: {ability.value}"); - target.mana = ability.value; - target.mana = Mathf.Max(target.mana, 0); - } + target.mana = ability.value; + target.mana = Mathf.Max(target.mana, 0); } } @@ -51,13 +39,6 @@ namespace TcgEngine target.hp = ability.value; target.damage = 0; } - - if (type == EffectStatType.ManaFire) - target.mana_fire = ability.value; - if (type == EffectStatType.ManaForest) - target.mana_forest = ability.value; - if (type == EffectStatType.ManaWater) - target.mana_water = ability.value; } public override void DoOngoingEffect(GameLogic logic, AbilityData ability, Card caster, Card target) @@ -68,13 +49,6 @@ namespace TcgEngine target.hp = ability.value; if (type == EffectStatType.Mana) target.mana = ability.value; - - if (type == EffectStatType.ManaFire) - target.mana_fire = ability.value; - if (type == EffectStatType.ManaForest) - target.mana_forest = ability.value; - if (type == EffectStatType.ManaWater) - target.mana_water = ability.value; } } diff --git a/Assets/TcgEngine/Scripts/GameLogic/Card.cs b/Assets/TcgEngine/Scripts/GameLogic/Card.cs index 249aee8..a82839a 100644 --- a/Assets/TcgEngine/Scripts/GameLogic/Card.cs +++ b/Assets/TcgEngine/Scripts/GameLogic/Card.cs @@ -22,16 +22,6 @@ namespace TcgEngine public int attack = 0; public int hp = 0; - // 新增：三种元素法力值 - public int mana_fire = 0; - public int mana_forest = 0; - public int mana_water = 0; - - // 新增：三种元素法力值的临时加成 - public int mana_fire_ongoing = 0; - public int mana_forest_ongoing = 0; - public int mana_water_ongoing = 0; - public int mana_ongoing = 0; public int attack_ongoing = 0; public int hp_ongoing = 0; @@ -58,10 +48,6 @@ namespace TcgEngine public virtual void ClearOngoing() { ongoing_status.Clear(); ongoing_traits.Clear(); ClearOngoingAbility(); attack_ongoing = 0; hp_ongoing = 0; mana_ongoing = 0; - // 新增：清除元素法力值临时加成 - mana_fire_ongoing = 0; - mana_forest_ongoing = 0; - mana_water_ongoing = 0; } public virtual void Clear() @@ -86,9 +72,6 @@ namespace TcgEngine hp = icard.hp; // 设置法力值 mana = icard.mana; - mana_fire = icard.mana_fire; - mana_forest = icard.mana_forest; - mana_water = icard.mana_water; SetTraits(icard); SetAbilities(icard); } @@ -233,27 +216,6 @@ namespace TcgEngine public bool HasStat(string id) => HasTrait(id); public List GetAllStats() => GetAllTraits(); - // 新增：获取元素法力值的方法 - public virtual int GetManaFire() { return Mathf.Max(mana_fire + mana_fire_ongoing, 0); } - public virtual int GetManaForest() { return Mathf.Max(mana_forest + mana_forest_ongoing, 0); } - public virtual int GetManaWater() { return Mathf.Max(mana_water + mana_water_ongoing, 0); } - - -// 新增：设置元素法力值的方法 - public void SetManaFire(int value) { mana_fire = value; } - public void SetManaForest(int value) { mana_forest = value; } - public void SetManaWater(int value) { mana_water = value; } - - // 新增：增加元素法力值的方法 - public void AddManaFire(int value) { mana_fire += value; } - public void AddManaForest(int value) { mana_forest += value; } - public void AddManaWater(int value) { mana_water += value; } - - // 新增：增加元素法力值临时加成的方法 - public void AddManaFireOngoing(int value) { mana_fire_ongoing += value; } - public void AddManaForestOngoing(int value) { mana_forest_ongoing += value; } - public void AddManaWaterOngoing(int value) { mana_water_ongoing += value; } - //------ Status Effects --------- public void AddStatus(StatusData status, int value, int duration) @@ -594,14 +556,6 @@ namespace TcgEngine dest.hp = source.hp; dest.mana = source.mana; - dest.mana_fire = source.mana_fire; - dest.mana_forest = source.mana_forest; - dest.mana_water = source.mana_water; - - dest.mana_fire_ongoing = source.mana_fire_ongoing; - dest.mana_forest_ongoing = source.mana_forest_ongoing; - dest.mana_water_ongoing = source.mana_water_ongoing; - dest.mana_ongoing = source.mana_ongoing; dest.attack_ongoing = source.attack_ongoing; dest.hp_ongoing = source.hp_ongoing; diff --git a/Assets/TcgEngine/Scripts/GameLogic/Game.cs b/Assets/TcgEngine/Scripts/GameLogic/Game.cs index bd90d31..583c7ab 100644 --- a/Assets/TcgEngine/Scripts/GameLogic/Game.cs +++ b/Assets/TcgEngine/Scripts/GameLogic/Game.cs @@ -44,7 +44,7 @@ namespace TcgEngine public HashSet cards_attacked = new HashSet(); public Game() { } - + public Game(string uid, int nb_players) { this.game_uid = uid; @@ -84,13 +84,13 @@ namespace TcgEngine public virtual bool IsPlayerActionTurn(Player player) { - return player != null && current_player == player.player_id + return player != null && current_player == player.player_id && state == GameState.Play && phase == GamePhase.Main && selector == SelectorType.None; } public virtual bool IsPlayerSelectorTurn(Player player) { - return player != null && selector_player_id == player.player_id + return player != null && selector_player_id == player.player_id && state == GameState.Play && phase == GamePhase.Main && selector != SelectorType.None; } @@ -98,7 +98,7 @@ namespace TcgEngine { return phase == GamePhase.Mulligan && !player.ready; } - + //Check if a card is allowed to be played on slot public virtual bool CanPlayCard(Card card, Slot slot, bool skip_cost = false) { @@ -106,18 +106,13 @@ namespace TcgEngine return false; Player player = GetPlayer(card.player_id); - if (!skip_cost && !player.CanPayTeamMana(card)) + if (!skip_cost && !player.CanPayMana(card)) return false; //Cant pay mana if (!player.HasCard(player.cards_hand, card)) return false; // Card not in hand - // AI 不能在没有对应阵营mana时使用动态费用卡牌 - if (player.is_ai && card.CardData.IsDynamicManaCost()) - { - string team_id = card.CardData.team?.id; - int available_mana = string.IsNullOrEmpty(team_id) ? player.mana : player.GetTeamMana(team_id); - if (available_mana == 0) - return false; // AI cant play X-cost card at 0 cost - } + + if (player.is_ai && card.CardData.IsDynamicManaCost() && player.mana == 0) + return false; // AI cant play X-cost card at 0 cost AI 不能在没有mana时使用动态费用卡牌 if (card.CardData.IsBoardCard()) { @@ -177,7 +172,7 @@ namespace TcgEngine //Check if a card is allowed to attack a player public virtual bool CanAttackTarget(Card attacker, Player target, bool skip_cost = false) { - if(attacker == null || target == null) + if (attacker == null || target == null) return false; if (!attacker.CanAttack(skip_cost)) @@ -465,7 +460,7 @@ namespace TcgEngine } return null; } - + public virtual Player GetRandomPlayer(System.Random rand) { Player player = GetPlayer(rand.NextDouble() < 0.5 ? 1 : 0); @@ -558,7 +553,7 @@ namespace TcgEngine if (dest.players == null) { dest.players = new Player[source.players.Length]; - for(int i=0; i< source.players.Length; i++) + for (int i = 0; i < source.players.Length; i++) dest.players[i] = new Player(i); } diff --git a/Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs b/Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs index 05feab4..d18b76c 100644 --- a/Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs +++ b/Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs @@ -124,12 +124,6 @@ namespace TcgEngine.Gameplay player.mana_max = pdeck != null ? pdeck.start_mana : GameplayData.Get().mana_start; player.mana = player.mana_max; - //初始化三种阵营mana - int start_mana = pdeck != null ? pdeck.start_mana : GameplayData.Get().mana_start; - player.SetTeamMana("fire", start_mana, start_mana); - player.SetTeamMana("forest", start_mana, start_mana); - player.SetTeamMana("water", start_mana, start_mana); - //Draw starting cards 开始抽卡 int dcards = pdeck != null ? pdeck.start_cards : GameplayData.Get().cards_start; DrawCard(player, dcards); @@ -178,19 +172,8 @@ namespace TcgEngine.Gameplay player.mana_max = Mathf.Min(player.mana_max, GameplayData.Get().mana_max); player.mana = player.mana_max; - //阵营Mana增长：基础每回合+1，场上有对应阵营角色额外+1 - UpdateTeamMana(player, "fire"); - UpdateTeamMana(player, "forest"); - UpdateTeamMana(player, "water"); - - // 回合开始时检查所有阵营mana，如果超过5则设置为5 - if (player.GetTeamMana("fire") > 5) - player.SetTeamMana("fire", 5); - if (player.GetTeamMana("forest") > 5) - player.SetTeamMana("forest", 5); - if (player.GetTeamMana("water") > 5) - player.SetTeamMana("water", 5); - if (player.mana > 5) + // 回合开始时检查mana，如果超过5则设置为5 + if (player.mana > player.mana_max) player.mana = 5; //Turn timer and history @@ -448,9 +431,9 @@ namespace TcgEngine.Gameplay { Player player = game_data.GetPlayer(card.player_id); - //Cost - 使用阵营mana支付 + //Cost - 使用mana支付 if (!skip_cost) - player.PayTeamMana(card); + player.PayMana(card); //Play card player.RemoveCardFromAllGroups(card); @@ -2022,22 +2005,6 @@ namespace TcgEngine.Gameplay return random; } - /// - /// 更新指定阵营的mana，基础每回合+1，场上有对应阵营角色额外+角色数量 - /// - private void UpdateTeamMana(Player player, string team_id) - { - int base_increase = GameplayData.Get().mana_per_turn; // 基础增长 - int team_bonus = player.GetBoardTeamCount(team_id); // 场上同阵营角色数量 - int total_increase = base_increase + team_bonus; - - // 增加最大mana - player.AddTeamMana(team_id, 0, total_increase); - - // 当前mana设置为最大值 - player.SetTeamMana(team_id, player.GetTeamManaMax(team_id)); - } - public Game GameData { get { return game_data; } } public ResolveQueue ResolveQueue { get { return resolve_queue; } } } diff --git a/Assets/TcgEngine/Scripts/GameLogic/Player.cs b/Assets/TcgEngine/Scripts/GameLogic/Player.cs index 62abddd..a645fb2 100644 --- a/Assets/TcgEngine/Scripts/GameLogic/Player.cs +++ b/Assets/TcgEngine/Scripts/GameLogic/Player.cs @@ -24,33 +24,8 @@ namespace TcgEngine public int hp; public int hp_max; - // 三种阵营mana系统 - [System.Serializable] - public class TeamMana - { - public int current = 0; - public int max = 0; - - public TeamMana(int start_value = 0) - { - current = start_value; - max = start_value; - } - } - // 新mana - - public int mana_fire = 0; - public int mana_forest = 0; - public int mana_water = 0; - - // 保留原有mana属性以兼容现有代码，将作为通用mana使用 public int mana = 0; public int mana_max = 0; - - // 新增：三种元素法力值的最大值 - public int mana_fire_max = 0; - public int mana_forest_max = 0; - public int mana_water_max = 0; public int kill_count = 0; public int cards_played_this_turn = 0; // 本回合已上场的卡牌数量 public Dictionary cards_all = new Dictionary(); //Dictionnary for quick access to any card by UID @@ -618,11 +593,6 @@ namespace TcgEngine dest.mana = source.mana; dest.mana_max = source.mana_max; - // 复制新mana - dest.mana_fire = source.mana; - dest.mana_forest = source.mana; - dest.mana_water = source.mana; - Card.CloneNull(source.hero, ref dest.hero); Card.CloneDict(source.cards_all, dest.cards_all); Card.CloneListRef(dest.cards_all, source.cards_board, dest.cards_board); @@ -636,165 +606,6 @@ namespace TcgEngine CardStatus.CloneList(source.status, dest.status); CardStatus.CloneList(source.ongoing_status, dest.ongoing_status); } - - //------------- 阵营Mana相关方法 ------------- - - /// - /// 获取指定阵营的当前mana值 - /// - public int GetTeamMana(string team_id) - { - if (team_id == "fire") return mana_fire; - if (team_id == "forest") return mana_forest; - if (team_id == "water") return mana_water; - - Debug.Log($"GetTeamMana: {team_id} not found"); - return 0; - } - - /// - /// 获取指定阵营的最大mana值 - /// - public int GetTeamManaMax(string team_id) - { - return mana_max; - } - - /// - /// 设置指定阵营的mana值 - /// - public void SetTeamMana(string team_id, int current, int max = -1) - { - if (team_id == "fire") - { - mana_fire = current; - if (max >= 0) mana_fire = max; - } - else if (team_id == "forest") - { - mana_forest = current; - if (max >= 0) mana_forest = max; - } - else if (team_id == "water") - { - mana_water = current; - if (max >= 0) mana_water = max; - } - } - - /// - /// 增加指定阵营的mana值 - /// - public void AddTeamMana(string team_id, int current_add = 0, int max_add = 0) - { - if (team_id == "fire") - { - mana_fire += current_add; - mana_fire = Mathf.Max(mana_fire, 0); - mana_fire = Mathf.Clamp(mana_fire, 0, GameplayData.Get().mana_max); - } - else if (team_id == "forest") - { - mana_forest += current_add; - mana_forest = Mathf.Max(mana_forest, 0); - mana_forest = Mathf.Clamp(mana_forest, 0, GameplayData.Get().mana_max); - } - else if (team_id == "water") - { - mana_water += current_add; - mana_water = Mathf.Max(mana_water, 0); - mana_water = Mathf.Clamp(mana_water, 0, GameplayData.Get().mana_max); - } - } - - /// - /// 检查是否有足够的阵营mana支付卡牌费用 - /// - public virtual bool CanPayTeamMana(Card card) - { - if (card.CardData.IsDynamicManaCost()) - return true; - - string team_id = card.CardData.team?.id; - if (string.IsNullOrEmpty(team_id)){ - Debug.Log($"not CanPayTeamMana checking team mana: {mana} >= {card.GetMana()}"); - return mana >= card.GetMana(); // 使用通用mana - } - else - { - Debug.Log($"Checking team mana for {team_id}: {GetTeamMana(team_id)} >= {card.GetMana()}"); - return GetTeamMana(team_id) >= card.GetMana(); - } - } - - /// - /// 支付卡牌的阵营mana费用 - /// - public virtual void PayTeamMana(Card card) - { - if (card.CardData.IsDynamicManaCost()) - return; - - string team_id = card.CardData.team?.id; - if (string.IsNullOrEmpty(team_id)) - { - Debug.Log($"PayTeamMana 通用mana: {mana} -= {card.GetMana()}"); - mana -= card.GetMana(); // 使用通用mana - return; - } - - int cost = card.GetMana(); - if (team_id == "fire") - { - mana_fire -= cost; - mana_fire = Mathf.Max(mana_fire, 0); - } - else if (team_id == "forest") - { - mana_forest -= cost; - mana_forest = Mathf.Max(mana_forest, 0); - } - else if (team_id == "water") - { - mana_water -= cost; - mana_water = Mathf.Max(mana_water, 0); - } - } - - /// - /// 获取场上指定阵营的角色数量 - /// - public int GetBoardTeamCount(string team_id) - { - int count = 0; - Debug.Log($"Checking board for {team_id} characters. Total cards on board: {cards_board.Count}"); - - foreach (Card card in cards_board) - { - if (card.CardData.IsCharacter() && card.CardData.team?.id == team_id) - { - count++; - Debug.Log($"Found {team_id} character: {card.CardData.title}"); - } - } - - Debug.Log($"Total {team_id} characters on board: {count}"); - return count; - } - - /// - /// 测试方法：打印当前所有阵营mana状态 - /// - public void DebugTeamMana() - { - Debug.Log($"=== Player {player_id} Team Mana Debug ==="); - Debug.Log($"General: {mana}/{mana_max}"); - Debug.Log($"Board cards: {cards_board.Count}"); - Debug.Log($"Fire characters on board: {GetBoardTeamCount("fire")}"); - Debug.Log($"Forest characters on board: {GetBoardTeamCount("forest")}"); - Debug.Log($"Water characters on board: {GetBoardTeamCount("water")}"); - Debug.Log("====================================="); - } } [System.Serializable] diff --git a/Assets/TcgEngine/Scripts/UI/PlayerUI.cs b/Assets/TcgEngine/Scripts/UI/PlayerUI.cs index 695f0a7..d372e15 100644 --- a/Assets/TcgEngine/Scripts/UI/PlayerUI.cs +++ b/Assets/TcgEngine/Scripts/UI/PlayerUI.cs @@ -18,10 +18,6 @@ namespace TcgEngine.UI public Text pname; public AvatarUI avatar; public IconBar mana_bar; // 保留原有mana条，作为通用mana显示 - - [Header("Team Mana Bars")] - public IconBar[] team_mana_bars = new IconBar[3]; // ManaBar_0, ManaBar_1, ManaBar_2 - public Text hp_txt; public Text hp_max_txt; @@ -77,49 +73,6 @@ namespace TcgEngine.UI mana_bar.value = player.mana; mana_bar.max_value = player.mana_max; - // 更新阵营mana条 - fire, forest, water - if (team_mana_bars.Length >= 3) - { - // ManaBar_0 = fire - if (team_mana_bars[0] != null) - { - team_mana_bars[0].value = player.mana_fire; - team_mana_bars[0].max_value = player.mana_max; - } - else - { - Debug.LogWarning("team_mana_bars[0] is null!"); - } - - // ManaBar_1 = forest - if (team_mana_bars[1] != null) - { - team_mana_bars[1].value = player.mana_forest; - team_mana_bars[1].max_value = player.mana_max; - } - else - { - Debug.LogWarning("team_mana_bars[1] is null!"); - } - - // ManaBar_2 = water - if (team_mana_bars[2] != null) - { - team_mana_bars[2].value = player.mana_water; - team_mana_bars[2].max_value = player.mana_max; - } - else - { - Debug.LogWarning("team_mana_bars[2] is null!"); - } - } - else - { - Debug.LogWarning($"team_mana_bars.Length = {team_mana_bars.Length}, expected 3"); - } - - - hp_txt.text = prev_hp.ToString(); hp_max_txt.text = "/" + player.hp_max.ToString();