diff --git a/Assets/TcgEngine/Resources/Cards/Dark/1005.asset b/Assets/TcgEngine/Resources/Cards/Dark/1005.asset index 353eff9..34ace06 100644 --- a/Assets/TcgEngine/Resources/Cards/Dark/1005.asset +++ b/Assets/TcgEngine/Resources/Cards/Dark/1005.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 4 attack: 3 hp: 12 + isOnline: 1 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Dark/1011.asset b/Assets/TcgEngine/Resources/Cards/Dark/1011.asset index 466bcaa..785fff7 100644 --- a/Assets/TcgEngine/Resources/Cards/Dark/1011.asset +++ b/Assets/TcgEngine/Resources/Cards/Dark/1011.asset @@ -29,7 +29,7 @@ MonoBehaviour: stats: [] abilities: - {fileID: 11400000, guid: 498d2fbf0a250074284a7cd44a448105, type: 2} - - {fileID: 0} + - {fileID: 11400000, guid: 284cfed00af2a0b4a82de3722bbd4352, type: 2} text: "\u72FC\u5973" desc: "\u6F5C\u884C\uFF08\u4E0A\u573A\u540E\u82E5\u573A\u4E0A\u6709\u5176\u4ED6\u89D2\u8272\uFF0C\u65E0\u6CD5\u88AB\u9009\u4E3A\u666E\u901A\u653B\u51FB\u76EE\u6807\uFF09\n\uFF086\uFF09\uFF1A\u5C06\u81EA\u8EAB\u79FB\u56DE\u624B\u724C\uFF0C\u5728\u573A\u4E0A\u53EC\u5524\u4E00\u53EA\u3010\u971C\u7259\u72FC\u3011\u3002\r" spawn_fx: {fileID: 9125387663047351618, guid: bac685160af4aff46ae561a51da6f5f4, diff --git a/Assets/TcgEngine/Resources/Cards/Dark/1014.asset b/Assets/TcgEngine/Resources/Cards/Dark/1014.asset index 6611029..dbe3427 100644 --- a/Assets/TcgEngine/Resources/Cards/Dark/1014.asset +++ b/Assets/TcgEngine/Resources/Cards/Dark/1014.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 5 attack: 2 hp: 20 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Dark/1015.asset b/Assets/TcgEngine/Resources/Cards/Dark/1015.asset index 8f89617..0ec8cd2 100644 --- a/Assets/TcgEngine/Resources/Cards/Dark/1015.asset +++ b/Assets/TcgEngine/Resources/Cards/Dark/1015.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 1 attack: 1 hp: 1 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Dark/1044.asset b/Assets/TcgEngine/Resources/Cards/Dark/1044.asset index c673c43..37ba00f 100644 --- a/Assets/TcgEngine/Resources/Cards/Dark/1044.asset +++ b/Assets/TcgEngine/Resources/Cards/Dark/1044.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 2 attack: 2 hp: 14 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Dark/1046.asset b/Assets/TcgEngine/Resources/Cards/Dark/1046.asset index 61391b8..7860832 100644 --- a/Assets/TcgEngine/Resources/Cards/Dark/1046.asset +++ b/Assets/TcgEngine/Resources/Cards/Dark/1046.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 6 attack: 4 hp: 18 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Dark/1052.asset b/Assets/TcgEngine/Resources/Cards/Dark/1052.asset index bab3b7e..d848498 100644 --- a/Assets/TcgEngine/Resources/Cards/Dark/1052.asset +++ b/Assets/TcgEngine/Resources/Cards/Dark/1052.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 3 attack: 3 hp: 17 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Dark/1053.asset b/Assets/TcgEngine/Resources/Cards/Dark/1053.asset index b4cec03..bd450cc 100644 --- a/Assets/TcgEngine/Resources/Cards/Dark/1053.asset +++ b/Assets/TcgEngine/Resources/Cards/Dark/1053.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 6 attack: 4 hp: 20 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Dark/1065.asset b/Assets/TcgEngine/Resources/Cards/Dark/1065.asset index 763f200..9aeae1f 100644 --- a/Assets/TcgEngine/Resources/Cards/Dark/1065.asset +++ b/Assets/TcgEngine/Resources/Cards/Dark/1065.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 4 attack: 3 hp: 19 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Fire/1013.asset b/Assets/TcgEngine/Resources/Cards/Fire/1013.asset index 6c7f10d..a74b3b3 100644 --- a/Assets/TcgEngine/Resources/Cards/Fire/1013.asset +++ b/Assets/TcgEngine/Resources/Cards/Fire/1013.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 4 attack: 2 hp: 26 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Fire/1021.asset b/Assets/TcgEngine/Resources/Cards/Fire/1021.asset index b54a73f..d66029c 100644 --- a/Assets/TcgEngine/Resources/Cards/Fire/1021.asset +++ b/Assets/TcgEngine/Resources/Cards/Fire/1021.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 3 attack: 2 hp: 17 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Fire/1024.asset b/Assets/TcgEngine/Resources/Cards/Fire/1024.asset index 8f84575..982c752 100644 --- a/Assets/TcgEngine/Resources/Cards/Fire/1024.asset +++ b/Assets/TcgEngine/Resources/Cards/Fire/1024.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 4 attack: 3 hp: 14 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Fire/1055.asset b/Assets/TcgEngine/Resources/Cards/Fire/1055.asset index 6f5ecc9..5bd35e6 100644 --- a/Assets/TcgEngine/Resources/Cards/Fire/1055.asset +++ b/Assets/TcgEngine/Resources/Cards/Fire/1055.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 4 attack: 3 hp: 21 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Fire/1058.asset b/Assets/TcgEngine/Resources/Cards/Fire/1058.asset index 0774858..4e046c8 100644 --- a/Assets/TcgEngine/Resources/Cards/Fire/1058.asset +++ b/Assets/TcgEngine/Resources/Cards/Fire/1058.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 6 attack: 5 hp: 22 + isOnline: 0 traits: - {fileID: 11400000, guid: 1a5c64fd2344f4fcb94553ed85a6ae64, type: 2} stats: [] diff --git a/Assets/TcgEngine/Resources/Cards/Hero.meta b/Assets/TcgEngine/Resources/Cards/Hero.meta deleted file mode 100644 index 2aefe54..0000000 --- a/Assets/TcgEngine/Resources/Cards/Hero.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ba1e3cf774818824683ce650e8ecc71c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Cards/Hero/hero_fire.asset b/Assets/TcgEngine/Resources/Cards/Hero/hero_fire.asset deleted file mode 100644 index 1ad0136..0000000 --- a/Assets/TcgEngine/Resources/Cards/Hero/hero_fire.asset +++ /dev/null @@ -1,45 +0,0 @@ -%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: 843a21f7f6f205741a0a7341aec8e84d, type: 3} - m_Name: hero_fire - m_EditorClassIdentifier: - id: hero_fire - title: "\u706B\u4E4B\u7075" - art_full_path: Cards/hero_fire.png - art_board_path: CardsBoard/hero_fire_board.png - art_horizontal_path: - art_vertical_path: CardsVertical/hero_fire.png - type: 5 - camp: 0 - team: {fileID: 11400000, guid: 6bbb96863ece0314fb318c0fce569afc, type: 2} - rarity: {fileID: 11400000, guid: 13b592f40b7cd424c966f5d7eef425aa, type: 2} - mana: 0 - attack: 0 - hp: 0 - traits: [] - stats: [] - abilities: - - {fileID: 11400000, guid: ef16c91b1e7fc774b80da01b75b41941, type: 2} - text: - desc: - spawn_fx: {fileID: 0} - death_fx: {fileID: 0} - attack_fx: {fileID: 0} - damage_fx: {fileID: 0} - idle_fx: {fileID: 0} - spawn_audio: {fileID: 0} - death_audio: {fileID: 0} - attack_audio: {fileID: 0} - damage_audio: {fileID: 0} - deckbuilding: 0 - cost: 100 - packs: [] diff --git a/Assets/TcgEngine/Resources/Cards/Hero/hero_forest.asset b/Assets/TcgEngine/Resources/Cards/Hero/hero_forest.asset deleted file mode 100644 index 192cd88..0000000 --- a/Assets/TcgEngine/Resources/Cards/Hero/hero_forest.asset +++ /dev/null @@ -1,45 +0,0 @@ -%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: 843a21f7f6f205741a0a7341aec8e84d, type: 3} - m_Name: hero_forest - m_EditorClassIdentifier: - id: hero_forest - title: "\u68EE\u6797\u4E4B\u7075" - art_full_path: Cards/hero_forest.png - art_board_path: CardsBoard/hero_forest_board.png - art_horizontal_path: - art_vertical_path: CardsVertical/hero_forest.png - type: 5 - camp: 0 - team: {fileID: 0} - rarity: {fileID: 11400000, guid: 13b592f40b7cd424c966f5d7eef425aa, type: 2} - mana: 0 - attack: 0 - hp: 0 - traits: [] - stats: [] - abilities: - - {fileID: 11400000, guid: beb74433c4d49444d975a2dc687d684c, type: 2} - text: - desc: - spawn_fx: {fileID: 0} - death_fx: {fileID: 0} - attack_fx: {fileID: 0} - damage_fx: {fileID: 0} - idle_fx: {fileID: 0} - spawn_audio: {fileID: 0} - death_audio: {fileID: 0} - attack_audio: {fileID: 0} - damage_audio: {fileID: 0} - deckbuilding: 0 - cost: 100 - packs: [] diff --git a/Assets/TcgEngine/Resources/Cards/Hero/hero_water.asset b/Assets/TcgEngine/Resources/Cards/Hero/hero_water.asset deleted file mode 100644 index cb4745d..0000000 --- a/Assets/TcgEngine/Resources/Cards/Hero/hero_water.asset +++ /dev/null @@ -1,45 +0,0 @@ -%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: 843a21f7f6f205741a0a7341aec8e84d, type: 3} - m_Name: hero_water - m_EditorClassIdentifier: - id: hero_water - title: "\u6C34\u4E4B\u7075" - art_full_path: Cards/hero_water.png - art_board_path: CardsBoard/hero_water_board.png - art_horizontal_path: - art_vertical_path: CardsVertical/hero_water.png - type: 5 - camp: 0 - team: {fileID: 11400000, guid: ed6dfd9dc7797584994eaf1fba66535f, type: 2} - rarity: {fileID: 11400000, guid: 13b592f40b7cd424c966f5d7eef425aa, type: 2} - mana: 0 - attack: 0 - hp: 0 - traits: [] - stats: [] - abilities: - - {fileID: 11400000, guid: 243a6844300d2be45b60e67667afd6fe, type: 2} - text: - desc: - spawn_fx: {fileID: 0} - death_fx: {fileID: 0} - attack_fx: {fileID: 0} - damage_fx: {fileID: 0} - idle_fx: {fileID: 0} - spawn_audio: {fileID: 0} - death_audio: {fileID: 0} - attack_audio: {fileID: 0} - damage_audio: {fileID: 0} - deckbuilding: 0 - cost: 100 - packs: [] diff --git a/Assets/TcgEngine/Resources/Cards/Hero/hero_water.asset.meta b/Assets/TcgEngine/Resources/Cards/Hero/hero_water.asset.meta deleted file mode 100644 index 59d1707..0000000 --- a/Assets/TcgEngine/Resources/Cards/Hero/hero_water.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 111d60b13ae137f4597da2789d94ecce -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Cards/HeroInfo.meta b/Assets/TcgEngine/Resources/Cards/HeroInfo.meta deleted file mode 100644 index 1c1b86f..0000000 --- a/Assets/TcgEngine/Resources/Cards/HeroInfo.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b6daf439647fa35428b9902e3e969f76 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Cards/Light/1020.asset b/Assets/TcgEngine/Resources/Cards/Light/1020.asset index c5f1e5f..04af571 100644 --- a/Assets/TcgEngine/Resources/Cards/Light/1020.asset +++ b/Assets/TcgEngine/Resources/Cards/Light/1020.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 4 attack: 3 hp: 20 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Light/1025.asset b/Assets/TcgEngine/Resources/Cards/Light/1025.asset index 26841af..6d29764 100644 --- a/Assets/TcgEngine/Resources/Cards/Light/1025.asset +++ b/Assets/TcgEngine/Resources/Cards/Light/1025.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 3 attack: 1 hp: 18 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Light/1026.asset b/Assets/TcgEngine/Resources/Cards/Light/1026.asset index 40a0f3e..1ffc357 100644 --- a/Assets/TcgEngine/Resources/Cards/Light/1026.asset +++ b/Assets/TcgEngine/Resources/Cards/Light/1026.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 2 attack: 1 hp: 18 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Light/1032.asset b/Assets/TcgEngine/Resources/Cards/Light/1032.asset index 8cfd5a4..df288be 100644 --- a/Assets/TcgEngine/Resources/Cards/Light/1032.asset +++ b/Assets/TcgEngine/Resources/Cards/Light/1032.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 3 attack: 1 hp: 23 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Light/1060.asset b/Assets/TcgEngine/Resources/Cards/Light/1060.asset index 637d51d..2885312 100644 --- a/Assets/TcgEngine/Resources/Cards/Light/1060.asset +++ b/Assets/TcgEngine/Resources/Cards/Light/1060.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 3 attack: 2 hp: 21 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Light/1066.asset b/Assets/TcgEngine/Resources/Cards/Light/1066.asset index 2e1e8fa..3e17a14 100644 --- a/Assets/TcgEngine/Resources/Cards/Light/1066.asset +++ b/Assets/TcgEngine/Resources/Cards/Light/1066.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 4 attack: 2 hp: 23 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Water/1012.asset b/Assets/TcgEngine/Resources/Cards/Water/1012.asset index fa78a76..b1e2acc 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/1012.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/1012.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 1 attack: 4 hp: 16 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Water/1016.asset b/Assets/TcgEngine/Resources/Cards/Water/1016.asset index 7df880b..65ed74c 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/1016.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/1016.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 7 attack: 5 hp: 43 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Water/1017.asset b/Assets/TcgEngine/Resources/Cards/Water/1017.asset index cd37456..22e170f 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/1017.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/1017.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 5 attack: 4 hp: 19 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Water/1018.asset b/Assets/TcgEngine/Resources/Cards/Water/1018.asset index 5731ba3..4767624 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/1018.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/1018.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 4 attack: 4 hp: 16 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Water/1041.asset b/Assets/TcgEngine/Resources/Cards/Water/1041.asset index 0fa7912..b932724 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/1041.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/1041.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 3 attack: 2 hp: 19 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Water/1042.asset b/Assets/TcgEngine/Resources/Cards/Water/1042.asset index ec6ac9e..41a35a3 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/1042.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/1042.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 3 attack: 2 hp: 16 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Water/1047.asset b/Assets/TcgEngine/Resources/Cards/Water/1047.asset index 5eb3471..11b3921 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/1047.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/1047.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 3 attack: 3 hp: 16 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Water/1048.asset b/Assets/TcgEngine/Resources/Cards/Water/1048.asset index 071bcee..f96a88c 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/1048.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/1048.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 4 attack: 3 hp: 17 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Water/1049.asset b/Assets/TcgEngine/Resources/Cards/Water/1049.asset index 58cd4f6..521ff69 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/1049.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/1049.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 6 attack: 3 hp: 24 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Water/1054.asset b/Assets/TcgEngine/Resources/Cards/Water/1054.asset index b917015..17d4d46 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/1054.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/1054.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 3 attack: 2 hp: 22 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Water/1056.asset b/Assets/TcgEngine/Resources/Cards/Water/1056.asset index 9e2ac53..286dd6b 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/1056.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/1056.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 4 attack: 2 hp: 20 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Wind/1023.asset b/Assets/TcgEngine/Resources/Cards/Wind/1023.asset index 29ef54b..70f2fa1 100644 --- a/Assets/TcgEngine/Resources/Cards/Wind/1023.asset +++ b/Assets/TcgEngine/Resources/Cards/Wind/1023.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 4 attack: 3 hp: 17 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Wind/1028.asset b/Assets/TcgEngine/Resources/Cards/Wind/1028.asset index 3705956..1a4bb43 100644 --- a/Assets/TcgEngine/Resources/Cards/Wind/1028.asset +++ b/Assets/TcgEngine/Resources/Cards/Wind/1028.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 3 attack: 3 hp: 16 + isOnline: 0 traits: [] stats: [] abilities: [] diff --git a/Assets/TcgEngine/Resources/Cards/Wind/1029.asset b/Assets/TcgEngine/Resources/Cards/Wind/1029.asset index a07429e..dc230ac 100644 --- a/Assets/TcgEngine/Resources/Cards/Wind/1029.asset +++ b/Assets/TcgEngine/Resources/Cards/Wind/1029.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 2 attack: 1 hp: 16 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Cards/Wind/1059.asset b/Assets/TcgEngine/Resources/Cards/Wind/1059.asset index a1159a8..f7426f6 100644 --- a/Assets/TcgEngine/Resources/Cards/Wind/1059.asset +++ b/Assets/TcgEngine/Resources/Cards/Wind/1059.asset @@ -25,6 +25,7 @@ MonoBehaviour: mana: 6 attack: 5 hp: 17 + isOnline: 0 traits: [] stats: [] abilities: diff --git a/Assets/TcgEngine/Resources/Decks/dark_deck.asset b/Assets/TcgEngine/Resources/Decks/dark_deck.asset new file mode 100644 index 0000000..8f0a4f7 --- /dev/null +++ b/Assets/TcgEngine/Resources/Decks/dark_deck.asset @@ -0,0 +1,36 @@ +%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: 87ecef176d27eb040a9770e0eefea2ec, type: 3} + m_Name: dark_deck + m_EditorClassIdentifier: + id: dark_deck + title: "\u6697" + hero: {fileID: 11400000, guid: cf170aea7ffb041428f37608f1561058, type: 2} + cards: + - {fileID: 11400000, guid: 100e03cca97f7564b984d85fd14c26d9, type: 2} + - {fileID: 11400000, guid: 535e33ff5456d994fbf957c0fe40c4ac, type: 2} + - {fileID: 11400000, guid: 910d6457934d0a849a42f4cfae844805, type: 2} + - {fileID: 11400000, guid: 49b99ba5114693c4b954cb7c1b722558, type: 2} + - {fileID: 11400000, guid: d9fe7c42a108ede4183a5e20efe3d2bb, type: 2} + - {fileID: 11400000, guid: 72c30485c65cd6845a60201dd74cd10f, type: 2} + - {fileID: 11400000, guid: fa48e8231f8394447baa92993010c71e, type: 2} + - {fileID: 11400000, guid: 2d6a8f437d3ab8d46a3f3d8f7bd03367, type: 2} + - {fileID: 11400000, guid: d0debc0d9d2fe93439e24070934107a2, type: 2} + - {fileID: 11400000, guid: ae24c9524bf0249438a4a67ba44cfd09, type: 2} + - {fileID: 11400000, guid: 16f1729eddb207a4b9e57cc73b84590c, type: 2} + - {fileID: 11400000, guid: 4d2b02d28b57914479f936d0c3d05c2c, type: 2} + - {fileID: 11400000, guid: e776a8b49e2a16c4ba4019656a1c0801, type: 2} + - {fileID: 11400000, guid: bdeead6f17c26734794c67ff36930439, type: 2} + - {fileID: 11400000, guid: ad8a3ad9ff32f324ab29703fb95bae1f, type: 2} + - {fileID: 11400000, guid: d449802505176a7469f87c6d8df1a16e, type: 2} + - {fileID: 11400000, guid: dabe99b16b708e34dbe82cbabbc5704f, type: 2} + - {fileID: 11400000, guid: 150bfbf3a895ff647b071054b93d81a1, type: 2} diff --git a/Assets/TcgEngine/Resources/Cards/Hero/hero_forest.asset.meta b/Assets/TcgEngine/Resources/Decks/dark_deck.asset.meta similarity index 79% rename from Assets/TcgEngine/Resources/Cards/Hero/hero_forest.asset.meta rename to Assets/TcgEngine/Resources/Decks/dark_deck.asset.meta index 94bb9d3..70f3a78 100644 --- a/Assets/TcgEngine/Resources/Cards/Hero/hero_forest.asset.meta +++ b/Assets/TcgEngine/Resources/Decks/dark_deck.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 04fd0777e8f567b48ad05e6bdaf97c1d +guid: 4c63a55d901995940aaa1ba56c3def73 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/TcgEngine/Resources/Decks/fire_deck.asset b/Assets/TcgEngine/Resources/Decks/fire_deck.asset index 927272d..70d5b32 100644 --- a/Assets/TcgEngine/Resources/Decks/fire_deck.asset +++ b/Assets/TcgEngine/Resources/Decks/fire_deck.asset @@ -13,6 +13,23 @@ MonoBehaviour: m_Name: fire_deck m_EditorClassIdentifier: id: fire_deck - title: "\u706B\u7130" + title: "\u706B" hero: {fileID: 11400000, guid: cf170aea7ffb041428f37608f1561058, type: 2} - cards: [] + cards: + - {fileID: 11400000, guid: c1140ad42a7f855488f0a48f0d55c54e, type: 2} + - {fileID: 11400000, guid: 522b9326c509ab347978deac0c1055dc, type: 2} + - {fileID: 11400000, guid: 846ab40b0001b9440b5d13e8a541d3d5, type: 2} + - {fileID: 11400000, guid: 99261e5188df5164f95b50672ae33d11, type: 2} + - {fileID: 11400000, guid: 8dc50659a8d303149a79ce7ef307d88f, type: 2} + - {fileID: 11400000, guid: b54532b166101284a9f0ce8158591c8e, type: 2} + - {fileID: 11400000, guid: 262e8c21fcf9b2f42896863841972b05, type: 2} + - {fileID: 11400000, guid: 7f458743058d64846988fe485026b353, type: 2} + - {fileID: 11400000, guid: 464b219ca99955246927f08f2e7e1681, type: 2} + - {fileID: 11400000, guid: 760b7a7efcee66742a6bb97ed1eb4dae, type: 2} + - {fileID: 11400000, guid: 0d523c62727f22841b352574d2e6dec6, type: 2} + - {fileID: 11400000, guid: cdddd2139da0fa446bfec3b84cdf628a, type: 2} + - {fileID: 11400000, guid: 939305374a78f7948a7a7e3d0daba92a, type: 2} + - {fileID: 11400000, guid: 34f44a260c1b72044a55a76c26cbae28, type: 2} + - {fileID: 11400000, guid: 87ca9890d667fad439eb8a874bd46601, type: 2} + - {fileID: 11400000, guid: 8e31c295ce8d19d439c6f2a08fd02870, type: 2} + - {fileID: 11400000, guid: c8123d098713c7940b877197eec364a2, type: 2} diff --git a/Assets/TcgEngine/Resources/Decks/forest_deck.asset b/Assets/TcgEngine/Resources/Decks/forest_deck.asset deleted file mode 100644 index 9b4c0cb..0000000 --- a/Assets/TcgEngine/Resources/Decks/forest_deck.asset +++ /dev/null @@ -1,30 +0,0 @@ -%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: 87ecef176d27eb040a9770e0eefea2ec, type: 3} - m_Name: forest_deck - m_EditorClassIdentifier: - id: forest_deck - title: "\u68EE\u6797" - hero: {fileID: 11400000, guid: 04fd0777e8f567b48ad05e6bdaf97c1d, type: 2} - cards: - - {fileID: 11400000, guid: 1e22d4647e903814d96f63a729e1f820, type: 2} - - {fileID: 11400000, guid: 1e22d4647e903814d96f63a729e1f820, type: 2} - - {fileID: 11400000, guid: 2e8eac7ed58a29944a6d2c7d2539fca8, type: 2} - - {fileID: 11400000, guid: 2e8eac7ed58a29944a6d2c7d2539fca8, type: 2} - - {fileID: 11400000, guid: 4a0f93237a2ae53468e29927c1b7c1ec, type: 2} - - {fileID: 11400000, guid: 4a0f93237a2ae53468e29927c1b7c1ec, type: 2} - - {fileID: 11400000, guid: 2302f11d23015254dbb067255d70e738, type: 2} - - {fileID: 11400000, guid: 4fc52d01f2883134ea1e6ea0d9ba82f2, type: 2} - - {fileID: 11400000, guid: 4fc52d01f2883134ea1e6ea0d9ba82f2, type: 2} - - {fileID: 11400000, guid: fa7053162e690c948a100b6cbcde7266, type: 2} - - {fileID: 11400000, guid: fa7053162e690c948a100b6cbcde7266, type: 2} - - {fileID: 11400000, guid: 9f363479388a0c347b8a455c4f32a659, type: 2} diff --git a/Assets/TcgEngine/Resources/Decks/light_deck.asset b/Assets/TcgEngine/Resources/Decks/light_deck.asset new file mode 100644 index 0000000..c4f129e --- /dev/null +++ b/Assets/TcgEngine/Resources/Decks/light_deck.asset @@ -0,0 +1,31 @@ +%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: 87ecef176d27eb040a9770e0eefea2ec, type: 3} + m_Name: light_deck + m_EditorClassIdentifier: + id: light_deck + title: "\u5149" + hero: {fileID: 11400000, guid: 04fd0777e8f567b48ad05e6bdaf97c1d, type: 2} + cards: + - {fileID: 11400000, guid: 81514b2f1f2061943aa3ba592d4dce63, type: 2} + - {fileID: 11400000, guid: eb7d86fbeff4be649a7fa12b245b964f, type: 2} + - {fileID: 11400000, guid: b7dde845192fdcb4d9cdbef6baebd687, type: 2} + - {fileID: 11400000, guid: 99018e237c28b9d469f6554006a70d8f, type: 2} + - {fileID: 11400000, guid: b8864f64ca75cb9438edd397578cbac4, type: 2} + - {fileID: 11400000, guid: 02d3056ceecad544689249e5b367d844, type: 2} + - {fileID: 11400000, guid: 819d84a6685399e4e8540f25e6043228, type: 2} + - {fileID: 11400000, guid: c1cb4d791118ffb47a665d2287c9d419, type: 2} + - {fileID: 11400000, guid: 01465b4ae29f1d74898dcddd5549dc5c, type: 2} + - {fileID: 11400000, guid: 94116b72dd891ce4d89f85143b905eb3, type: 2} + - {fileID: 11400000, guid: e1e9aa197b8096a4ca471532bda87dab, type: 2} + - {fileID: 11400000, guid: 75d98defd33a96048994befdb6f7d851, type: 2} + - {fileID: 11400000, guid: d72725a8182803f498d016d76d430ac9, type: 2} diff --git a/Assets/TcgEngine/Resources/Cards/Hero/hero_fire.asset.meta b/Assets/TcgEngine/Resources/Decks/light_deck.asset.meta similarity index 79% rename from Assets/TcgEngine/Resources/Cards/Hero/hero_fire.asset.meta rename to Assets/TcgEngine/Resources/Decks/light_deck.asset.meta index 0ceaf6e..7271c37 100644 --- a/Assets/TcgEngine/Resources/Cards/Hero/hero_fire.asset.meta +++ b/Assets/TcgEngine/Resources/Decks/light_deck.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cf170aea7ffb041428f37608f1561058 +guid: f6b0849b908944e419fc0189ad971ec1 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/TcgEngine/Resources/Decks/test_deck.asset b/Assets/TcgEngine/Resources/Decks/test_deck.asset index 715066c..0259243 100644 --- a/Assets/TcgEngine/Resources/Decks/test_deck.asset +++ b/Assets/TcgEngine/Resources/Decks/test_deck.asset @@ -12,98 +12,92 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 87ecef176d27eb040a9770e0eefea2ec, type: 3} m_Name: test_deck m_EditorClassIdentifier: - id: test_deck - title: Test Deck - hero: {fileID: 11400000, guid: cf170aea7ffb041428f37608f1561058, type: 2} + id: tesk_deck + title: "\u98CE" + hero: {fileID: 11400000, guid: 04fd0777e8f567b48ad05e6bdaf97c1d, type: 2} cards: - - {fileID: 11400000, guid: 1e22d4647e903814d96f63a729e1f820, type: 2} - - {fileID: 11400000, guid: 1e22d4647e903814d96f63a729e1f820, type: 2} - - {fileID: 11400000, guid: 2e8eac7ed58a29944a6d2c7d2539fca8, type: 2} - - {fileID: 11400000, guid: 2e8eac7ed58a29944a6d2c7d2539fca8, type: 2} - - {fileID: 11400000, guid: 4a0f93237a2ae53468e29927c1b7c1ec, type: 2} - - {fileID: 11400000, guid: 4a0f93237a2ae53468e29927c1b7c1ec, type: 2} - - {fileID: 11400000, guid: 685188cde95b4274c9d959f68adc1bcd, type: 2} - - {fileID: 11400000, guid: 685188cde95b4274c9d959f68adc1bcd, type: 2} - - {fileID: 11400000, guid: 4fc52d01f2883134ea1e6ea0d9ba82f2, type: 2} - - {fileID: 11400000, guid: 4fc52d01f2883134ea1e6ea0d9ba82f2, type: 2} - - {fileID: 11400000, guid: 2302f11d23015254dbb067255d70e738, type: 2} - - {fileID: 11400000, guid: 2302f11d23015254dbb067255d70e738, type: 2} - - {fileID: 11400000, guid: b6c42bd471da89e47afedf7c771d8d15, type: 2} - - {fileID: 11400000, guid: b6c42bd471da89e47afedf7c771d8d15, type: 2} - - {fileID: 11400000, guid: c893315406368cb49b6b0ca112718fa2, type: 2} - - {fileID: 11400000, guid: 9863085763473eb48acc0d06a6f7d6ce, type: 2} - - {fileID: 11400000, guid: 67c9ea5ccee610f4fa1681382134bb7a, type: 2} - - {fileID: 11400000, guid: 149beb7f3fda56b40b84ddbb0917e0bf, type: 2} - - {fileID: 11400000, guid: 2ee7b7313b6d8154c8a1a3d2dc1c301d, type: 2} - - {fileID: 11400000, guid: b28109cb7acac0c4e86d8b3d88ef6dad, type: 2} - - {fileID: 11400000, guid: 1cec19f2b6532b246a5ed43c9ea966d1, type: 2} - - {fileID: 11400000, guid: d564bc13a3f2c2a459cfe492217d8d98, type: 2} - - {fileID: 11400000, guid: 99081d84b6aa6264aa1c68c6defbe31d, type: 2} - - {fileID: 11400000, guid: 99081d84b6aa6264aa1c68c6defbe31d, type: 2} - - {fileID: 11400000, guid: 6fc2df66f76e1d04193b9575abbf0991, type: 2} - - {fileID: 11400000, guid: 6fc2df66f76e1d04193b9575abbf0991, type: 2} - - {fileID: 11400000, guid: 90114aa2c3dd29f46820b95467b2bbd3, type: 2} - - {fileID: 11400000, guid: 90114aa2c3dd29f46820b95467b2bbd3, type: 2} - - {fileID: 11400000, guid: 90322744d448d6a46b8c2361a222d9a6, type: 2} - - {fileID: 11400000, guid: 90322744d448d6a46b8c2361a222d9a6, type: 2} - - {fileID: 11400000, guid: 900d0aa6de59c1349ab5c08a481c2a38, type: 2} - - {fileID: 11400000, guid: 900d0aa6de59c1349ab5c08a481c2a38, type: 2} - - {fileID: 11400000, guid: 58f3c5b170fe7824aa33bd4875e07f3a, type: 2} - - {fileID: 11400000, guid: 58f3c5b170fe7824aa33bd4875e07f3a, type: 2} - - {fileID: 11400000, guid: 979b326ecf73d0a4791dc37a6f13c24a, type: 2} - - {fileID: 11400000, guid: 91a80a84e1f0cd94fac96f44bc2ff142, type: 2} - - {fileID: 11400000, guid: 879711e9fc6210b42a2bc43c0f595222, type: 2} - - {fileID: 11400000, guid: 836b91f8ff0e85742ac0bea1bc45f60d, type: 2} - - {fileID: 11400000, guid: 153048657a8ea4448951d15c53a7f07e, type: 2} - - {fileID: 11400000, guid: 3e430dc2bad4fe049acd2584de26eaad, type: 2} - - {fileID: 11400000, guid: 3660f3745defa054392beb41affc32fb, type: 2} - - {fileID: 11400000, guid: 455d29b2bce69514db0fa914d7243f85, type: 2} - - {fileID: 11400000, guid: 89f3d73097f233148896600d94d482c0, type: 2} - - {fileID: 11400000, guid: 89f3d73097f233148896600d94d482c0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: f11bd6abea1b4c24ab733ae003dfa279, type: 2} - - {fileID: 11400000, guid: f11bd6abea1b4c24ab733ae003dfa279, type: 2} - - {fileID: 11400000, guid: fced434c254f6a94e8377864595757c8, type: 2} - - {fileID: 11400000, guid: b8b898ed060dea74794804ef9ac44b74, type: 2} - - {fileID: 11400000, guid: b8b898ed060dea74794804ef9ac44b74, type: 2} - - {fileID: 11400000, guid: eb0010106a7f2a947a777580a7d9ce5d, type: 2} - - {fileID: 11400000, guid: eb0010106a7f2a947a777580a7d9ce5d, type: 2} - - {fileID: 11400000, guid: 74ffbe8087a7ec64696352b9013d5d21, type: 2} - - {fileID: 11400000, guid: ee0eb5f42cd646d4c92cc5bae97f8512, type: 2} - - {fileID: 11400000, guid: c7c9d74d8c13e9a4b8407a0ca889b702, type: 2} - - {fileID: 11400000, guid: b492fe697d5348c498fac4bffae6c98b, type: 2} - - {fileID: 11400000, guid: 0bf6205b77bb00e438451a6deb075060, type: 2} - - {fileID: 11400000, guid: 31ca3a05927d28943babbf36b93e9a90, type: 2} - - {fileID: 11400000, guid: 6d25f87d5e8912e4aae6b2e8cdb51378, type: 2} - - {fileID: 11400000, guid: fd274eafa2afb8a47bdb49654df58d11, type: 2} - - {fileID: 11400000, guid: 4b44d1f9e6e19034f8d5663c921d5587, type: 2} - - {fileID: 11400000, guid: 4b44d1f9e6e19034f8d5663c921d5587, type: 2} - - {fileID: 11400000, guid: e777946125cd2eb49a3b2ac17bea169a, type: 2} - - {fileID: 11400000, guid: 74dbc9618015b7e47a9a0a7d3fcdf7b8, type: 2} - - {fileID: 11400000, guid: 7ff8409492665684bbd8aed112cafe33, type: 2} - - {fileID: 11400000, guid: 7ff8409492665684bbd8aed112cafe33, type: 2} - - {fileID: 11400000, guid: 08d6f1b7690902f47b553fbfc842a6fe, type: 2} - - {fileID: 11400000, guid: 328b92f1e2024ad41bd03db933a33847, type: 2} - - {fileID: 11400000, guid: d3e866161f45f03498b4098dbd8d968d, type: 2} - - {fileID: 11400000, guid: 551493b0ae0cdb64b856f53058c9fb61, type: 2} - - {fileID: 11400000, guid: ad35fe7448fdfa2438d4fb121f86c5c3, type: 2} - - {fileID: 11400000, guid: 21cc9808386a5de498c63fbdb0b3a07d, type: 2} - - {fileID: 11400000, guid: 21cc9808386a5de498c63fbdb0b3a07d, type: 2} - - {fileID: 11400000, guid: 9f363479388a0c347b8a455c4f32a659, type: 2} - - {fileID: 11400000, guid: c26efbbdb66a33048ab44661fb009ad4, type: 2} - - {fileID: 11400000, guid: fa7053162e690c948a100b6cbcde7266, type: 2} - - {fileID: 11400000, guid: fa7053162e690c948a100b6cbcde7266, type: 2} - - {fileID: 11400000, guid: ab1fd2e7036d86041a4106f7e63ba256, type: 2} - - {fileID: 11400000, guid: 715703be67fff2c4d92ff16751a9ad7b, type: 2} - - {fileID: 11400000, guid: 715703be67fff2c4d92ff16751a9ad7b, type: 2} - - {fileID: 11400000, guid: ebc5c750d62ace147b0a0f29516387be, type: 2} - - {fileID: 11400000, guid: 6194ca0450582774ca001101a5e0e617, type: 2} - - {fileID: 11400000, guid: bf1260c806d96ae499b07fce2441ec96, type: 2} - - {fileID: 11400000, guid: 1bf5ec89614ec4844b1b1be1e132ff22, type: 2} - - {fileID: 11400000, guid: cc5ac0aced0c65445a6ab4a06f422158, type: 2} - - {fileID: 11400000, guid: cbbbf1151021efd47bbe5e4c346365ff, type: 2} - - {fileID: 11400000, guid: a0e3b9d3696f03948bc460b19c59261c, type: 2} - - {fileID: 11400000, guid: fbc3a5d9ec653cb4ebae7898a20b57e0, type: 2} - - {fileID: 11400000, guid: 0bdf580aee2aca14883c19e0d6c5df44, type: 2} - - {fileID: 11400000, guid: 8faf0d78746617c4594039cb64dcca7c, type: 2} + - {fileID: 11400000, guid: 100e03cca97f7564b984d85fd14c26d9, type: 2} + - {fileID: 11400000, guid: 535e33ff5456d994fbf957c0fe40c4ac, type: 2} + - {fileID: 11400000, guid: 910d6457934d0a849a42f4cfae844805, type: 2} + - {fileID: 11400000, guid: 49b99ba5114693c4b954cb7c1b722558, type: 2} + - {fileID: 11400000, guid: d9fe7c42a108ede4183a5e20efe3d2bb, type: 2} + - {fileID: 11400000, guid: 72c30485c65cd6845a60201dd74cd10f, type: 2} + - {fileID: 11400000, guid: fa48e8231f8394447baa92993010c71e, type: 2} + - {fileID: 11400000, guid: 2d6a8f437d3ab8d46a3f3d8f7bd03367, type: 2} + - {fileID: 11400000, guid: d0debc0d9d2fe93439e24070934107a2, type: 2} + - {fileID: 11400000, guid: ae24c9524bf0249438a4a67ba44cfd09, type: 2} + - {fileID: 11400000, guid: 16f1729eddb207a4b9e57cc73b84590c, type: 2} + - {fileID: 11400000, guid: 4d2b02d28b57914479f936d0c3d05c2c, type: 2} + - {fileID: 11400000, guid: e776a8b49e2a16c4ba4019656a1c0801, type: 2} + - {fileID: 11400000, guid: bdeead6f17c26734794c67ff36930439, type: 2} + - {fileID: 11400000, guid: ad8a3ad9ff32f324ab29703fb95bae1f, type: 2} + - {fileID: 11400000, guid: d449802505176a7469f87c6d8df1a16e, type: 2} + - {fileID: 11400000, guid: dabe99b16b708e34dbe82cbabbc5704f, type: 2} + - {fileID: 11400000, guid: 150bfbf3a895ff647b071054b93d81a1, type: 2} + - {fileID: 11400000, guid: c1140ad42a7f855488f0a48f0d55c54e, type: 2} + - {fileID: 11400000, guid: 522b9326c509ab347978deac0c1055dc, type: 2} + - {fileID: 11400000, guid: 846ab40b0001b9440b5d13e8a541d3d5, type: 2} + - {fileID: 11400000, guid: 99261e5188df5164f95b50672ae33d11, type: 2} + - {fileID: 11400000, guid: 8dc50659a8d303149a79ce7ef307d88f, type: 2} + - {fileID: 11400000, guid: b54532b166101284a9f0ce8158591c8e, type: 2} + - {fileID: 11400000, guid: 262e8c21fcf9b2f42896863841972b05, type: 2} + - {fileID: 11400000, guid: 7f458743058d64846988fe485026b353, type: 2} + - {fileID: 11400000, guid: 464b219ca99955246927f08f2e7e1681, type: 2} + - {fileID: 11400000, guid: 760b7a7efcee66742a6bb97ed1eb4dae, type: 2} + - {fileID: 11400000, guid: 0d523c62727f22841b352574d2e6dec6, type: 2} + - {fileID: 11400000, guid: cdddd2139da0fa446bfec3b84cdf628a, type: 2} + - {fileID: 11400000, guid: 939305374a78f7948a7a7e3d0daba92a, type: 2} + - {fileID: 11400000, guid: 34f44a260c1b72044a55a76c26cbae28, type: 2} + - {fileID: 11400000, guid: 87ca9890d667fad439eb8a874bd46601, type: 2} + - {fileID: 11400000, guid: 8e31c295ce8d19d439c6f2a08fd02870, type: 2} + - {fileID: 11400000, guid: c8123d098713c7940b877197eec364a2, type: 2} + - {fileID: 11400000, guid: 81514b2f1f2061943aa3ba592d4dce63, type: 2} + - {fileID: 11400000, guid: eb7d86fbeff4be649a7fa12b245b964f, type: 2} + - {fileID: 11400000, guid: b7dde845192fdcb4d9cdbef6baebd687, type: 2} + - {fileID: 11400000, guid: 99018e237c28b9d469f6554006a70d8f, type: 2} + - {fileID: 11400000, guid: b8864f64ca75cb9438edd397578cbac4, type: 2} + - {fileID: 11400000, guid: 02d3056ceecad544689249e5b367d844, type: 2} + - {fileID: 11400000, guid: 819d84a6685399e4e8540f25e6043228, type: 2} + - {fileID: 11400000, guid: c1cb4d791118ffb47a665d2287c9d419, type: 2} + - {fileID: 11400000, guid: 01465b4ae29f1d74898dcddd5549dc5c, type: 2} + - {fileID: 11400000, guid: 94116b72dd891ce4d89f85143b905eb3, type: 2} + - {fileID: 11400000, guid: e1e9aa197b8096a4ca471532bda87dab, type: 2} + - {fileID: 11400000, guid: 75d98defd33a96048994befdb6f7d851, type: 2} + - {fileID: 11400000, guid: d72725a8182803f498d016d76d430ac9, type: 2} + - {fileID: 11400000, guid: 1b9a993c25b99ba4e8f4a450987bfc0b, type: 2} + - {fileID: 11400000, guid: b3dc6e4cb5e2df741b35b9d2fe9a63b5, type: 2} + - {fileID: 11400000, guid: 0bb5e1d20042a7643a1a2fd4db4d0c92, type: 2} + - {fileID: 11400000, guid: 9d027a6cac65f1a43891748172873fa5, type: 2} + - {fileID: 11400000, guid: bb53f063a15f17d40acc96e8cb2c3d5b, type: 2} + - {fileID: 11400000, guid: fd5db568771c24a46a13d368177cddd3, type: 2} + - {fileID: 11400000, guid: a90a279c9927e55459a3a6f242d96768, type: 2} + - {fileID: 11400000, guid: efdc198cd9718534e9ba8339e9466f10, type: 2} + - {fileID: 11400000, guid: 7a90c2dfb71709141b19f1aef0837c94, type: 2} + - {fileID: 11400000, guid: 0293812814c93ca49bbef4a9d123db01, type: 2} + - {fileID: 11400000, guid: 93a2c0a093f6b004cb0de1490e529ee8, type: 2} + - {fileID: 11400000, guid: 89b9782cf37ba534391826594efa0415, type: 2} + - {fileID: 11400000, guid: 08f77f742de3b794ab6aa49f7ffc68ba, type: 2} + - {fileID: 11400000, guid: bbfd3fdb88f4fba4980c32d1efe230d4, type: 2} + - {fileID: 11400000, guid: 3ac1efe32ad74d549ba8b22a8a549af4, type: 2} + - {fileID: 11400000, guid: e3abd820044d36b4fa21cee46f2df4aa, type: 2} + - {fileID: 11400000, guid: 057baf323e4525b4089cae7970058884, type: 2} + - {fileID: 11400000, guid: 767e839d28f58ed46806f30a6156e5a0, type: 2} + - {fileID: 11400000, guid: 8baf697cd5ecdf84eb28717c3b7b0890, type: 2} + - {fileID: 11400000, guid: c28f2445629ce5640a1e0acc9a68a012, type: 2} + - {fileID: 11400000, guid: 2449405c9365b1047a1cb6d8c694246e, type: 2} + - {fileID: 11400000, guid: 870a69b7e82ea014a9c9b163fc6757f8, type: 2} + - {fileID: 11400000, guid: 67ca9778de47e3b4a9cd05031f8e3b37, type: 2} + - {fileID: 11400000, guid: c2492e502e60eaf42880c0d6d915b74e, type: 2} + - {fileID: 11400000, guid: 456dae0deadc5cc41a84d331373f1cbd, type: 2} + - {fileID: 11400000, guid: 1e20cb5f03d03e04fa61f42712a6cef5, type: 2} + - {fileID: 11400000, guid: 5baebb94a19161040a27a3a1c373b621, type: 2} + - {fileID: 11400000, guid: ce7cb3761152efe48884479b7d4f2ce4, type: 2} + - {fileID: 11400000, guid: a4e26722d1514ee48969e03099ee03c6, type: 2} + - {fileID: 11400000, guid: e6c220d77b922c343a18b0ab5000ae5a, type: 2} + - {fileID: 11400000, guid: 7237dacdd80dca341b4521462dd3dfb9, type: 2} + - {fileID: 11400000, guid: 517e2aaf4e7ed91469a8b0c0385183e0, type: 2} + - {fileID: 11400000, guid: 6e9b67a27fbaa714995866756579a802, type: 2} + - {fileID: 11400000, guid: 88b73d26d019d3d448b92f06a75f8538, type: 2} + - {fileID: 11400000, guid: f0186e8f04e961849aa27634bd718a84, type: 2} + - {fileID: 11400000, guid: a1b84e63003104f469b5c2d2c8cc24f7, type: 2} + - {fileID: 11400000, guid: c1becfc5805600648bb359207f31c494, type: 2} diff --git a/Assets/TcgEngine/Resources/Decks/test_deck.asset.meta b/Assets/TcgEngine/Resources/Decks/test_deck.asset.meta index cbff81b..bad3bc7 100644 --- a/Assets/TcgEngine/Resources/Decks/test_deck.asset.meta +++ b/Assets/TcgEngine/Resources/Decks/test_deck.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 0e6326c43c0688e40bbf592cf3ea6dec +guid: 37b2d5500d88532479306f94c7d16e59 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 0 + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Decks/water_deck.asset b/Assets/TcgEngine/Resources/Decks/water_deck.asset index 5344c09..5fb47a8 100644 --- a/Assets/TcgEngine/Resources/Decks/water_deck.asset +++ b/Assets/TcgEngine/Resources/Decks/water_deck.asset @@ -13,18 +13,25 @@ MonoBehaviour: m_Name: water_deck m_EditorClassIdentifier: id: water_deck - title: "\u81FB\u51B0" + title: "\u6C34" hero: {fileID: 11400000, guid: 111d60b13ae137f4597da2789d94ecce, type: 2} cards: - - {fileID: 11400000, guid: 89f3d73097f233148896600d94d482c0, type: 2} - - {fileID: 11400000, guid: 89f3d73097f233148896600d94d482c0, type: 2} - - {fileID: 11400000, guid: 89f3d73097f233148896600d94d482c0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} + - {fileID: 11400000, guid: 1b9a993c25b99ba4e8f4a450987bfc0b, type: 2} + - {fileID: 11400000, guid: b3dc6e4cb5e2df741b35b9d2fe9a63b5, type: 2} + - {fileID: 11400000, guid: 0bb5e1d20042a7643a1a2fd4db4d0c92, type: 2} + - {fileID: 11400000, guid: 9d027a6cac65f1a43891748172873fa5, type: 2} + - {fileID: 11400000, guid: bb53f063a15f17d40acc96e8cb2c3d5b, type: 2} + - {fileID: 11400000, guid: fd5db568771c24a46a13d368177cddd3, type: 2} + - {fileID: 11400000, guid: a90a279c9927e55459a3a6f242d96768, type: 2} + - {fileID: 11400000, guid: efdc198cd9718534e9ba8339e9466f10, type: 2} + - {fileID: 11400000, guid: 7a90c2dfb71709141b19f1aef0837c94, type: 2} + - {fileID: 11400000, guid: 0293812814c93ca49bbef4a9d123db01, type: 2} + - {fileID: 11400000, guid: 93a2c0a093f6b004cb0de1490e529ee8, type: 2} + - {fileID: 11400000, guid: 89b9782cf37ba534391826594efa0415, type: 2} + - {fileID: 11400000, guid: 08f77f742de3b794ab6aa49f7ffc68ba, type: 2} + - {fileID: 11400000, guid: bbfd3fdb88f4fba4980c32d1efe230d4, type: 2} + - {fileID: 11400000, guid: 3ac1efe32ad74d549ba8b22a8a549af4, type: 2} + - {fileID: 11400000, guid: e3abd820044d36b4fa21cee46f2df4aa, type: 2} + - {fileID: 11400000, guid: 057baf323e4525b4089cae7970058884, type: 2} + - {fileID: 11400000, guid: 767e839d28f58ed46806f30a6156e5a0, type: 2} + - {fileID: 11400000, guid: 8baf697cd5ecdf84eb28717c3b7b0890, type: 2} diff --git a/Assets/TcgEngine/Resources/Decks/wind_deck.asset b/Assets/TcgEngine/Resources/Decks/wind_deck.asset new file mode 100644 index 0000000..9fd8373 --- /dev/null +++ b/Assets/TcgEngine/Resources/Decks/wind_deck.asset @@ -0,0 +1,36 @@ +%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: 87ecef176d27eb040a9770e0eefea2ec, type: 3} + m_Name: wind_deck + m_EditorClassIdentifier: + id: wind_deck + title: "\u98CE" + hero: {fileID: 11400000, guid: 04fd0777e8f567b48ad05e6bdaf97c1d, type: 2} + cards: + - {fileID: 11400000, guid: c28f2445629ce5640a1e0acc9a68a012, type: 2} + - {fileID: 11400000, guid: 2449405c9365b1047a1cb6d8c694246e, type: 2} + - {fileID: 11400000, guid: 870a69b7e82ea014a9c9b163fc6757f8, type: 2} + - {fileID: 11400000, guid: 67ca9778de47e3b4a9cd05031f8e3b37, type: 2} + - {fileID: 11400000, guid: c2492e502e60eaf42880c0d6d915b74e, type: 2} + - {fileID: 11400000, guid: 456dae0deadc5cc41a84d331373f1cbd, type: 2} + - {fileID: 11400000, guid: 1e20cb5f03d03e04fa61f42712a6cef5, type: 2} + - {fileID: 11400000, guid: 5baebb94a19161040a27a3a1c373b621, type: 2} + - {fileID: 11400000, guid: ce7cb3761152efe48884479b7d4f2ce4, type: 2} + - {fileID: 11400000, guid: a4e26722d1514ee48969e03099ee03c6, type: 2} + - {fileID: 11400000, guid: e6c220d77b922c343a18b0ab5000ae5a, type: 2} + - {fileID: 11400000, guid: 7237dacdd80dca341b4521462dd3dfb9, type: 2} + - {fileID: 11400000, guid: 517e2aaf4e7ed91469a8b0c0385183e0, type: 2} + - {fileID: 11400000, guid: 6e9b67a27fbaa714995866756579a802, type: 2} + - {fileID: 11400000, guid: 88b73d26d019d3d448b92f06a75f8538, type: 2} + - {fileID: 11400000, guid: f0186e8f04e961849aa27634bd718a84, type: 2} + - {fileID: 11400000, guid: a1b84e63003104f469b5c2d2c8cc24f7, type: 2} + - {fileID: 11400000, guid: c1becfc5805600648bb359207f31c494, type: 2} diff --git a/Assets/TcgEngine/Resources/Decks/forest_deck.asset.meta b/Assets/TcgEngine/Resources/Decks/wind_deck.asset.meta similarity index 100% rename from Assets/TcgEngine/Resources/Decks/forest_deck.asset.meta rename to Assets/TcgEngine/Resources/Decks/wind_deck.asset.meta diff --git a/Assets/TcgEngine/Resources/GameplayData.asset b/Assets/TcgEngine/Resources/GameplayData.asset index 1a7e3e2..5030a3d 100644 --- a/Assets/TcgEngine/Resources/GameplayData.asset +++ b/Assets/TcgEngine/Resources/GameplayData.asset @@ -13,41 +13,41 @@ MonoBehaviour: m_Name: GameplayData m_EditorClassIdentifier: hp_start: 999 - # 起始mana mana_start: 1 - # 每回合增加mana mana_per_turn: 1 - # 最大mana上限 mana_max: 10 - # 初始化手牌数量 cards_start: 3 - # 每回合抽牌数量 cards_per_turn: 1 - # 手牌数量限制 cards_max: 10 - # 超时时间 turn_duration: 600 - second_bonus: {fileID: 11400000, guid: 9503f60659f1df04eb3dd7fa925885fb, type: 2} + second_bonus: {fileID: 11400000, guid: c28f2445629ce5640a1e0acc9a68a012, type: 2} mulligan: 1 deck_size: 12 deck_duplicate_max: 2 + deck_ssr_max: 2 sell_ratio: 0.8 ai_type: 10 ai_level: 10 free_decks: - - {fileID: 11400000, guid: 8aea02f8dfcc2834d8eeca8e259140ce, type: 2} + - {fileID: 11400000, guid: 4c63a55d901995940aaa1ba56c3def73, type: 2} - {fileID: 11400000, guid: 8539b1ce42aef234786631b3c4bfb067, type: 2} + - {fileID: 11400000, guid: f6b0849b908944e419fc0189ad971ec1, type: 2} - {fileID: 11400000, guid: e371ae9abcc31014992b685a145a087c, type: 2} + - {fileID: 11400000, guid: 8aea02f8dfcc2834d8eeca8e259140ce, type: 2} starter_decks: - - {fileID: 11400000, guid: 8aea02f8dfcc2834d8eeca8e259140ce, type: 2} + - {fileID: 11400000, guid: 4c63a55d901995940aaa1ba56c3def73, type: 2} - {fileID: 11400000, guid: 8539b1ce42aef234786631b3c4bfb067, type: 2} + - {fileID: 11400000, guid: f6b0849b908944e419fc0189ad971ec1, type: 2} - {fileID: 11400000, guid: e371ae9abcc31014992b685a145a087c, type: 2} + - {fileID: 11400000, guid: 8aea02f8dfcc2834d8eeca8e259140ce, type: 2} ai_decks: - - {fileID: 11400000, guid: 8aea02f8dfcc2834d8eeca8e259140ce, type: 2} + - {fileID: 11400000, guid: 4c63a55d901995940aaa1ba56c3def73, type: 2} - {fileID: 11400000, guid: 8539b1ce42aef234786631b3c4bfb067, type: 2} + - {fileID: 11400000, guid: f6b0849b908944e419fc0189ad971ec1, type: 2} - {fileID: 11400000, guid: e371ae9abcc31014992b685a145a087c, type: 2} + - {fileID: 11400000, guid: 8aea02f8dfcc2834d8eeca8e259140ce, type: 2} arena_list: - Game - test_deck: {fileID: 11400000, guid: 0e6326c43c0688e40bbf592cf3ea6dec, type: 2} - test_deck_ai: {fileID: 11400000, guid: 0e6326c43c0688e40bbf592cf3ea6dec, type: 2} + test_deck: {fileID: 11400000, guid: 37b2d5500d88532479306f94c7d16e59, type: 2} + test_deck_ai: {fileID: 11400000, guid: 37b2d5500d88532479306f94c7d16e59, type: 2} ai_vs_ai: 0 diff --git a/Assets/TcgEngine/Resources/Levels/level1.asset b/Assets/TcgEngine/Resources/Levels/level1.asset index f0d6687..7ad08f5 100644 --- a/Assets/TcgEngine/Resources/Levels/level1.asset +++ b/Assets/TcgEngine/Resources/Levels/level1.asset @@ -26,5 +26,10 @@ MonoBehaviour: reward_xp: 150 reward_coins: 250 reward_packs: [] - reward_cards: [] + reward_cards: + - {fileID: 11400000, guid: c28f2445629ce5640a1e0acc9a68a012, type: 2} + - {fileID: 11400000, guid: c28f2445629ce5640a1e0acc9a68a012, type: 2} + - {fileID: 11400000, guid: c28f2445629ce5640a1e0acc9a68a012, type: 2} + - {fileID: 11400000, guid: c28f2445629ce5640a1e0acc9a68a012, type: 2} + - {fileID: 11400000, guid: c28f2445629ce5640a1e0acc9a68a012, type: 2} reward_decks: [] diff --git a/Assets/TcgEngine/Resources/Levels/level1_ai.asset b/Assets/TcgEngine/Resources/Levels/level1_ai.asset index 58c9581..f18f2af 100644 --- a/Assets/TcgEngine/Resources/Levels/level1_ai.asset +++ b/Assets/TcgEngine/Resources/Levels/level1_ai.asset @@ -16,15 +16,15 @@ MonoBehaviour: title: hero: {fileID: 0} cards: - - {fileID: 11400000, guid: faacda797c4448a4bbbcbca76c6fefc0, type: 2} - - {fileID: 11400000, guid: faacda797c4448a4bbbcbca76c6fefc0, type: 2} - - {fileID: 11400000, guid: 900d0aa6de59c1349ab5c08a481c2a38, type: 2} + - {fileID: 11400000, guid: 1b9a993c25b99ba4e8f4a450987bfc0b, type: 2} + - {fileID: 11400000, guid: 1b9a993c25b99ba4e8f4a450987bfc0b, type: 2} + - {fileID: 11400000, guid: 522b9326c509ab347978deac0c1055dc, type: 2} board_cards: - - card: {fileID: 11400000, guid: 99081d84b6aa6264aa1c68c6defbe31d, type: 2} + - card: {fileID: 11400000, guid: 100e03cca97f7564b984d85fd14c26d9, type: 2} slot: x: 2 y: 1 - - card: {fileID: 11400000, guid: 99081d84b6aa6264aa1c68c6defbe31d, type: 2} + - card: {fileID: 11400000, guid: 100e03cca97f7564b984d85fd14c26d9, type: 2} slot: x: 3 y: 1 diff --git a/Assets/TcgEngine/Resources/Levels/level1_player.asset b/Assets/TcgEngine/Resources/Levels/level1_player.asset index aa58b3b..04062b6 100644 --- a/Assets/TcgEngine/Resources/Levels/level1_player.asset +++ b/Assets/TcgEngine/Resources/Levels/level1_player.asset @@ -16,18 +16,18 @@ MonoBehaviour: title: hero: {fileID: 0} cards: - - {fileID: 11400000, guid: 1e22d4647e903814d96f63a729e1f820, type: 2} - - {fileID: 11400000, guid: b9f08ad1ccd0ff24fad5a626483f76c3, type: 2} - - {fileID: 11400000, guid: 2ee7b7313b6d8154c8a1a3d2dc1c301d, type: 2} - - {fileID: 11400000, guid: b9f08ad1ccd0ff24fad5a626483f76c3, type: 2} - - {fileID: 11400000, guid: 2ee7b7313b6d8154c8a1a3d2dc1c301d, type: 2} - - {fileID: 11400000, guid: b9f08ad1ccd0ff24fad5a626483f76c3, type: 2} + - {fileID: 11400000, guid: 100e03cca97f7564b984d85fd14c26d9, type: 2} + - {fileID: 11400000, guid: 0bb5e1d20042a7643a1a2fd4db4d0c92, type: 2} + - {fileID: 11400000, guid: 464b219ca99955246927f08f2e7e1681, type: 2} + - {fileID: 11400000, guid: c1cb4d791118ffb47a665d2287c9d419, type: 2} + - {fileID: 11400000, guid: 7237dacdd80dca341b4521462dd3dfb9, type: 2} + - {fileID: 11400000, guid: 2449405c9365b1047a1cb6d8c694246e, type: 2} board_cards: - - card: {fileID: 11400000, guid: b9f08ad1ccd0ff24fad5a626483f76c3, type: 2} + - card: {fileID: 0} slot: x: 1 y: 1 - - card: {fileID: 11400000, guid: b9f08ad1ccd0ff24fad5a626483f76c3, type: 2} + - card: {fileID: 0} slot: x: 5 y: 1 diff --git a/Assets/TcgEngine/Resources/Levels/level2_player.asset b/Assets/TcgEngine/Resources/Levels/level2_player.asset index d5e87e5..b4fceaf 100644 --- a/Assets/TcgEngine/Resources/Levels/level2_player.asset +++ b/Assets/TcgEngine/Resources/Levels/level2_player.asset @@ -16,12 +16,12 @@ MonoBehaviour: title: hero: {fileID: 0} cards: - - {fileID: 11400000, guid: 4a0f93237a2ae53468e29927c1b7c1ec, type: 2} - - {fileID: 11400000, guid: fa7053162e690c948a100b6cbcde7266, type: 2} - - {fileID: 11400000, guid: 1cec19f2b6532b246a5ed43c9ea966d1, type: 2} - - {fileID: 11400000, guid: 4fc52d01f2883134ea1e6ea0d9ba82f2, type: 2} - - {fileID: 11400000, guid: 1cec19f2b6532b246a5ed43c9ea966d1, type: 2} - - {fileID: 11400000, guid: 1cec19f2b6532b246a5ed43c9ea966d1, type: 2} + - {fileID: 11400000, guid: 100e03cca97f7564b984d85fd14c26d9, type: 2} + - {fileID: 11400000, guid: 0bb5e1d20042a7643a1a2fd4db4d0c92, type: 2} + - {fileID: 11400000, guid: 464b219ca99955246927f08f2e7e1681, type: 2} + - {fileID: 11400000, guid: c1cb4d791118ffb47a665d2287c9d419, type: 2} + - {fileID: 11400000, guid: 7237dacdd80dca341b4521462dd3dfb9, type: 2} + - {fileID: 11400000, guid: 2449405c9365b1047a1cb6d8c694246e, type: 2} board_cards: [] start_cards: 4 start_mana: 4 diff --git a/Assets/TcgEngine/Resources/Levels/level3_player.asset b/Assets/TcgEngine/Resources/Levels/level3_player.asset index be72135..3f3892d 100644 --- a/Assets/TcgEngine/Resources/Levels/level3_player.asset +++ b/Assets/TcgEngine/Resources/Levels/level3_player.asset @@ -16,14 +16,14 @@ MonoBehaviour: title: hero: {fileID: 0} cards: - - {fileID: 11400000, guid: 9f363479388a0c347b8a455c4f32a659, type: 2} - - {fileID: 11400000, guid: fa7053162e690c948a100b6cbcde7266, type: 2} - - {fileID: 11400000, guid: 715703be67fff2c4d92ff16751a9ad7b, type: 2} - - {fileID: 11400000, guid: 715703be67fff2c4d92ff16751a9ad7b, type: 2} - - {fileID: 11400000, guid: fa7053162e690c948a100b6cbcde7266, type: 2} - - {fileID: 11400000, guid: 9f363479388a0c347b8a455c4f32a659, type: 2} + - {fileID: 11400000, guid: 100e03cca97f7564b984d85fd14c26d9, type: 2} + - {fileID: 11400000, guid: 0bb5e1d20042a7643a1a2fd4db4d0c92, type: 2} + - {fileID: 11400000, guid: 464b219ca99955246927f08f2e7e1681, type: 2} + - {fileID: 11400000, guid: c1cb4d791118ffb47a665d2287c9d419, type: 2} + - {fileID: 11400000, guid: 7237dacdd80dca341b4521462dd3dfb9, type: 2} + - {fileID: 11400000, guid: 2449405c9365b1047a1cb6d8c694246e, type: 2} board_cards: - - card: {fileID: 11400000, guid: 685188cde95b4274c9d959f68adc1bcd, type: 2} + - card: {fileID: 0} slot: x: 3 y: 1 diff --git a/Assets/TcgEngine/Resources/Levels/level4_player.asset b/Assets/TcgEngine/Resources/Levels/level4_player.asset index d319930..3c67e1c 100644 --- a/Assets/TcgEngine/Resources/Levels/level4_player.asset +++ b/Assets/TcgEngine/Resources/Levels/level4_player.asset @@ -16,24 +16,24 @@ MonoBehaviour: title: hero: {fileID: 0} cards: - - {fileID: 11400000, guid: fa7053162e690c948a100b6cbcde7266, type: 2} - - {fileID: 11400000, guid: 685188cde95b4274c9d959f68adc1bcd, type: 2} - - {fileID: 11400000, guid: b6c42bd471da89e47afedf7c771d8d15, type: 2} - - {fileID: 11400000, guid: b28109cb7acac0c4e86d8b3d88ef6dad, type: 2} - - {fileID: 11400000, guid: c26efbbdb66a33048ab44661fb009ad4, type: 2} - - {fileID: 11400000, guid: 1e22d4647e903814d96f63a729e1f820, type: 2} - - {fileID: 11400000, guid: 9863085763473eb48acc0d06a6f7d6ce, type: 2} - - {fileID: 11400000, guid: b28109cb7acac0c4e86d8b3d88ef6dad, type: 2} + - {fileID: 11400000, guid: 100e03cca97f7564b984d85fd14c26d9, type: 2} + - {fileID: 11400000, guid: 0bb5e1d20042a7643a1a2fd4db4d0c92, type: 2} + - {fileID: 11400000, guid: 464b219ca99955246927f08f2e7e1681, type: 2} + - {fileID: 11400000, guid: c1cb4d791118ffb47a665d2287c9d419, type: 2} + - {fileID: 11400000, guid: 7237dacdd80dca341b4521462dd3dfb9, type: 2} + - {fileID: 11400000, guid: 2449405c9365b1047a1cb6d8c694246e, type: 2} + - {fileID: 0} + - {fileID: 0} board_cards: - - card: {fileID: 11400000, guid: b9f08ad1ccd0ff24fad5a626483f76c3, type: 2} + - card: {fileID: 0} slot: x: 2 y: 1 - - card: {fileID: 11400000, guid: b9f08ad1ccd0ff24fad5a626483f76c3, type: 2} + - card: {fileID: 0} slot: x: 3 y: 1 - - card: {fileID: 11400000, guid: b9f08ad1ccd0ff24fad5a626483f76c3, type: 2} + - card: {fileID: 0} slot: x: 4 y: 1 diff --git a/Assets/TcgEngine/Resources/Levels/level5_player.asset b/Assets/TcgEngine/Resources/Levels/level5_player.asset index 49d74d4..c406970 100644 --- a/Assets/TcgEngine/Resources/Levels/level5_player.asset +++ b/Assets/TcgEngine/Resources/Levels/level5_player.asset @@ -16,15 +16,15 @@ MonoBehaviour: title: hero: {fileID: 0} cards: - - {fileID: 11400000, guid: 2302f11d23015254dbb067255d70e738, type: 2} - - {fileID: 11400000, guid: d564bc13a3f2c2a459cfe492217d8d98, type: 2} - - {fileID: 11400000, guid: 2ee7b7313b6d8154c8a1a3d2dc1c301d, type: 2} - - {fileID: 11400000, guid: 4fc52d01f2883134ea1e6ea0d9ba82f2, type: 2} - - {fileID: 11400000, guid: fa7053162e690c948a100b6cbcde7266, type: 2} - - {fileID: 11400000, guid: 4a0f93237a2ae53468e29927c1b7c1ec, type: 2} - - {fileID: 11400000, guid: 1cec19f2b6532b246a5ed43c9ea966d1, type: 2} + - {fileID: 11400000, guid: 100e03cca97f7564b984d85fd14c26d9, type: 2} + - {fileID: 11400000, guid: 0bb5e1d20042a7643a1a2fd4db4d0c92, type: 2} + - {fileID: 11400000, guid: 464b219ca99955246927f08f2e7e1681, type: 2} + - {fileID: 11400000, guid: c1cb4d791118ffb47a665d2287c9d419, type: 2} + - {fileID: 11400000, guid: 7237dacdd80dca341b4521462dd3dfb9, type: 2} + - {fileID: 11400000, guid: 2449405c9365b1047a1cb6d8c694246e, type: 2} + - {fileID: 0} board_cards: - - card: {fileID: 11400000, guid: 67c9ea5ccee610f4fa1681382134bb7a, type: 2} + - card: {fileID: 11400000, guid: 535e33ff5456d994fbf957c0fe40c4ac, type: 2} slot: x: 3 y: 1 diff --git a/Assets/TcgEngine/Scenes/Menu/Menu.unity b/Assets/TcgEngine/Scenes/Menu/Menu.unity index b29f80e..5c0f49f 100644 --- a/Assets/TcgEngine/Scenes/Menu/Menu.unity +++ b/Assets/TcgEngine/Scenes/Menu/Menu.unity @@ -43577,6 +43577,7 @@ MonoBehaviour: - {fileID: 1334454751} - {fileID: 149393134} - {fileID: 644190903} + filter_dropdown: 0 --- !u!225 &396921782448154716 CanvasGroup: m_ObjectHideFlags: 0 @@ -46008,7 +46009,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 396921783062070324} m_Enabled: 1 - m_Alpha: 0 + m_Alpha: 1 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 @@ -47822,7 +47823,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 396921783552706681} m_Enabled: 1 - m_Alpha: 1 + m_Alpha: 0 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 diff --git a/Assets/TcgEngine/Scenes/Tool/CardUploader.unity b/Assets/TcgEngine/Scenes/Tool/CardUploader.unity index 3ed0986..972bf38 100644 --- a/Assets/TcgEngine/Scenes/Tool/CardUploader.unity +++ b/Assets/TcgEngine/Scenes/Tool/CardUploader.unity @@ -151,6 +151,7 @@ Transform: 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: 0} m_RootOrder: 3 @@ -189,7 +190,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: data: {fileID: 11400000, guid: a9cd0b04f37dacf438315cc872d1f9ea, type: 2} - assets: {fileID: 0} + assets: {fileID: 11400000, guid: 2e6044260abd363419cf565383a1a459, type: 2} --- !u!1 &369328907 GameObject: m_ObjectHideFlags: 0 @@ -218,6 +219,7 @@ RectTransform: 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: 1261375777} m_RootOrder: 1 @@ -359,6 +361,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1567277400} - {fileID: 833586494} @@ -404,6 +407,7 @@ RectTransform: 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: 374715568} m_RootOrder: 5 @@ -487,6 +491,7 @@ Transform: 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: 374715568} m_RootOrder: 7 @@ -503,6 +508,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -553,6 +559,7 @@ RectTransform: 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: 1261375777} m_RootOrder: 0 @@ -632,6 +639,7 @@ RectTransform: 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: 374715568} m_RootOrder: 1 @@ -780,6 +788,7 @@ RectTransform: 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: 2005435616} m_RootOrder: 0 @@ -860,6 +869,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -270} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 417699554} - {fileID: 369328908} @@ -922,7 +932,10 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 3 m_CharacterLimit: 20 - m_OnEndEdit: + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnDidEndEdit: m_PersistentCalls: m_Calls: [] m_OnValueChanged: @@ -1002,6 +1015,7 @@ RectTransform: 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: 1471774863} m_RootOrder: 0 @@ -1081,6 +1095,7 @@ RectTransform: 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: 374715568} m_RootOrder: 6 @@ -1160,6 +1175,7 @@ RectTransform: 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: 2005435616} m_RootOrder: 1 @@ -1240,6 +1256,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -270} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1399566434} m_Father: {fileID: 374715568} @@ -1424,6 +1441,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1489,6 +1507,7 @@ RectTransform: 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: 374715568} m_RootOrder: 0 @@ -1565,6 +1584,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -270} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1259307170} - {fileID: 1440338737} @@ -1627,7 +1647,10 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 50 - m_OnEndEdit: + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnDidEndEdit: m_PersistentCalls: m_Calls: [] m_OnValueChanged: diff --git a/Assets/TcgEngine/Scripts/Api/UserData.cs b/Assets/TcgEngine/Scripts/Api/UserData.cs index e8536f1..ec04724 100644 --- a/Assets/TcgEngine/Scripts/Api/UserData.cs +++ b/Assets/TcgEngine/Scripts/Api/UserData.cs @@ -35,7 +35,7 @@ namespace TcgEngine public UserCardData[] cards; public UserCardData[] packs; - public UserDeckData[] decks; + public UserDeckData[] decks;// 自建卡组 public UserDeckData lastWinDeck; public string[] rewards; public string[] avatars; @@ -342,6 +342,7 @@ namespace TcgEngine { public string tid; public string title; + public string cover; public UserCardData hero; public UserCardData[] cards; @@ -367,6 +368,16 @@ namespace TcgEngine } } + public Sprite GetCardCover() + { + if (!string.IsNullOrEmpty(cover)) + { + CardCoverData cardCover = CardCoverData.Get(cover); + return cardCover.GetCardCover(); + } + return null; + } + public int GetQuantity() { int count = 0; diff --git a/Assets/TcgEngine/Scripts/Data/CardCoverData.cs b/Assets/TcgEngine/Scripts/Data/CardCoverData.cs new file mode 100644 index 0000000..cb69cc7 --- /dev/null +++ b/Assets/TcgEngine/Scripts/Data/CardCoverData.cs @@ -0,0 +1,58 @@ +using System.Collections.Generic; +using UnityEngine; + +namespace TcgEngine +{ + [CreateAssetMenu(fileName = "CardCover", menuName = "TcgEngine/CardCover", order = 10)] + public class CardCoverData : ScriptableObject + { + public string id; + public string name; + public string cardCoverPath; + + private static List _cardCoverList = new List(); + + public static void Load(string folder = "") + { + if (_cardCoverList.Count==0) + _cardCoverList.AddRange(Resources.LoadAll(folder)); + } + + public Sprite GetCardCover() + { + if (_cardCoverList.Count == 0) + Load(); + + if (!string.IsNullOrEmpty(cardCoverPath)) + { + Sprite dynamicSprite = SpriteLoader.Get()?.LoadSprite(cardCoverPath); + if (dynamicSprite != null) + return dynamicSprite; + } + else + { + Debug.LogWarning("卡组封面地址为空！"); + } + return null; + } + + public static CardCoverData Get(string id) + { + foreach (CardCoverData cardCover in GetAll()) + { + if (cardCover.id == id) + { + return cardCover; + } + } + + return null; + } + + public static List GetAll() + { + return _cardCoverList; + } + + } +} diff --git a/Assets/TcgEngine/Scripts/Data/CardCoverData.cs.meta b/Assets/TcgEngine/Scripts/Data/CardCoverData.cs.meta new file mode 100644 index 0000000..7a10f2b --- /dev/null +++ b/Assets/TcgEngine/Scripts/Data/CardCoverData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: fc3f18e9386843beb552310c5c14f280 +timeCreated: 1759135868 \ No newline at end of file diff --git a/Assets/TcgEngine/Scripts/Data/CardData.cs b/Assets/TcgEngine/Scripts/Data/CardData.cs index 838d8b1..cc0df80 100644 --- a/Assets/TcgEngine/Scripts/Data/CardData.cs +++ b/Assets/TcgEngine/Scripts/Data/CardData.cs @@ -52,6 +52,7 @@ namespace TcgEngine public int mana; public int attack; public int hp; + public bool isOnline = true;// 判断排序和可点击性 [Header("Traits")] public TraitData[] traits; diff --git a/Assets/TcgEngine/Scripts/Data/DataLoader.cs b/Assets/TcgEngine/Scripts/Data/DataLoader.cs index c691ab9..24fe9f7 100644 --- a/Assets/TcgEngine/Scripts/Data/DataLoader.cs +++ b/Assets/TcgEngine/Scripts/Data/DataLoader.cs @@ -44,9 +44,13 @@ namespace TcgEngine AvatarData.Load(); CardbackData.Load(); RewardData.Load(); - + + Debug.Log("[拦截] 目前卡: " + DeckData.GetAll().Count); Debug.Log("[拦截] 目前卡牌数量: " + CardData.GetAll().Count); + Debug.Log("[拦截] PackData 数量: " + PackData.GetAll().Count); + foreach (var p in PackData.GetAll()) Debug.Log(p.id); + CheckCardData(); CheckAbilityData(); CheckDeckData(); diff --git a/Assets/TcgEngine/Scripts/Menu/CardZoomPanel.cs b/Assets/TcgEngine/Scripts/Menu/CardZoomPanel.cs index 3ea8534..5662c33 100644 --- a/Assets/TcgEngine/Scripts/Menu/CardZoomPanel.cs +++ b/Assets/TcgEngine/Scripts/Menu/CardZoomPanel.cs @@ -114,6 +114,7 @@ namespace TcgEngine.UI string url = ApiClient.ServerURL + "/users/cards/buy/"; string jdata = ApiTool.ToJson(req); + Debug.Log(jdata); trade_error.text = ""; WebResponse res = await ApiClient.Get().SendPostRequest(url, jdata); diff --git a/Assets/TcgEngine/Scripts/Menu/CollectionCard.cs b/Assets/TcgEngine/Scripts/Menu/CollectionCard.cs index 63263f8..4fa16ca 100644 --- a/Assets/TcgEngine/Scripts/Menu/CollectionCard.cs +++ b/Assets/TcgEngine/Scripts/Menu/CollectionCard.cs @@ -25,8 +25,11 @@ namespace TcgEngine.UI private void Start() { - card_ui.onClick += onClick; - card_ui.onClickRight += onClickRight; + if (card_ui.GetCard().isOnline) + { + card_ui.onClick += onClick; + card_ui.onClickRight += onClickRight; + } } public void SetCard(CardData card, VariantData variant, int quantity) diff --git a/Assets/TcgEngine/Scripts/Menu/CollectionPanel.cs b/Assets/TcgEngine/Scripts/Menu/CollectionPanel.cs index bf68907..2f155d4 100644 --- a/Assets/TcgEngine/Scripts/Menu/CollectionPanel.cs +++ b/Assets/TcgEngine/Scripts/Menu/CollectionPanel.cs @@ -53,7 +53,7 @@ namespace TcgEngine.UI public IconButton[] hero_powers; private TeamData filter_team = null; - private int filter_dropdown = 0; + public int filter_dropdown = 0; private string filter_search = ""; private List card_list = new List(); @@ -112,6 +112,10 @@ namespace TcgEngine.UI hover.text += " Mana: " + iability.mana_cost + ""; } } + if (!spawned) + { + SpawnCards(); + } } protected override void Update() @@ -157,6 +161,7 @@ namespace TcgEngine.UI dCard.SetCard(card, variant, 0); dCard.onClick += OnClickCard; dCard.onClickRight += OnClickCardRight; + all_list.Add(dCard); nCard.SetActive(false); } diff --git a/Assets/TcgEngine/Scripts/Menu/DeckLine.cs b/Assets/TcgEngine/Scripts/Menu/DeckLine.cs index 4000133..8ca47f6 100644 --- a/Assets/TcgEngine/Scripts/Menu/DeckLine.cs +++ b/Assets/TcgEngine/Scripts/Menu/DeckLine.cs @@ -73,7 +73,7 @@ namespace TcgEngine.UI if (image != null) { - image.sprite = card.GetFullArt(variant); + image.sprite = card.GetHorizontalArt(); image.enabled = true; image.material = invalid ? disabled_mat : default_mat; } diff --git a/Assets/TcgEngine/Scripts/Tools/CardUploader.cs b/Assets/TcgEngine/Scripts/Tools/CardUploader.cs index dc25df2..4a71d43 100644 --- a/Assets/TcgEngine/Scripts/Tools/CardUploader.cs +++ b/Assets/TcgEngine/Scripts/Tools/CardUploader.cs @@ -88,6 +88,12 @@ namespace TcgEngine UploadCardList(list); await TimeTool.Delay(200); } + + foreach (CardData item in cards) + { + UploadCard(item); + ShowText( "卡牌:" + item.title); + } } //Variants @@ -246,6 +252,7 @@ namespace TcgEngine for (int i = 0; i < req.packs.Length; i++) { req.packs[i] = card.packs[i].id; + ShowText(+ i + "ID:" + req.tid); } string url = ApiClient.ServerURL + "/cards/add";