diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01.prefab index 52b153ff..c0a7a21a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01.prefab @@ -802,8 +802,8 @@ GameObject: - component: {fileID: 7025343009472937813} - component: {fileID: 1131717685372222914} - component: {fileID: 5066967261904071208} - - component: {fileID: 8067268704048347736} - component: {fileID: 2967471168845626985} + - component: {fileID: 3576696822526328795} m_Layer: 5 m_Name: Card_v01 m_TagString: Card @@ -914,26 +914,6 @@ MonoBehaviour: layerMask: serializedVersion: 2 m_Bits: 64 ---- !u!114 &8067268704048347736 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3410471369990512392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!225 &2967471168845626985 CanvasGroup: m_ObjectHideFlags: 0 @@ -946,6 +926,18 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!114 &3576696822526328795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3410471369990512392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 523596fd7703bbe44a0c37d83fd5c880, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3523919461092501418 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 34cddd7f..162f82f9 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -471,156 +471,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 78419876} m_CullTransparentMesh: 1 ---- !u!1 &82673845 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 82673846} - - component: {fileID: 82673848} - - component: {fileID: 82673847} - m_Layer: 5 - m_Name: cardSlot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &82673846 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 82673845} - 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: 959299392} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &82673847 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 82673845} - 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.5471698, g: 0.5471698, b: 0.5471698, a: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!222 &82673848 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 82673845} - m_CullTransparentMesh: 1 ---- !u!1 &92053618 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 92053619} - - component: {fileID: 92053621} - - component: {fileID: 92053620} - m_Layer: 5 - m_Name: cardSlot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &92053619 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 92053618} - 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: 959299392} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &92053620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 92053618} - 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.5471698, g: 0.5471698, b: 0.5471698, a: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!222 &92053621 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 92053618} - m_CullTransparentMesh: 1 --- !u!1 &111044418 GameObject: m_ObjectHideFlags: 0 @@ -1276,18 +1126,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7802ce7c4f6fc7141b7afdfa53bd3155, type: 3} m_Name: m_EditorClassIdentifier: - cardSlotList: - - {fileID: 82673845} - - {fileID: 1139263002} - - {fileID: 92053618} - - {fileID: 1824824473} - - {fileID: 1320647294} - - {fileID: 1983891394} - - {fileID: 2132810046} - - {fileID: 1028226909} - - {fileID: 225360211} cardEntityList: [] - cardPanle: {fileID: 0} + cardPanle: {fileID: 959299391} maxHandCard: 0 --- !u!1 &172253751 GameObject: @@ -2019,81 +1859,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 223587224} m_CullTransparentMesh: 1 ---- !u!1 &225360211 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 225360212} - - component: {fileID: 225360214} - - component: {fileID: 225360213} - m_Layer: 5 - m_Name: cardSlot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &225360212 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 225360211} - 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: 959299392} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &225360213 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 225360211} - 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.5471698, g: 0.5471698, b: 0.5471698, a: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!222 &225360214 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 225360211} - m_CullTransparentMesh: 1 --- !u!1 &263387096 GameObject: m_ObjectHideFlags: 0 @@ -3479,6 +3244,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 959299392} + - {fileID: 563103080} m_Father: {fileID: 196188496} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -4029,6 +3795,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 560113992} m_CullTransparentMesh: 1 +--- !u!1 &563103079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 563103080} + m_Layer: 5 + m_Name: TargetPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &563103080 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563103079} + 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: 469385439} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -1825} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &573479786 GameObject: m_ObjectHideFlags: 0 @@ -6269,6 +6070,7 @@ GameObject: - component: {fileID: 959299395} - component: {fileID: 959299394} - component: {fileID: 959299393} + - component: {fileID: 959299396} m_Layer: 5 m_Name: CardPanel m_TagString: Untagged @@ -6285,25 +6087,16 @@ RectTransform: m_GameObject: {fileID: 959299391} 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: 82673846} - - {fileID: 1139263003} - - {fileID: 92053619} - - {fileID: 1824824474} - - {fileID: 1320647295} - - {fileID: 1983891395} - - {fileID: 2132810047} - - {fileID: 1028226910} - - {fileID: 225360212} + m_LocalScale: {x: 1.54, y: 1.54, z: 1.54} + m_ConstrainProportionsScale: 1 + m_Children: [] m_Father: {fileID: 469385439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 896.9509, y: 252.2434} - m_Pivot: {x: 0.5, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -436} + m_SizeDelta: {x: 1246.8, y: 252.24341} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &959299393 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6311,7 +6104,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 959299391} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} m_Name: @@ -6321,11 +6114,11 @@ MonoBehaviour: m_Right: 0 m_Top: 30 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 1 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 125, y: 200} - m_Spacing: {x: -35, y: 0} + m_Spacing: {x: 3, y: 0} m_Constraint: 0 m_ConstraintCount: 2 --- !u!114 &959299394 @@ -6341,10 +6134,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.16470589} - m_RaycastTarget: 1 + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -6366,6 +6159,58 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 959299391} m_CullTransparentMesh: 1 +--- !u!114 &959299396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 959299391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee54ee7c04561234fba83f722e4dfe0b, type: 3} + m_Name: + m_EditorClassIdentifier: + cardCount: 0 + targrtPoint: {fileID: 563103079} + radius: 1400 + angleIncrement: 5 + cardPointDataList: + - pivot: {x: 2.63, y: 10} + rotationZ: 6.95 + - pivot: {x: 1.95, y: 10} + rotationZ: 5.24 + - pivot: {x: 1.58, y: 10} + rotationZ: 3.55 + - pivot: {x: 1.18, y: 10} + rotationZ: 1.78 + - pivot: {x: 0.5, y: 10} + rotationZ: 0 + - pivot: {x: -1.16, y: 10} + rotationZ: -1.79 + - pivot: {x: -1.49, y: 10} + rotationZ: -3.43 + - pivot: {x: -1.92, y: 10} + rotationZ: -5.16 + - pivot: {x: -2.62, y: 10} + rotationZ: -6.86 + cardPointDataListEven: + - pivot: {x: 2.75, y: 10} + rotationZ: 5.69 + - pivot: {x: 2.3, y: 10} + rotationZ: 4.04 + - pivot: {x: 1.19, y: 10} + rotationZ: 2.24 + - pivot: {x: 0.03, y: 10} + rotationZ: 0.47 + - pivot: {x: -0.28, y: 10} + rotationZ: -1.25 + - pivot: {x: -0.89, y: 10} + rotationZ: -3.03 + - pivot: {x: -2.01, y: 10} + rotationZ: -4.79 + - pivot: {x: -2.56, y: 10} + rotationZ: -6.54 --- !u!1 &967334092 GameObject: m_ObjectHideFlags: 0 @@ -6732,7 +6577,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1025332260} m_CullTransparentMesh: 1 ---- !u!1 &1028226909 +--- !u!1 &1033873900 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6740,108 +6585,33 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1028226910} - - component: {fileID: 1028226912} - - component: {fileID: 1028226911} + - component: {fileID: 1033873901} m_Layer: 5 - m_Name: cardSlot + m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1028226910 +--- !u!224 &1033873901 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1028226909} + m_GameObject: {fileID: 1033873900} 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: 959299392} + m_Children: + - {fileID: 1515175092} + m_Father: {fileID: 129931012} 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1028226911 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1028226909} - 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.5471698, g: 0.5471698, b: 0.5471698, a: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!222 &1028226912 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1028226909} - m_CullTransparentMesh: 1 ---- !u!1 &1033873900 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1033873901} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1033873901 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1033873900} - 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: 1515175092} - m_Father: {fileID: 129931012} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 2.5, y: 0} - m_SizeDelta: {x: -5, y: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 2.5, y: 0} + m_SizeDelta: {x: -5, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1051341099 GameObject: @@ -7118,81 +6888,6 @@ Transform: m_Children: [] m_Father: {fileID: 952604643} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1139263002 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1139263003} - - component: {fileID: 1139263005} - - component: {fileID: 1139263004} - m_Layer: 5 - m_Name: cardSlot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1139263003 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1139263002} - 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: 959299392} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1139263004 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1139263002} - 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.5471698, g: 0.5471698, b: 0.5471698, a: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!222 &1139263005 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1139263002} - m_CullTransparentMesh: 1 --- !u!1 &1140853215 GameObject: m_ObjectHideFlags: 0 @@ -8602,81 +8297,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1304969850} m_CullTransparentMesh: 1 ---- !u!1 &1320647294 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1320647295} - - component: {fileID: 1320647297} - - component: {fileID: 1320647296} - m_Layer: 5 - m_Name: cardSlot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1320647295 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1320647294} - 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: 959299392} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1320647296 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1320647294} - 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.5471698, g: 0.5471698, b: 0.5471698, a: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!222 &1320647297 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1320647294} - m_CullTransparentMesh: 1 --- !u!1 &1322671365 GameObject: m_ObjectHideFlags: 0 @@ -11270,81 +10890,6 @@ Transform: - {fileID: 1285317928} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1824824473 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1824824474} - - component: {fileID: 1824824476} - - component: {fileID: 1824824475} - m_Layer: 5 - m_Name: cardSlot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1824824474 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1824824473} - 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: 959299392} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1824824475 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1824824473} - 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.5471698, g: 0.5471698, b: 0.5471698, a: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!222 &1824824476 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1824824473} - m_CullTransparentMesh: 1 --- !u!1 &1833978457 GameObject: m_ObjectHideFlags: 0 @@ -12074,81 +11619,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1978148439} m_CullTransparentMesh: 1 ---- !u!1 &1983891394 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1983891395} - - component: {fileID: 1983891397} - - component: {fileID: 1983891396} - m_Layer: 5 - m_Name: cardSlot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1983891395 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1983891394} - 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: 959299392} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1983891396 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1983891394} - 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.5471698, g: 0.5471698, b: 0.5471698, a: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!222 &1983891397 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1983891394} - m_CullTransparentMesh: 1 --- !u!1 &2012988517 GameObject: m_ObjectHideFlags: 0 @@ -12865,81 +12335,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2096369103} m_CullTransparentMesh: 1 ---- !u!1 &2132810046 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2132810047} - - component: {fileID: 2132810049} - - component: {fileID: 2132810048} - m_Layer: 5 - m_Name: cardSlot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2132810047 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2132810046} - 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: 959299392} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2132810048 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2132810046} - 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.5471698, g: 0.5471698, b: 0.5471698, a: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!222 &2132810049 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2132810046} - m_CullTransparentMesh: 1 --- !u!114 &1213935045309455263 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs index 4459dfd5..b2a1574b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs @@ -105,7 +105,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag switch (kvp.Key) { case CardFunction.discard: - if (TurnMaster.Instance.handCard.getHandCardList().Count - int.Parse(kvp.Value) - 1 + drawCardNum < 0) + if (TurnMaster.Instance.handCard.cardEntityList.Count - int.Parse(kvp.Value) - 1 + drawCardNum < 0) { Debug.Log("没有足够的牌可以弃牌"); cardEntity.canUse = false; @@ -153,8 +153,9 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag //其他位置都归位 transform.SetParent(originalParent); - transform.localPosition = originalpoint; GetComponent().blocksRaycasts = true; + // transform.position = originalpoint; + // CardActiveSort.Instance.ReflashCardPoint(); return; } @@ -207,7 +208,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag ainPanle.SetActive(false); } } - + private void ainPanleWork(PointerEventData eventData) { //射线检测瞄准的地图节点，判断是否可放置和改变放置影响区 @@ -380,7 +381,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag public void OnEndDrag(PointerEventData eventData) { GameManager.Instance.onDrag = false; - + StartCoroutine(OnDragIEnumerator(eventData)); } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOnMouseEnter.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOnMouseEnter.cs new file mode 100644 index 00000000..556ff9fd --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOnMouseEnter.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +public class CardOnMouseEnter : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler +{ + public void OnPointerEnter(PointerEventData eventData) + { + Debug.Log("放大"); + } + + public void OnPointerExit(PointerEventData eventData) + { + + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOnMouseEnter.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOnMouseEnter.cs.meta new file mode 100644 index 00000000..a629a4d7 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOnMouseEnter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 523596fd7703bbe44a0c37d83fd5c880 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/HandCard.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/HandCard.cs index cfc40742..adc142bd 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/HandCard.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/HandCard.cs @@ -5,7 +5,7 @@ using UnityEngine; public class HandCard : MonoBehaviour { - public List cardSlotList; + //public List cardSlotList; public List cardEntityList = new List(); public GameObject cardPanle; @@ -17,14 +17,5 @@ public class HandCard : MonoBehaviour maxHandCard = 9; } - public List getHandCardList() - { - List list = new List(); - //Debug.Log("现在拥有卡槽数量:"+ cardSlotList.Count); - for (int i = 0; i < cardPanle.transform.childCount; i++) - { - list.Add(i); - } - return list; - } + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs index eb425d12..c0e55b51 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs @@ -162,7 +162,7 @@ public class TurnMaster : Singleton } IEnumerator ShuffleWithLosingCards() { - for (int j = 0; j < handCard.cardSlotList.Count; j++) + for (int j = 0; j < handCard.cardEntityList.Count; j++) { disCard(j); } @@ -183,6 +183,7 @@ public class TurnMaster : Singleton public IEnumerator MoveCards() { + /* //Debug.Log("进入moveCards"); List cardList = new(); for (int j = 0; j < handCard.cardSlotList.Count; j++) @@ -203,12 +204,13 @@ public class TurnMaster : Singleton var a = Instantiate(cardDeck.cardPrefab, handCard.cardSlotList[i].transform.position, Quaternion.identity); a.transform.SetParent(handCard.cardSlotList[i].transform); a.GetComponent().createCard(cardList[i], i); - } + }*/ + yield return new WaitForEndOfFrame(); } public IEnumerator randomDiscard(int count) { - List disCardList = MathTool.GetRandomNumbers(handCard.getHandCardList().Count, count); + List disCardList = MathTool.GetRandomNumbers(handCard.cardEntityList.Count, count); if (disCardList != null) { foreach (int number in disCardList) @@ -222,19 +224,16 @@ public class TurnMaster : Singleton public void disCard(int cardIndex) { - if (handCard.cardSlotList[cardIndex].transform.childCount > 0) - { - //临时效果--将其加入墓地并销毁实体 - var card = handCard.cardSlotList[cardIndex].transform.GetChild(0).gameObject; - TurnMaster.Instance.usedCard.usedCardList.Add(card.GetComponent().CardId); - bool a = card == null; - Destroy(card); - } + //将其加入墓地并销毁实体 + CardEntity cardEntity = handCard.cardEntityList[cardIndex]; + usedCard.usedCardList.Add(cardEntity.CardId); + Destroy(cardEntity .gameObject); + handCard.cardEntityList.RemoveAt(cardIndex); } public void drawCards(int drawNum) { - int handCardCount = handCard.getHandCardList().Count; + int handCardCount = handCard.cardEntityList.Count; int actualCardsToDraw = Mathf.Min(handCard.maxHandCard - handCardCount, drawNum); for (int i = handCardCount; i < handCardCount + actualCardsToDraw; i++) @@ -242,11 +241,11 @@ public class TurnMaster : Singleton if (cardDeck.cardList.Count > 0) { - var a = Instantiate(cardDeck.cardPrefab, handCard.cardSlotList[i].transform.position, Quaternion.identity); - a.transform.SetParent(handCard.cardSlotList[i].transform); - - a.GetComponent().createCard(cardDeck.cardList[cardDeck.cardList.Count - 1], i); + var a = Instantiate(cardDeck.cardPrefab,handCard .cardPanle .transform ); + CardEntity cardEntity = a.GetComponent(); + cardEntity .createCard(cardDeck.cardList[cardDeck.cardList.Count - 1], i); cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1); + handCard.cardEntityList.Add(cardEntity); } else if (usedCard.usedCardList.Count > 0) { @@ -258,11 +257,12 @@ public class TurnMaster : Singleton } usedCard.usedCardList.Clear(); - var a = Instantiate(cardDeck.cardPrefab, handCard.cardSlotList[i].transform.position, Quaternion.identity); - a.transform.SetParent(handCard.cardSlotList[i].transform); - a.GetComponent().createCard(cardDeck.cardList[cardDeck.cardList.Count - 1], i); + var a = Instantiate(cardDeck.cardPrefab, handCard.cardPanle.transform); + CardEntity cardEntity = a.GetComponent(); + cardEntity.createCard(cardDeck.cardList[cardDeck.cardList.Count - 1], i); cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1); + handCard.cardEntityList.Add(cardEntity); } } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/CardActiveSort.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/CardActiveSort.meta new file mode 100644 index 00000000..dd477e2f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/CardActiveSort.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b2d6ff54c11f6a4c93ef04250cfb6a4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/CardActiveSort/CardActiveSort.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/CardActiveSort/CardActiveSort.cs new file mode 100644 index 00000000..f0ef5f99 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/CardActiveSort/CardActiveSort.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Unity.VisualScripting; +using UnityEngine; + +public class CardActiveSort : Singleton +{ + public int cardCount; + public GameObject targrtPoint;//圆心 + public float radius;//半径 + public float angleIncrement;//起始角度增量 + + [Header ("卡牌位置")] + public List cardPointDataList= new List();//奇数 + public List cardPointDataListEven = new List();//偶数 + + void Update() + { + if(transform .childCount !=cardCount && transform .childCount >1) + { + ReflashCardPoint(); + cardCount = this.transform.childCount; + } + // if(transform.childCount < cardCount) + // { + // cardCount = this.transform.childCount; + // } + } + public void ReflashCardPoint() + { + List cardEntitieList = new List(); + for (int i = 0; i < transform.childCount; i++) + { + cardEntitieList.Add(transform.GetChild(i).GetComponent()); + } + Debug.Log("排序"); + + float currentangle = 0; + if (cardEntitieList.Count %2==0) + { + currentangle = 90 - (angleIncrement * (cardEntitieList.Count / 2 + 0.5f)); + } + else + { + currentangle = 90 - (angleIncrement * (cardEntitieList.Count / 2 + 1)); + } + + for (int i = 0; i < cardEntitieList.Count; i++) + { + currentangle += angleIncrement ; + + cardEntitieList[i].transform.position = new Vector3(targrtPoint.transform.position.x-radius * Mathf.Cos(currentangle * Mathf.Deg2Rad), targrtPoint.transform.position.y+ radius * Mathf.Sin(currentangle * Mathf.Deg2Rad), 0); + + Vector3 direction = targrtPoint.transform.position- cardEntitieList[i].transform.position; + float angle = Vector3.SignedAngle(-cardEntitieList[i].transform.up, direction, cardEntitieList[i].transform.forward); + cardEntitieList[i].transform.Rotate(0, 0, angle); + } + + } + + [System .Serializable ] + public class CardPointData + { + public Vector2 pivot; + public float rotationZ; + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/CardActiveSort/CardActiveSort.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/CardActiveSort/CardActiveSort.cs.meta new file mode 100644 index 00000000..b57894a1 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/CardActiveSort/CardActiveSort.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ee54ee7c04561234fba83f722e4dfe0b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs index aae6d4c6..917bcc8e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs @@ -15,6 +15,7 @@ public class DestructionManager : Singleton { TurnMaster.Instance.usedCard.deleteCardList.Add(target.GetComponent().CardId); } + TurnMaster.Instance.handCard.cardEntityList.Remove(target.GetComponent()); Destroy(target); yield return null; yield return StartCoroutine(TurnMaster.Instance.MoveCards()); @@ -24,25 +25,17 @@ public class DestructionManager : Singleton mapUnity.influenced = false; } GameManager.Instance.SyncColourCountUI(); + //遍历范围预览池消除影响色 Debug.Log("清除前红色格数:" + GameManager.Instance.player.influencePreviewPool.Count); - /*for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++) - { - GameManager.Instance.player.influencePreviewPool[i].influenced = false; - } - GameManager.Instance.player.influencePreviewPool.Clear();*/ - + foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool) { mapUnity.influenced = false; } MapUnityManager.Instance.castPool.Clear(); - //GetComponent().blocksRaycasts = true; - //其他位置都归位 - /*transform.SetParent(originalParent); - transform.localPosition = originalpoint;*/ yield return StartCoroutine(SettlementManager.Instance.settle(cardOriginalData, influencePreviewPool, cardIndex)); }