diff --git a/Assets/TcgEngine/Prefabs/Gameplay/BoardDeck.prefab b/Assets/TcgEngine/Prefabs/Gameplay/BoardDeck.prefab index 4d93d13..8f7309a 100644 --- a/Assets/TcgEngine/Prefabs/Gameplay/BoardDeck.prefab +++ b/Assets/TcgEngine/Prefabs/Gameplay/BoardDeck.prefab @@ -29,6 +29,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: 5621716279701640646} m_RootOrder: 2 @@ -120,9 +121,10 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5621716278606480177} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 7.58, y: -1, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5621716279381743939} - {fileID: 5621716279701640646} @@ -140,7 +142,7 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.5, y: 1.5, z: 0.2} + m_Size: {x: 2.8, y: 2.6, z: 0.2} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &5621716278606480178 MonoBehaviour: @@ -185,7 +187,8 @@ Transform: m_GameObject: {fileID: 5621716279381743936} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 5621716278606480176} m_RootOrder: 0 @@ -201,6 +204,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -230,12 +234,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: 23ce0a1828f761845b5505cf96d99463, type: 3} + m_Sprite: {fileID: 21300000, guid: 914b0a0772168ea44bbc6dbdd8640588, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 3.4, y: 8.6} + m_Size: {x: 1.92, y: 1.76} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -269,6 +273,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: 5621716279701640646} m_RootOrder: 1 @@ -344,6 +349,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: 5621716279701640646} m_RootOrder: 0 @@ -423,6 +429,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5621716279588866083} - {fileID: 5621716279400494292} @@ -433,8 +440,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 150} + m_AnchoredPosition: {x: -1.03, y: -0.0402} + m_SizeDelta: {x: 270.2936, y: 249.0147} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &5621716279701640643 Canvas: @@ -564,6 +571,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: 5621716279701640646} m_RootOrder: 3 diff --git a/Assets/TcgEngine/Prefabs/UI/ManaBar.prefab b/Assets/TcgEngine/Prefabs/UI/ManaBar.prefab index 02a1fe7..a88ce7a 100644 --- a/Assets/TcgEngine/Prefabs/UI/ManaBar.prefab +++ b/Assets/TcgEngine/Prefabs/UI/ManaBar.prefab @@ -1,5 +1,148 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &696383005654738547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7237580038607553900} + - component: {fileID: 4269309825207489344} + - component: {fileID: 7163901669548351928} + m_Layer: 5 + m_Name: ManaValue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7237580038607553900 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696383005654738547} + 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: 4252802152300486646} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4269309825207489344 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696383005654738547} + m_CullTransparentMesh: 1 +--- !u!114 &7163901669548351928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696383005654738547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 34 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 10/10 +--- !u!1 &715292708398136001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9125401619137482432} + - component: {fileID: 8479351009184604631} + m_Layer: 5 + m_Name: mana_magic_slot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9125401619137482432 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715292708398136001} + 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: 1789197561201869425} + m_RootOrder: 2 + 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: 53.2, y: 2.305} + m_SizeDelta: {x: 473.93, y: 45.39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8479351009184604631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715292708398136001} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &837668356876754076 GameObject: m_ObjectHideFlags: 0 @@ -29,14 +172,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7237580038607553900} m_Father: {fileID: 1789197561201869425} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -200, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: -258.3, y: 0.0000025332} + m_SizeDelta: {x: 122.35, y: 40.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2779207319221291161 CanvasRenderer: @@ -66,7 +210,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 74cc1786d4cd2fc44865297475ce72b1, type: 3} + m_Sprite: {fileID: 21300000, guid: 5b42e715327d1b94f87939f55c541744, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -76,6 +220,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1002928476299922204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1313572327666918543} + - component: {fileID: 6670290129275773677} + - component: {fileID: 8053292481829511539} + m_Layer: 5 + m_Name: ManaBarBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1313572327666918543 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002928476299922204} + 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: 1789197561201869425} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 336.62, y: -4.8} + m_SizeDelta: {x: 673.24, y: 73.51} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6670290129275773677 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002928476299922204} + m_CullTransparentMesh: 1 +--- !u!114 &8053292481829511539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002928476299922204} + 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: f825fc548550ed14e9d0af715f400ac0, type: 3} + m_Type: 1 + 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!1 &1806244588100620830 GameObject: m_ObjectHideFlags: 0 @@ -105,14 +325,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1313572327666918543} - {fileID: 4252802152300486646} + - {fileID: 9125401619137482432} m_Father: {fileID: 0} 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: -721.4, y: -506} - m_SizeDelta: {x: 450, y: 50} + m_AnchoredPosition: {x: -612.87305, y: -493.68274} + m_SizeDelta: {x: 667.054, y: 59.5899} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3188539720586938462 MonoBehaviour: @@ -130,7 +352,6 @@ MonoBehaviour: max_value: 10 auto_refresh: 1 icons: - - {fileID: 1601931411152116145} - {fileID: 0} - {fileID: 0} - {fileID: 0} @@ -141,8 +362,10 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} - {fileID: 0} - - {fileID: 0} - sprite_full: {fileID: 21300000, guid: 2b8a2aed9882e774bba6723260f7a6fc, type: 3} - sprite_empty: {fileID: 21300000, guid: 74cc1786d4cd2fc44865297475ce72b1, type: 3} - value_text: {fileID: 0} + mana_icon_true: {fileID: 21300000, guid: 07382087d0a14d44f8c64068a19fca58, type: 3} + mana_icon_false: {fileID: 21300000, guid: 6b5eb5ce052ad0c4bbdfcf41b7786bc2, type: 3} + mana_gem: {fileID: 7003042636269835821, guid: 27674e2c34a45db4999e66bbb9a8bff0, + type: 3} + mana_magic_slot: {fileID: 9125401619137482432} + value_text: {fileID: 7163901669548351928} value_format: '{0}' diff --git a/Assets/TcgEngine/Prefabs/UI/ManaGem.prefab b/Assets/TcgEngine/Prefabs/UI/ManaGem.prefab new file mode 100644 index 0000000..2deecaa --- /dev/null +++ b/Assets/TcgEngine/Prefabs/UI/ManaGem.prefab @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7003042636269835821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4971172428471940912} + - component: {fileID: 1280904730495396501} + - component: {fileID: 8645580289619916484} + m_Layer: 5 + m_Name: ManaGem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4971172428471940912 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7003042636269835821} + 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: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1280904730495396501 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7003042636269835821} + m_CullTransparentMesh: 1 +--- !u!114 &8645580289619916484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7003042636269835821} + 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: 07382087d0a14d44f8c64068a19fca58, 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 diff --git a/Assets/TcgEngine/Prefabs/UI/ManaGem.prefab.meta b/Assets/TcgEngine/Prefabs/UI/ManaGem.prefab.meta new file mode 100644 index 0000000..e4a64dd --- /dev/null +++ b/Assets/TcgEngine/Prefabs/UI/ManaGem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 27674e2c34a45db4999e66bbb9a8bff0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Scenes/Game/Game.unity b/Assets/TcgEngine/Scenes/Game/Game.unity index 3bdd3dd..ab4f36f 100644 --- a/Assets/TcgEngine/Scenes/Game/Game.unity +++ b/Assets/TcgEngine/Scenes/Game/Game.unity @@ -711,12 +711,12 @@ PrefabInstance: - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 669.25 objectReference: {fileID: 0} - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 64.98 objectReference: {fileID: 0} - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} @@ -756,12 +756,12 @@ PrefabInstance: - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 94 objectReference: {fileID: 0} - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 105 objectReference: {fileID: 0} - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} @@ -783,6 +783,31 @@ PrefabInstance: propertyPath: m_Name value: ManaBar objectReference: {fileID: 0} + - target: {fileID: 1963551852143253988, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963551852143253988, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963551852143253988, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963551852143253988, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: icons.Array.size + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} --- !u!224 &599664747 stripped @@ -791,6 +816,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 599664746} m_PrefabAsset: {fileID: 0} +--- !u!114 &599664748 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + m_PrefabInstance: {fileID: 599664746} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf1498eac12d8c14e98918e5ac2baf2c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &629549709 PrefabInstance: m_ObjectHideFlags: 0 @@ -1003,6 +1040,24 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &719182404 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + m_PrefabInstance: {fileID: 1381553796} + m_PrefabAsset: {fileID: 0} +--- !u!114 &719182405 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3188539720586938462, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + m_PrefabInstance: {fileID: 1381553796} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf1498eac12d8c14e98918e5ac2baf2c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &760249802 PrefabInstance: m_ObjectHideFlags: 0 @@ -1128,131 +1183,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 760249802} m_PrefabAsset: {fileID: 0} ---- !u!1001 &791413700 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1423002456186907592} - m_Modifications: - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1806244588100620830, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - propertyPath: m_Name - value: ManaBar - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} ---- !u!224 &791413701 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, - type: 3} - m_PrefabInstance: {fileID: 791413700} - m_PrefabAsset: {fileID: 0} --- !u!1001 &839364591 PrefabInstance: m_ObjectHideFlags: 0 @@ -1615,6 +1545,32 @@ PrefabInstance: propertyPath: m_Name value: BoardDeck (1) objectReference: {fileID: 0} + - target: {fileID: 5621716278606480178, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: opponent + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5621716279381743938, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_Size.x + value: 1.92 + objectReference: {fileID: 0} + - target: {fileID: 5621716279381743938, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_Size.y + value: 1.76 + objectReference: {fileID: 0} + - target: {fileID: 5621716279381743938, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 914b0a0772168ea44bbc6dbdd8640588, + type: 3} + - target: {fileID: 5621716279381743938, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 310f492c3e6afc24b9cb0f4f467ec27d, type: 3} --- !u!4 &1156614219 stripped @@ -1798,6 +1754,125 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1307629563} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1381553796 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1423002456186907592} + m_Modifications: + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_SizeDelta.x + value: 667.054 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_SizeDelta.y + value: 59.5899 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -101.89 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -106 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1789197561201869425, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1806244588100620830, guid: c0560a244fe3e0f4ca2ea65c54093d1c, + type: 3} + propertyPath: m_Name + value: ManaBar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0560a244fe3e0f4ca2ea65c54093d1c, type: 3} --- !u!1001 &1475694346 PrefabInstance: m_ObjectHideFlags: 0 @@ -6545,6 +6620,8 @@ MonoBehaviour: end_turn_button: {fileID: 4201586067522883778} timeout_animator: {fileID: 1518244282451244695} timeout_audio: {fileID: 0} + player_prompt_text: {fileID: 1014071804920449871} + opponent_prompt_text: {fileID: 274638598} --- !u!222 &1375480012144160000 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6698,7 +6775,7 @@ RectTransform: - {fileID: 5116160367503992191} - {fileID: 542427985331174769} - {fileID: 274638600} - - {fileID: 791413701} + - {fileID: 719182404} m_Father: {fileID: 3763743434186710458} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -18206,31 +18283,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1892906616} m_Modifications: - - target: {fileID: 5621716278257251354, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_LocalScale.x - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_LocalScale.y - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_LocalScale.z - value: 0.7 - objectReference: {fileID: 0} - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, type: 3} propertyPath: m_LocalPosition.x @@ -18281,112 +18338,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5621716278606480177, guid: 310f492c3e6afc24b9cb0f4f467ec27d, type: 3} propertyPath: m_Name value: BoardDeck objectReference: {fileID: 0} - - target: {fileID: 5621716278606480178, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: opponent - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5621716278606480179, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_Size.x - value: 2.8 - objectReference: {fileID: 0} - - target: {fileID: 5621716278606480179, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_Size.y - value: 2.6 - objectReference: {fileID: 0} - - target: {fileID: 5621716279381743938, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_Size.x - value: 1.92 - objectReference: {fileID: 0} - - target: {fileID: 5621716279381743938, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_Size.y - value: 1.76 - objectReference: {fileID: 0} - - target: {fileID: 5621716279381743938, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 914b0a0772168ea44bbc6dbdd8640588, - type: 3} - - target: {fileID: 5621716279381743938, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5621716279381743939, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_LocalScale.x - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 5621716279381743939, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 5621716279381743939, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_LocalScale.z - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 5621716279381743939, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5621716279381743939, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5621716279400494293, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5621716279588866080, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5621716279701640646, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_SizeDelta.x - value: 270.2936 - objectReference: {fileID: 0} - - target: {fileID: 5621716279701640646, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_SizeDelta.y - value: 249.0147 - objectReference: {fileID: 0} - - target: {fileID: 5621716279701640646, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -1.03 - objectReference: {fileID: 0} - - target: {fileID: 5621716279701640646, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.0402 - objectReference: {fileID: 0} - - target: {fileID: 5621716279996141062, guid: 310f492c3e6afc24b9cb0f4f467ec27d, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 310f492c3e6afc24b9cb0f4f467ec27d, type: 3} --- !u!114 &5626139744338325029 @@ -23383,7 +23339,7 @@ MonoBehaviour: is_opponent: 1 pname: {fileID: 8910794351160122199} avatar: {fileID: 6598602421798066154} - mana_bar: {fileID: 0} + mana_bar: {fileID: 719182405} hp_txt: {fileID: 2939088998120593464} hp_max_txt: {fileID: 6463041976108408170} secrets: @@ -28872,7 +28828,7 @@ MonoBehaviour: is_opponent: 0 pname: {fileID: 5039050087490005747} avatar: {fileID: 5931035347307129765} - mana_bar: {fileID: 0} + mana_bar: {fileID: 599664748} hp_txt: {fileID: 2949388926519243547} hp_max_txt: {fileID: 3106629797317188641} secrets: diff --git a/Assets/TcgEngine/Scripts/GameClient/BoardDeck.cs b/Assets/TcgEngine/Scripts/GameClient/BoardDeck.cs index 7e0da75..9d1c1cb 100644 --- a/Assets/TcgEngine/Scripts/GameClient/BoardDeck.cs +++ b/Assets/TcgEngine/Scripts/GameClient/BoardDeck.cs @@ -1,4 +1,4 @@ -using System.Collections; + using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; @@ -42,7 +42,7 @@ namespace TcgEngine.Client Player player = opponent ? GameClient.Get().GetOpponentPlayer() : GameClient.Get().GetPlayer(); if (player == null) return; - + // 获取卡背数据,如果为空则使用默认路径 CardbackData cb = CardbackData.Get(player.cardback); if (deck_render != null) @@ -50,6 +50,7 @@ namespace TcgEngine.Client if (cb != null) { deck_render.sprite = cb.GetDeck(); + deck_render.gameObject.transform.localScale = Vector3.one * 0.5f; } else { diff --git a/Assets/TcgEngine/Scripts/UI/GameUI.cs b/Assets/TcgEngine/Scripts/UI/GameUI.cs index 4463355..8148775 100644 --- a/Assets/TcgEngine/Scripts/UI/GameUI.cs +++ b/Assets/TcgEngine/Scripts/UI/GameUI.cs @@ -27,6 +27,9 @@ namespace TcgEngine.UI public Animator timeout_animator; public AudioClip timeout_audio; + public Text player_prompt_text; + public Text opponent_prompt_text; + private float selector_timer = 0f; private float end_turn_timer = 0f; private int prev_time_val = 0; @@ -76,7 +79,12 @@ namespace TcgEngine.UI end_turn_button.interactable = yourturn && end_turn_timer > 1f; end_turn_timer += Time.deltaTime; selector_timer += Time.deltaTime; - + + // 提示玩家 + player_prompt_text.text = yourturn ? "正在行动" : "正在等待"; + opponent_prompt_text.text = yourturn ? "正在等待" : "正在行动"; + + //Timer turn_count.text = "回合 " + data.turn_count.ToString(); turn_timer.enabled = data.turn_timer > 0f; diff --git a/Assets/TcgEngine/Scripts/UI/IconBar.cs b/Assets/TcgEngine/Scripts/UI/IconBar.cs index f60c0bd..2e9ff70 100644 --- a/Assets/TcgEngine/Scripts/UI/IconBar.cs +++ b/Assets/TcgEngine/Scripts/UI/IconBar.cs @@ -1,5 +1,7 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; +using Unity.VisualScripting; using UnityEngine; using UnityEngine.UI; @@ -13,12 +15,14 @@ namespace TcgEngine.UI public class IconBar : MonoBehaviour { public int value = 0; - public int max_value = 4; + public int max_value = 10; public bool auto_refresh = true; - public Image[] icons; - public Sprite sprite_full; - public Sprite sprite_empty; + public List icons; + public Sprite mana_icon_true; + public Sprite mana_icon_false; + public GameObject mana_gem; + public Transform mana_magic_slot; [Header("Value Display")] public Text value_text; // 显示当前法力值数字的文本组件 @@ -26,7 +30,24 @@ namespace TcgEngine.UI void Awake() { + + } + private void Start() + { + InitManaData(); + } + + private void InitManaData() + { + icons.Clear(); + for (int i = 0; i < max_value; i++) + { + GameObject item = Instantiate(mana_gem, mana_magic_slot); + item.name = $"mana--{i}"; + var img = item.GetComponent(); + icons.Add(img); + } } void Update() @@ -39,16 +60,14 @@ namespace TcgEngine.UI { if (icons == null) return; - - int index = 0; - foreach (Image icon in icons) + + for (int i = 0; i < icons.Count; i++) { - if (icon == null) + if (icons[i] == null) continue; - - icon.gameObject.SetActive(index < value || index < max_value); - icon.sprite = (index < value) ? sprite_full : sprite_empty; - index++; + + // 前 value 个点亮,后面的变灰 + icons[i].sprite = (i < value) ? mana_icon_true : mana_icon_false; } // 更新法力值数字文本 @@ -59,26 +78,7 @@ namespace TcgEngine.UI { if (value_text != null) { - value_text.text = string.Format(value_format, value); - } - } - - // 手动设置值并更新文本 - public void SetValue(int new_value) - { - value = new_value; - UpdateValueText(); - } - - public void SetMat(Material mat) - { - if (icons == null) - return; - - foreach (Image icon in icons) - { - if (icon != null) - icon.material = mat; + value_text.text = string.Format(value_format, value + "/10"); } } } diff --git a/Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/法力槽.png b/Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/magic_slot.png similarity index 100% rename from Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/法力槽.png rename to Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/magic_slot.png diff --git a/Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/法力槽.png.meta b/Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/magic_slot.png.meta similarity index 100% rename from Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/法力槽.png.meta rename to Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/magic_slot.png.meta diff --git a/Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/Mana_Icon.png b/Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/mana_icon_true.png similarity index 100% rename from Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/Mana_Icon.png rename to Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/mana_icon_true.png diff --git a/Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/Mana_Icon.png.meta b/Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/mana_icon_true.png.meta similarity index 100% rename from Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/Mana_Icon.png.meta rename to Assets/TcgEngine/Sprites/UI/BattleChessboard/Skill/mana_icon_true.png.meta diff --git a/Assets/TcgEngine/Sprites/UI/mana_empty.png b/Assets/TcgEngine/Sprites/UI/mana_empty.png deleted file mode 100644 index 965961d..0000000 Binary files a/Assets/TcgEngine/Sprites/UI/mana_empty.png and /dev/null differ diff --git a/Assets/TcgEngine/Sprites/UI/mana_empty.png.meta b/Assets/TcgEngine/Sprites/UI/mana_empty.png.meta deleted file mode 100644 index ce2c201..0000000 --- a/Assets/TcgEngine/Sprites/UI/mana_empty.png.meta +++ /dev/null @@ -1,171 +0,0 @@ -fileFormatVersion: 2 -guid: 74cc1786d4cd2fc44865297475ce72b1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 1 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TcgEngine/Sprites/UI/mana_full.png b/Assets/TcgEngine/Sprites/UI/mana_full.png deleted file mode 100644 index 0ae4184..0000000 Binary files a/Assets/TcgEngine/Sprites/UI/mana_full.png and /dev/null differ diff --git a/Assets/TcgEngine/Sprites/UI/mana_full.png.meta b/Assets/TcgEngine/Sprites/UI/mana_full.png.meta deleted file mode 100644 index af1cd6a..0000000 --- a/Assets/TcgEngine/Sprites/UI/mana_full.png.meta +++ /dev/null @@ -1,171 +0,0 @@ -fileFormatVersion: 2 -guid: 2b8a2aed9882e774bba6723260f7a6fc -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 1 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TcgEngine/Sprites/UI/menu.png b/Assets/TcgEngine/Sprites/UI/menu.png index d4df920..5e695bf 100644 Binary files a/Assets/TcgEngine/Sprites/UI/menu.png and b/Assets/TcgEngine/Sprites/UI/menu.png differ