diff --git a/Assets/TcgEngine/Resources/Decks/fire_deck.asset b/Assets/TcgEngine/Resources/Decks/fire_deck.asset index e173394..0b7bdf7 100644 --- a/Assets/TcgEngine/Resources/Decks/fire_deck.asset +++ b/Assets/TcgEngine/Resources/Decks/fire_deck.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: fire_deck m_EditorClassIdentifier: id: fire_deck - title: Fire Starter + title: 火焰 hero: {fileID: 11400000, guid: cf170aea7ffb041428f37608f1561058, type: 2} cards: - {fileID: 11400000, guid: 99081d84b6aa6264aa1c68c6defbe31d, type: 2} @@ -24,15 +24,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 90322744d448d6a46b8c2361a222d9a6, type: 2} - {fileID: 11400000, guid: 90322744d448d6a46b8c2361a222d9a6, type: 2} - {fileID: 11400000, guid: faacda797c4448a4bbbcbca76c6fefc0, type: 2} - - {fileID: 11400000, guid: 83692bb780503404b92feed04c7d222b, type: 2} - - {fileID: 11400000, guid: 58f3c5b170fe7824aa33bd4875e07f3a, type: 2} - - {fileID: 11400000, guid: 900d0aa6de59c1349ab5c08a481c2a38, type: 2} - - {fileID: 11400000, guid: 979b326ecf73d0a4791dc37a6f13c24a, type: 2} - - {fileID: 11400000, guid: 91a80a84e1f0cd94fac96f44bc2ff142, type: 2} - - {fileID: 11400000, guid: 879711e9fc6210b42a2bc43c0f595222, type: 2} - - {fileID: 11400000, guid: 879711e9fc6210b42a2bc43c0f595222, type: 2} - - {fileID: 11400000, guid: 153048657a8ea4448951d15c53a7f07e, type: 2} - - {fileID: 11400000, guid: 153048657a8ea4448951d15c53a7f07e, type: 2} - - {fileID: 11400000, guid: 3e430dc2bad4fe049acd2584de26eaad, type: 2} - - {fileID: 11400000, guid: 836b91f8ff0e85742ac0bea1bc45f60d, type: 2} - - {fileID: 11400000, guid: 3660f3745defa054392beb41affc32fb, type: 2} diff --git a/Assets/TcgEngine/Resources/Decks/forest_deck.asset b/Assets/TcgEngine/Resources/Decks/forest_deck.asset index 0833490..4a3b09d 100644 --- a/Assets/TcgEngine/Resources/Decks/forest_deck.asset +++ b/Assets/TcgEngine/Resources/Decks/forest_deck.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: forest_deck m_EditorClassIdentifier: id: forest_deck - title: Forest Starter + title: 森林 hero: {fileID: 11400000, guid: 04fd0777e8f567b48ad05e6bdaf97c1d, type: 2} cards: - {fileID: 11400000, guid: 1e22d4647e903814d96f63a729e1f820, type: 2} @@ -24,15 +24,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 4a0f93237a2ae53468e29927c1b7c1ec, type: 2} - {fileID: 11400000, guid: 2302f11d23015254dbb067255d70e738, type: 2} - {fileID: 11400000, guid: 4fc52d01f2883134ea1e6ea0d9ba82f2, type: 2} - - {fileID: 11400000, guid: 685188cde95b4274c9d959f68adc1bcd, 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: 2ee7b7313b6d8154c8a1a3d2dc1c301d, type: 2} - - {fileID: 11400000, guid: 2ee7b7313b6d8154c8a1a3d2dc1c301d, type: 2} - - {fileID: 11400000, guid: 1cec19f2b6532b246a5ed43c9ea966d1, type: 2} - - {fileID: 11400000, guid: 1cec19f2b6532b246a5ed43c9ea966d1, type: 2} - - {fileID: 11400000, guid: b28109cb7acac0c4e86d8b3d88ef6dad, type: 2} - - {fileID: 11400000, guid: 149beb7f3fda56b40b84ddbb0917e0bf, type: 2} - - {fileID: 11400000, guid: d564bc13a3f2c2a459cfe492217d8d98, type: 2} diff --git a/Assets/TcgEngine/Resources/Decks/water_deck.asset b/Assets/TcgEngine/Resources/Decks/water_deck.asset index 1ed9d1f..d8de949 100644 --- a/Assets/TcgEngine/Resources/Decks/water_deck.asset +++ b/Assets/TcgEngine/Resources/Decks/water_deck.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: water_deck m_EditorClassIdentifier: id: water_deck - title: Water Starter + title: 臻冰 hero: {fileID: 11400000, guid: 111d60b13ae137f4597da2789d94ecce, type: 2} cards: - {fileID: 11400000, guid: 89f3d73097f233148896600d94d482c0, type: 2} @@ -24,15 +24,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 7522cb2b475fdca45aae97664d79e53c, type: 2} - {fileID: 11400000, guid: fced434c254f6a94e8377864595757c8, type: 2} - {fileID: 11400000, guid: fced434c254f6a94e8377864595757c8, type: 2} - - {fileID: 11400000, guid: b8b898ed060dea74794804ef9ac44b74, type: 2} - - {fileID: 11400000, guid: eb0010106a7f2a947a777580a7d9ce5d, type: 2} - - {fileID: 11400000, guid: ee0eb5f42cd646d4c92cc5bae97f8512, type: 2} - - {fileID: 11400000, guid: 74ffbe8087a7ec64696352b9013d5d21, type: 2} - - {fileID: 11400000, guid: c7c9d74d8c13e9a4b8407a0ca889b702, type: 2} - - {fileID: 11400000, guid: 0bf6205b77bb00e438451a6deb075060, type: 2} - - {fileID: 11400000, guid: 0bf6205b77bb00e438451a6deb075060, type: 2} - - {fileID: 11400000, guid: 31ca3a05927d28943babbf36b93e9a90, type: 2} - - {fileID: 11400000, guid: b492fe697d5348c498fac4bffae6c98b, type: 2} - - {fileID: 11400000, guid: b492fe697d5348c498fac4bffae6c98b, type: 2} - - {fileID: 11400000, guid: 6d25f87d5e8912e4aae6b2e8cdb51378, type: 2} - - {fileID: 11400000, guid: fd274eafa2afb8a47bdb49654df58d11, type: 2} diff --git a/Assets/TcgEngine/Resources/GameplayData.asset b/Assets/TcgEngine/Resources/GameplayData.asset index ffeb15f..c569501 100644 --- a/Assets/TcgEngine/Resources/GameplayData.asset +++ b/Assets/TcgEngine/Resources/GameplayData.asset @@ -12,17 +12,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 080ba8f3b7a08e34ba0648e5340f9bf4, type: 3} m_Name: GameplayData m_EditorClassIdentifier: - hp_start: 20 + hp_start: 999 mana_start: 2 mana_per_turn: 1 mana_max: 10 - cards_start: 5 + # 初始化手牌数量 + cards_start: 3 cards_per_turn: 1 cards_max: 10 turn_duration: 60 second_bonus: {fileID: 11400000, guid: 9503f60659f1df04eb3dd7fa925885fb, type: 2} mulligan: 1 - deck_size: 20 + deck_size: 8 deck_duplicate_max: 2 sell_ratio: 0.8 ai_type: 10 diff --git a/Assets/TcgEngine/Scenes/Menu/Menu.unity b/Assets/TcgEngine/Scenes/Menu/Menu.unity index b76ffbf..4492514 100644 --- a/Assets/TcgEngine/Scenes/Menu/Menu.unity +++ b/Assets/TcgEngine/Scenes/Menu/Menu.unity @@ -280,102 +280,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9300729} m_CullTransparentMesh: 0 ---- !u!1 &10310020 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 10310021} - - component: {fileID: 10310024} - - component: {fileID: 10310023} - - component: {fileID: 10310022} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &10310021 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 10310020} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 711426623} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -170, y: -103} - m_SizeDelta: {x: 204.23, y: 104.53} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &10310022 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 10310020} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 2, y: -2} - m_UseGraphicAlpha: 1 ---- !u!114 &10310023 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 10310020} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: c56d3a307af0c8d48ae7d1adb958c922, type: 3} - m_FontSize: 34 - 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: SOLO ---- !u!222 &10310024 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 10310020} - m_CullTransparentMesh: 1 --- !u!1 &15523032 GameObject: m_ObjectHideFlags: 0 @@ -651,7 +555,7 @@ RectTransform: - {fileID: 551187115} - {fileID: 117996127} m_Father: {fileID: 441085351} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1482,7 +1386,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: ADVENTURE + m_Text: "\u5192\u9669\u6A21\u5F0F" --- !u!222 &84982555 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2581,82 +2485,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 983565676500959008} m_PrefabAsset: {fileID: 0} ---- !u!1 &169025249 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 169025250} - - component: {fileID: 169025252} - - component: {fileID: 169025251} - m_Layer: 5 - m_Name: Bar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &169025250 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 169025249} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.00008, y: 1.00008, z: 1.00008} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 711426623} - m_RootOrder: 0 - 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.55, y: -93.53} - m_SizeDelta: {x: 531.07, y: 139.71} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &169025251 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 169025249} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.18867922, g: 0.18867922, b: 0.18867922, 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_Sprite: {fileID: 21300000, guid: 7a8dfe1843c6cc446800bc1f427da70d, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &169025252 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 169025249} - m_CullTransparentMesh: 1 --- !u!1 &207312627 GameObject: m_ObjectHideFlags: 0 @@ -3289,7 +3117,7 @@ RectTransform: - {fileID: 515092353} - {fileID: 992410216} m_Father: {fileID: 441085351} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5139,7 +4967,6 @@ RectTransform: - {fileID: 256520188} - {fileID: 1032189403} - {fileID: 1548237787} - - {fileID: 711426623} - {fileID: 570346880} - {fileID: 804137469} - {fileID: 52809984} @@ -6503,7 +6330,7 @@ RectTransform: - {fileID: 774281754} - {fileID: 1626650279} m_Father: {fileID: 441085351} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8486,141 +8313,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!1 &711426622 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 711426623} - - component: {fileID: 711426626} - - component: {fileID: 711426625} - - component: {fileID: 711426624} - m_Layer: 5 - m_Name: PlaySoloOld - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &711426623 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 711426622} - 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: - - {fileID: 169025250} - - {fileID: 10310021} - m_Father: {fileID: 441085351} - m_RootOrder: 6 - 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: -271, y: 86.13} - m_SizeDelta: {x: 549.93, y: 326.78} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &711426624 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 711426622} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.83396226, g: 0.83396226, b: 0.83396226, a: 1} - m_PressedColor: {r: 0.6226415, g: 0.6226415, b: 0.6226415, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 711426625} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2085134346} - m_TargetAssemblyTypeName: TcgEngine.UI.MainMenu, Assembly-CSharp - m_MethodName: OnClickSolo - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &711426625 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 711426622} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: fa7aa044f86b0f042a96680e87db4351, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &711426626 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 711426622} - m_CullTransparentMesh: 1 --- !u!1 &718259318 GameObject: m_ObjectHideFlags: 0 @@ -9952,7 +9644,7 @@ RectTransform: m_Children: - {fileID: 1804081854} m_Father: {fileID: 441085351} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -14094,7 +13786,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: DECK + m_Text: "\u724C\u7EC4" --- !u!222 &1038346212 CanvasRenderer: m_ObjectHideFlags: 0 @@ -21877,7 +21569,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: MULTIPLAYER + m_Text: "\u591A\u4EBA\u6A21\u5F0F" --- !u!222 &1626650282 CanvasRenderer: m_ObjectHideFlags: 0 @@ -23910,7 +23602,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: SOLO + m_Text: "\u5355\u4EBA\u6A21\u5F0F" --- !u!222 &1784353085 CanvasRenderer: m_ObjectHideFlags: 0 @@ -24006,7 +23698,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Play With Code + m_Text: "\u4F7F\u7528code\u8FD0\u884C" --- !u!222 &1804081856 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs b/Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs index ccc2d76..8460924 100644 --- a/Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs +++ b/Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs @@ -124,7 +124,7 @@ namespace TcgEngine.Gameplay player.mana_max = pdeck != null ? pdeck.start_mana : GameplayData.Get().mana_start; player.mana = player.mana_max; - //Draw starting cards + //Draw starting cards 开始抽卡 int dcards = pdeck != null ? pdeck.start_cards : GameplayData.Get().cards_start; DrawCard(player, dcards); @@ -339,7 +339,7 @@ namespace TcgEngine.Gameplay //--- Setup ------ - //Set deck using a Deck in Resources + //Set deck using a Deck in Resources 使用玩家卡组作为卡组 public virtual void SetPlayerDeck(Player player, DeckData deck) { player.cards_all.Clear(); @@ -364,7 +364,7 @@ namespace TcgEngine.Gameplay DeckPuzzleData puzzle = deck as DeckPuzzleData; - //Board cards + //Board cards 公共牌 if (puzzle != null) { foreach (DeckCardSlot card in puzzle.board_cards) @@ -700,6 +700,7 @@ namespace TcgEngine.Gameplay } } + //Draw card 抽卡 public virtual void DrawCard(Player player, int nb = 1) { for (int i = 0; i < nb; i++) diff --git a/Assets/TcgEngine/Scripts/Menu/CollectionPanel.cs b/Assets/TcgEngine/Scripts/Menu/CollectionPanel.cs index 50068d6..1a0d0fc 100644 --- a/Assets/TcgEngine/Scripts/Menu/CollectionPanel.cs +++ b/Assets/TcgEngine/Scripts/Menu/CollectionPanel.cs @@ -442,6 +442,7 @@ namespace TcgEngine.UI RefreshCardsQuantities(); } + // 刷新新手卡组 private void RefreshStarterDeck() { UserData udata = Authenticator.Get().UserData; @@ -517,8 +518,32 @@ namespace TcgEngine.UI return null; } + // 保存卡组 private void SaveDeck() { + // TODO 添加通知 + int totalCardCount = 0; + foreach (UserCardData card in deck_cards) + { + totalCardCount += card.quantity; + } + + Debug.Log("用户选择的卡牌总数量: " + totalCardCount); + Debug.Log("用户选择的卡牌种类数量: " + deck_cards.Count); + + if (totalCardCount == 0) + { + Debug.Log("卡组为空,无法保存"); + return; + } + + if (totalCardCount != GameplayData.Get().deck_size) + { + Debug.Log("卡组数量错误,无法保存。当前总数: " + totalCardCount + ", 需要: " + GameplayData.Get().deck_size); + return; + } + + UserData udata = Authenticator.Get().UserData; UserDeckData udeck = new UserDeckData(); udeck.tid = current_deck_tid; diff --git a/Assets/TcgEngine/Scripts/Menu/PackPanel.cs b/Assets/TcgEngine/Scripts/Menu/PackPanel.cs index f5d0a14..c32aef0 100644 --- a/Assets/TcgEngine/Scripts/Menu/PackPanel.cs +++ b/Assets/TcgEngine/Scripts/Menu/PackPanel.cs @@ -75,6 +75,7 @@ namespace TcgEngine.UI } } + // 刷新新手卡组 private void RefreshStarterDeck() { UserData udata = Authenticator.Get().UserData; diff --git a/Assets/TcgEngine/Scripts/Menu/SoloPanel.cs b/Assets/TcgEngine/Scripts/Menu/SoloPanel.cs index cfa2d07..4c64b2b 100644 --- a/Assets/TcgEngine/Scripts/Menu/SoloPanel.cs +++ b/Assets/TcgEngine/Scripts/Menu/SoloPanel.cs @@ -77,6 +77,7 @@ namespace TcgEngine.UI GameClient.ai_settings.ai_level = GameplayData.Get().ai_level; GameClient.game_settings.scene = GameplayData.Get().GetRandomArena(); + // solo 休闲模式 MainMenu.Get().StartGame(GameType.Solo, GameMode.Casual); }