From eac63eb93763aae61f5a3a2c7f4db98e6e492897 Mon Sep 17 00:00:00 2001 From: xianyi Date: Mon, 25 Aug 2025 15:04:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=95=8C=E6=88=91=E5=9B=9E?= =?UTF-8?q?=E6=89=8B=E6=8A=80=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activated/activate_send_hand.asset | 5 ++- .../activated/activate_send_hand_keep.asset | 39 +++++++++++++++++++ .../activate_send_hand_keep.asset.meta | 8 ++++ .../Resources/Effects/send_hand_keep.asset | 15 +++++++ .../Effects/send_hand_keep.asset.meta | 8 ++++ .../Scripts/Effects/EffectSendPile.cs | 22 ++++++++++- 6 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand_keep.asset create mode 100644 Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand_keep.asset.meta create mode 100644 Assets/TcgEngine/Resources/Effects/send_hand_keep.asset create mode 100644 Assets/TcgEngine/Resources/Effects/send_hand_keep.asset.meta diff --git a/Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand.asset b/Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand.asset index 834c494..25f3251 100644 --- a/Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand.asset +++ b/Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand.asset @@ -32,8 +32,9 @@ MonoBehaviour: board_fx: {fileID: 0} caster_fx: {fileID: 0} target_fx: {fileID: 0} + projectile_fx: {fileID: 0} cast_audio: {fileID: 0} target_audio: {fileID: 0} charge_target: 1 - title: 送回手牌 - desc: 回到手牌。 + title: "\u9001\u56DE\u624B\u724C" + desc: "\u56DE\u5230\u624B\u724C\u3002" diff --git a/Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand_keep.asset b/Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand_keep.asset new file mode 100644 index 0000000..e9f9c81 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand_keep.asset @@ -0,0 +1,39 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ce5f81e5cc37f547af6923758602c8c, type: 3} + m_Name: activate_send_hand_keep + m_EditorClassIdentifier: + id: activate_send_hand_keep + trigger: 5 + conditions_trigger: [] + target: 30 + conditions_target: + - {fileID: 11400000, guid: 902733d12f434e94b904de5ebf4112de, type: 2} + - {fileID: 11400000, guid: 707ab85bffdfd2643a7375e15b2fa634, type: 2} + filters_target: [] + effects: + - {fileID: 11400000, guid: e2bf0256d75a94014a056fbbc74e709b, type: 2} + status: [] + value: 0 + duration: 0 + chain_abilities: [] + mana_cost: 1 + exhaust: 1 + board_fx: {fileID: 0} + caster_fx: {fileID: 0} + target_fx: {fileID: 0} + projectile_fx: {fileID: 0} + cast_audio: {fileID: 0} + target_audio: {fileID: 0} + charge_target: 1 + title: "\u9001\u56DE\u624B\u724C" + desc: "\u56DE\u5230\u624B\u724C\u3002" diff --git a/Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand_keep.asset.meta b/Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand_keep.asset.meta new file mode 100644 index 0000000..1dc78d6 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/activate_send_hand_keep.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a243c6e107f304b6ba73d6d3c1a8249d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Effects/send_hand_keep.asset b/Assets/TcgEngine/Resources/Effects/send_hand_keep.asset new file mode 100644 index 0000000..b3f5dab --- /dev/null +++ b/Assets/TcgEngine/Resources/Effects/send_hand_keep.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab52cf67e291b114fa5fbdb2ad5796a8, type: 3} + m_Name: send_hand_keep + m_EditorClassIdentifier: + pile: 25 diff --git a/Assets/TcgEngine/Resources/Effects/send_hand_keep.asset.meta b/Assets/TcgEngine/Resources/Effects/send_hand_keep.asset.meta new file mode 100644 index 0000000..3097a7e --- /dev/null +++ b/Assets/TcgEngine/Resources/Effects/send_hand_keep.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2bf0256d75a94014a056fbbc74e709b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Scripts/Effects/EffectSendPile.cs b/Assets/TcgEngine/Scripts/Effects/EffectSendPile.cs index bf28d96..e49a380 100644 --- a/Assets/TcgEngine/Scripts/Effects/EffectSendPile.cs +++ b/Assets/TcgEngine/Scripts/Effects/EffectSendPile.cs @@ -26,11 +26,28 @@ namespace TcgEngine target.Clear(); } - if (pile == PileType.Hand) + if (pile == PileType.Hand) // 卡牌回到手牌 { player.RemoveCardFromAllGroups(target); player.cards_hand.Add(target); - target.Clear(); + target.Clear(); // 清除卡牌状态 + } + + if (pile == PileType.Hand_keep) // 卡牌回到手牌 但是不清除卡牌状态 + { + player.RemoveCardFromAllGroups(target); + player.cards_hand.Add(target); + + if (target.player_id == caster.player_id) + { + Debug.Log("这是我的卡牌" + target.player_id + " " + caster.player_id); + target.Clear(); // 清除卡牌状态 + } + else + { + Debug.Log("这是敌方的卡牌" + target.player_id + " " + caster.player_id); + // 这是敌方的卡牌 + } } if (pile == PileType.Discard) @@ -54,6 +71,7 @@ namespace TcgEngine None = 0, Board = 10, Hand = 20, + Hand_keep = 25, Deck = 30, Discard = 40, Secret = 50,