diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/卡子-卡牌/cost.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/卡子-卡牌/cost.png new file mode 100644 index 00000000..58cd6903 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/卡子-卡牌/cost.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/卡子-卡牌/cost.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/卡子-卡牌/cost.png.meta new file mode 100644 index 00000000..359b268d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/卡子-卡牌/cost.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: c4b1b7b7f2f43ee478d603d615917bc3 +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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab index 293748f6..59704567 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab @@ -1,5 +1,82 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &293680695559714426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6960894461865500706} + - component: {fileID: 7538974035950592446} + - component: {fileID: 8616915440469879568} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6960894461865500706 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 293680695559714426} + 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: 4161522709580885203} + - {fileID: 8369407241280693220} + m_Father: {fileID: 7139562062302679022} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000022888184, y: 0} + m_SizeDelta: {x: 84.3694, y: 40.2923} + m_Pivot: {x: 1, y: 1} +--- !u!222 &7538974035950592446 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 293680695559714426} + m_CullTransparentMesh: 1 +--- !u!114 &8616915440469879568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 293680695559714426} + 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: 0} + m_RaycastTarget: 0 + 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!1 &688789690455570313 GameObject: m_ObjectHideFlags: 0 @@ -100,6 +177,85 @@ MonoBehaviour: m_Spacing: {x: -1, y: 0} m_Constraint: 2 m_ConstraintCount: 1 +--- !u!1 &868236483396494474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1489121462145541916} + - component: {fileID: 7692139866212041757} + - component: {fileID: 7475279129225244079} + m_Layer: 5 + m_Name: DescriptionText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1489121462145541916 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868236483396494474} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 770286542361201749} + 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: 110, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7692139866212041757 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868236483396494474} + m_CullTransparentMesh: 1 +--- !u!114 &7475279129225244079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868236483396494474} + 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: 0, g: 0, b: 0, 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 63 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6B7B\u4EA1\u5370\u8BB0" --- !u!1 &1447975007169538114 GameObject: m_ObjectHideFlags: 0 @@ -127,7 +283,7 @@ RectTransform: m_GameObject: {fileID: 1447975007169538114} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1855824799099284199} @@ -135,8 +291,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -13.4, y: 8.1} - m_SizeDelta: {x: 45, y: 45} + m_AnchoredPosition: {x: -13.825, y: 15.7} + m_SizeDelta: {x: 45.85, y: 47.3288} m_Pivot: {x: 0, y: 1} --- !u!222 &3908379299743407417 CanvasRenderer: @@ -153,7 +309,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1447975007169538114} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -166,7 +322,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7da46239a132d3d449d2ebaf941eb750, type: 3} + m_Sprite: {fileID: 21300000, guid: c4b1b7b7f2f43ee478d603d615917bc3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -470,6 +626,85 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4125960755420347751 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8369407241280693220} + - component: {fileID: 6209460025449939545} + - component: {fileID: 3697522799135242728} + m_Layer: 5 + m_Name: TypeText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8369407241280693220 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4125960755420347751} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 6960894461865500706} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 19.4, y: -21.1} + m_SizeDelta: {x: 77.1127, y: 39.4518} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &6209460025449939545 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4125960755420347751} + m_CullTransparentMesh: 1 +--- !u!114 &3697522799135242728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4125960755420347751} + 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 63 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6548\u679C\u724C" --- !u!1 &4169693119190854323 GameObject: m_ObjectHideFlags: 0 @@ -519,6 +754,8 @@ RectTransform: - {fileID: 7285859145388931973} - {fileID: 8229442996054676719} - {fileID: 66461956134587324} + - {fileID: 6960894461865500706} + - {fileID: 770286542361201749} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -579,7 +816,9 @@ MonoBehaviour: cardId: 0 cost: {fileID: 2839742468483413986} cardIndex: 0 - cardName: {fileID: 0} + cardDescription: {fileID: 7475279129225244079} + cardName: {fileID: 6479405117586795514} + cardType: {fileID: 3697522799135242728} cardImage: {fileID: 5159259897654068178} canUse: 1 fun1Image: {fileID: 0} @@ -615,6 +854,7 @@ MonoBehaviour: cardDataSummary: {fileID: 688789690455570313} animator: {fileID: 5188661188061946492} borderAnim: {fileID: 4731515924597847675} + currentCost: 0 --- !u!114 &5545682449418996990 MonoBehaviour: m_ObjectHideFlags: 0 @@ -882,7 +1122,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1151,7 +1391,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1267,6 +1507,85 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6046741177040205967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4161522709580885203} + - component: {fileID: 907942331297122465} + - component: {fileID: 6479405117586795514} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4161522709580885203 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6046741177040205967} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 6960894461865500706} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -27.1497, y: 3} + m_SizeDelta: {x: 247.8178, y: 80.585} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &907942331297122465 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6046741177040205967} + m_CullTransparentMesh: 1 +--- !u!114 &6479405117586795514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6046741177040205967} + 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 63 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6B7B\u4EA1\u5370\u8BB0" --- !u!1 &6052323990296705033 GameObject: m_ObjectHideFlags: 0 @@ -1301,8 +1620,8 @@ RectTransform: 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.5, y: 0.6} - m_SizeDelta: {x: 450, y: 450} + m_AnchoredPosition: {x: -0.037475586, y: -0.00016403198} + m_SizeDelta: {x: 459.25, y: 394.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6418759718487919919 CanvasRenderer: @@ -1325,7 +1644,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.23773581, g: 0.23773581, b: 0.23773581, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1556,7 +1875,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1768,7 +2087,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0.0317, y: 0.0000076293945} - m_SizeDelta: {x: 132.8481, y: 150.1245} + m_SizeDelta: {x: 132.8481, y: 140} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2748996186627099962 CanvasRenderer: @@ -1808,3 +2127,79 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &9158171948348358347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 770286542361201749} + - component: {fileID: 5329808581769134393} + - component: {fileID: 3156841614422125872} + m_Layer: 5 + m_Name: Description + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &770286542361201749 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9158171948348358347} + 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: 1489121462145541916} + m_Father: {fileID: 7139562062302679022} + 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.00010729, y: 0} + m_SizeDelta: {x: 110, y: 55.0433} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &5329808581769134393 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9158171948348358347} + m_CullTransparentMesh: 1 +--- !u!114 &3156841614422125872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9158171948348358347} + 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.24528301, g: 0.24528301, b: 0.24528301, a: 0} + m_RaycastTarget: 0 + 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 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem.meta deleted file mode 100644 index 1f14b93a..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 661fd2bb49fc63847bd149bbde597faf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index 2f267217..2252af20 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs @@ -31,10 +31,10 @@ public class CardEntity : MonoBehaviour //private Vector3 EndTransform; - //public Text cardDescription; + public Text cardDescription; public Text cardName; - //public Text cardType; + public Text cardType; //public Image cardTypeImage; @@ -98,9 +98,12 @@ public class CardEntity : MonoBehaviour [Header("Ʊ߿ؼ")] public Animator borderAnim; public Dictionary> cardFunToLose = new Dictionary>(); - + [Header("Ʒñ仯")] + int lastCost; + public int currentCost; private void Start() { + currentCost = cardOriginalData.Cost; //עᵽñ仯ӿ--ƳڱС if ( isLookCard ==false && GameManager.Instance != null) { @@ -137,7 +140,7 @@ public class CardEntity : MonoBehaviour //ǷԷϷ߿ public void CheckUse() { - if(PlayerStatsManager .Instance .playerState .currentCost >= cardOriginalData .Cost ) + if(PlayerStatsManager .Instance .playerState .currentCost >= currentCost ) { borderAnim.gameObject.SetActive(true); } @@ -170,11 +173,14 @@ public class CardEntity : MonoBehaviour settleForStart(SettlementManager.settleTurn); createCardUI(needTrueFun); //createCardDescription(); - //createCardName(); + createCardName(); //createCardCost(); //createCardImage(); createCardImageTest(); this.cardIndex = cardIndex; + + cardDescription.text = " "; + cardType.text = "Ϳɫ"; } public void createEffectCard(string cardId, int cardIndex, bool needTrueFun) @@ -185,11 +191,14 @@ public class CardEntity : MonoBehaviour settleForStart(SettlementManager.settleTurn); createEffectCardUI(needTrueFun); //createCardDescription(); - //createCardName(); + createCardName(); //createCardCost(); //createCardImage(); //createCardImageTest(); this.cardIndex = cardIndex; + + cardDescription.text = cardOriginalData.Description; + cardType.text = "Ч"; } public void createItemCard(string cardId, int cardIndex, bool needTrueFun) @@ -200,11 +209,13 @@ public class CardEntity : MonoBehaviour settleForStart(SettlementManager.settleTurn); //createEffectCardUI(needTrueFun); //createCardDescription(); - //createCardName(); + createCardName(); //createCardCost(); //createCardImage(); //createCardImageTest(); this.cardIndex = cardIndex; + + cardType.text = "Ʒ"; } //ЧĽ @@ -369,19 +380,23 @@ public class CardEntity : MonoBehaviour } else {*/ - int cardCost = cardOriginalData.Cost; - int cardCostPlus1= cardOriginalData.Cost+1; + currentCost = cardOriginalData.Cost; if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Black)) { - cost.text = cardCostPlus1.ToString(); + currentCost += 1; + cost.text = currentCost.ToString(); } else { - cost.text = cardCost.ToString(); + cost.text = currentCost.ToString(); } - + if(currentCost!=lastCost ) + { + lastCost = currentCost; + CheckUse(); + } } public void createCardUI(bool needTrueFun) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs index 238d4326..267a5fd7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs @@ -292,6 +292,7 @@ public class CardOriginalDataList : Singleton //CardOriginalData cardOriginalData = CardOriginalData.Instance; cardOriginalData.CardId = values[0]; //cardOriginalData.ChineseName = values[1]; + // cardOriginalData.Description = values[12]; cardOriginalData.costType = values[1]; cardOriginalData.Cost = int.Parse(values[2]); //cardOriginalData.Rarity = int.Parse(values[3]); diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_4.csv b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_4.csv index 60a75f44..21e58f07 100644 --- a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_4.csv +++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_4.csv @@ -1,6 +1,6 @@ -ID,费用类型,费用,施法范围,作用范围,条件,功能,数值,地块标记,地块颜色,图片路径,名称 -1001,1,1,2,3_1,none,52,5,1_-1;2_0;0_0,red;blue;green,CardIcon/1010,射击 -1002,1,1,2,3_1,none,52,4,0_0;-1_1;-1_-1,white;white;white,CardIcon/1010,屏障 -1003,1,1,2,3_1,none,,,0_0;1_0;2_0;3_0;4_0,white;white;white;white;white,CardIcon/1010,喷射 -1004,1,0,2,3_1,none,1,5,0_0;1_0;2_0,green;green;green,CardIcon/1010,射击 -1005,1,1,2,3_1,none,1,5,0_0;1_0;2_0,red;blue;green,CardIcon/1010,测试卡1005 +ID,费用类型,费用,施法范围,作用范围,条件,功能,数值,地块标记,地块颜色,图片路径,名称,描述 +1001,1,1,2,3_1,none,52,5,1_-1;2_0;0_0,red;blue;green,CardIcon/1010,射击,射击 +1002,1,1,2,3_1,none,52,4,0_0;-1_1;-1_-1,white;white;white,CardIcon/1010,屏障,屏障 +1003,1,1,2,3_1,none,,,0_0;1_0;2_0;3_0;4_0,white;white;white;white;white,CardIcon/1010,喷射,喷射 +1004,1,0,2,3_1,none,1,5,0_0;1_0;2_0,green;green;green,CardIcon/1010,射击,射击 +1005,1,1,2,3_1,none,1,5,0_0;1_0;2_0,red;blue;green,CardIcon/1010,测试卡1005,测试卡1005