diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/1111111.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/1111111.png new file mode 100644 index 00000000..3ab082d2 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/1111111.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/1111111.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/1111111.png.meta new file mode 100644 index 00000000..fcbf911a --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/1111111.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 7eec0ec9fd6052f4da1721b15cb450c5 +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: 2 + 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: + - serializedVersion: 2 + name: 1111111_0 + rect: + serializedVersion: 2 + x: 22 + y: 25 + width: 247 + height: 281 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2dbc374697562f54d81c82808b8ef7bd + internalID: 1826802122 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8a8f510a62183be4389dc7b9da55dc81 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + 1111111_0: 1826802122 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/card.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/card.png.meta index 35550b56..2e6030c8 100644 --- a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/card.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/card.png.meta @@ -43,7 +43,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -108,7 +108,28 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: card_0 + rect: + serializedVersion: 2 + x: 60 + y: 34 + width: 512 + height: 771 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6b02cfecdfbb72644a5e41951d5783ee + internalID: -1380875850 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -119,7 +140,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + card_0: -1380875850 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/conditon.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/conditon.png.meta index a38a079e..1c627c13 100644 --- a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/conditon.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/conditon.png.meta @@ -118,8 +118,8 @@ TextureImporter: width: 386 height: 72 alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + border: {x: 6, y: 7, z: 5, w: 9} outline: [] physicsShape: [] tessellationDetail: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset index 5baac0fb..a7f3defe 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset @@ -23,4 +23,4 @@ MonoBehaviour: currentHP: 68 cardRewardNumToChoose: 0 cardRewardNumToGget: 0 - money: 100 + money: 9900 diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新商店UI/企业微信截图_17297755714270.png b/ColorlessWorld-2024-4-2/Assets/Image/新商店UI/企业微信截图_17297755714270.png new file mode 100644 index 00000000..920a57e9 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新商店UI/企业微信截图_17297755714270.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新商店UI/企业微信截图_17297755714270.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新商店UI/企业微信截图_17297755714270.png.meta new file mode 100644 index 00000000..25e23d37 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新商店UI/企业微信截图_17297755714270.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 5ff0e472e77d92047aaf4e4de3f60eb6 +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 84b6dc37..8c4a4bc8 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 @@ -35,7 +35,7 @@ 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: 3.274, y: -10.174} + m_AnchoredPosition: {x: 0, y: -12.6} m_SizeDelta: {x: 95.148, y: 20} m_Pivot: {x: 0.5, y: 0.60132146} --- !u!222 &1556748052669264222 @@ -60,7 +60,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -89,17 +89,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 5 m_Right: 0 - m_Top: 0 + m_Top: -2 m_Bottom: 0 m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 15, y: 20} - m_Spacing: {x: 0, y: 0} - m_Constraint: 0 - m_ConstraintCount: 2 + m_CellSize: {x: 15, y: 15} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 --- !u!1 &1447975007169538114 GameObject: m_ObjectHideFlags: 0 @@ -135,8 +135,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: -4.3, y: 6.8} - m_SizeDelta: {x: 28.6048, y: 33.2259} + m_AnchoredPosition: {x: -13.4, y: 14} + m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0, y: 1} --- !u!222 &3908379299743407417 CanvasRenderer: @@ -162,7 +162,7 @@ MonoBehaviour: 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: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -208,11 +208,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 7139562062302679022} 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: 5.6716, y: 90.187} - m_SizeDelta: {x: 94.795, y: 18.142} - m_Pivot: {x: 0.50000066, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0.000024318695, y: -1.5} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &5689823300698625128 CanvasRenderer: m_ObjectHideFlags: 0 @@ -236,15 +236,15 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: -1 + m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 20, y: 20} - m_Spacing: {x: 0, y: 0} - m_Constraint: 0 - m_ConstraintCount: 2 + m_CellSize: {x: 23, y: 25} + m_Spacing: {x: 3, y: 0} + m_Constraint: 1 + m_ConstraintCount: 5 --- !u!1 &4169693119190854323 GameObject: m_ObjectHideFlags: 0 @@ -294,7 +294,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -3.1, y: 29} - m_SizeDelta: {x: 125, y: 200} + m_SizeDelta: {x: 132, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &806089455888247474 CanvasRenderer: @@ -317,14 +317,14 @@ 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: 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: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3} + m_Sprite: {fileID: -1380875850, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -437,7 +437,7 @@ MonoBehaviour: speed: 4 moveOffset: 50 originPoint: {x: 0, y: 0, z: 0} - UpperOffset: {x: 0, y: 70, z: 0} + UpperOffset: {x: 0, y: 115, z: 0} originRotation: {x: 0, y: 0, z: 0} --- !u!1 &4343990849769966524 GameObject: @@ -472,11 +472,11 @@ RectTransform: - {fileID: 4872235896629707279} m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -5.2, y: -175.1} - m_SizeDelta: {x: 28.6048, y: 33.2259} - m_Pivot: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -13.4, y: -7.52} + m_SizeDelta: {x: 45, y: 45} + m_Pivot: {x: 0, y: 0} --- !u!222 &9073797113623819660 CanvasRenderer: m_ObjectHideFlags: 0 @@ -501,7 +501,7 @@ MonoBehaviour: 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: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -550,8 +550,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: 3.8999996, y: -32.199997} - m_SizeDelta: {x: 90, y: 20} + m_AnchoredPosition: {x: -0.000012636, y: -32.199997} + m_SizeDelta: {x: 95.148, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3754643477587389603 CanvasRenderer: @@ -575,7 +575,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -608,13 +608,13 @@ MonoBehaviour: m_Right: 0 m_Top: -1 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 15, y: 20} - m_Spacing: {x: 0, y: 0} - m_Constraint: 0 - m_ConstraintCount: 2 + m_CellSize: {x: 15, y: 16} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 --- !u!1 &5174392397216232880 GameObject: m_ObjectHideFlags: 0 @@ -744,8 +744,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: 3.9, y: -52.52} - m_SizeDelta: {x: 90, y: 20} + m_AnchoredPosition: {x: -0.000012636, y: -52.52} + m_SizeDelta: {x: 95.148, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5787701428816686695 CanvasRenderer: @@ -769,7 +769,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -802,13 +802,13 @@ MonoBehaviour: m_Right: 0 m_Top: -1 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 15, y: 20} - m_Spacing: {x: 0, y: 0} - m_Constraint: 0 - m_ConstraintCount: 2 + m_CellSize: {x: 15, y: 16} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 --- !u!1 &6018557167984620928 GameObject: m_ObjectHideFlags: 0 @@ -843,8 +843,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: 1.1, y: 0.8} - m_SizeDelta: {x: 132.8754, y: 214.2679} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 132, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6630524511444619868 CanvasRenderer: @@ -870,11 +870,11 @@ MonoBehaviour: 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: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3} + m_Sprite: {fileID: -1380875850, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -909,17 +909,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6052323990296705033} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalRotation: {x: 0, y: 0, z: -0.073499195, w: 0.99729526} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 0.1, y: 0.12, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8507021733924720450} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -8.43} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.60999966, y: -0.00002861023} - m_SizeDelta: {x: 250, y: 250} + m_AnchoredPosition: {x: -1.6, y: 1.3} + m_SizeDelta: {x: 450, y: 450} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6418759718487919919 CanvasRenderer: @@ -945,12 +945,12 @@ MonoBehaviour: 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: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 170 m_FontStyle: 0 m_BestFit: 0 @@ -998,8 +998,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: 3.9, y: -72.99999} - m_SizeDelta: {x: 90, y: 20} + m_AnchoredPosition: {x: -0.000012636, y: -72.99999} + m_SizeDelta: {x: 95.148, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6495211555079877352 CanvasRenderer: @@ -1023,7 +1023,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1056,13 +1056,13 @@ MonoBehaviour: m_Right: 0 m_Top: -1 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 15, y: 20} - m_Spacing: {x: 0, y: 0} - m_Constraint: 0 - m_ConstraintCount: 2 + m_CellSize: {x: 15, y: 16} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 --- !u!1 &8081948450419621271 GameObject: m_ObjectHideFlags: 0 @@ -1097,8 +1097,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.6999998, y: -0.39999962} - m_SizeDelta: {x: 250, y: 250} + m_AnchoredPosition: {x: -2.1000004, y: 0.00001335144} + m_SizeDelta: {x: 450, y: 450} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7985228304631699869 CanvasRenderer: @@ -1121,20 +1121,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3679245, g: 0.3679245, b: 0.3679245, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 170 + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 200 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 - m_MaxSize: 187 + m_MaxSize: 200 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1174,11 +1174,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 7139562062302679022} 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: 3.274, y: 40.8} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -19.7} m_SizeDelta: {x: 90, y: 90} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &2748996186627099962 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1203,11 +1203,11 @@ MonoBehaviour: 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: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8a22e3267925107428c362e702d2c792, type: 3} + m_Sprite: {fileID: 677644212, guid: c0cdeb5700cf9a440a32d3f1466d5f75, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.3-Common.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.3-Common.prefab new file mode 100644 index 00000000..b91bc99e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.3-Common.prefab @@ -0,0 +1,1279 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &688789690455570313 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7285859145388931973} + - component: {fileID: 1556748052669264222} + - component: {fileID: 2102827337445216865} + - component: {fileID: 8780837206578477006} + m_Layer: 0 + m_Name: TrueFun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7285859145388931973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 688789690455570313} + 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: 7139562062302679022} + 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: -12.6} + m_SizeDelta: {x: 95.148, y: 20} + m_Pivot: {x: 0.5, y: 0.60132146} +--- !u!222 &1556748052669264222 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 688789690455570313} + m_CullTransparentMesh: 1 +--- !u!114 &2102827337445216865 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 688789690455570313} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 1177940304, guid: 2d6fbbc3c6767494eb3246e761b6dea2, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8780837206578477006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 688789690455570313} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 5 + m_Right: 0 + m_Top: -2 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 15, y: 15} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 +--- !u!1 &1447975007169538114 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8507021733924720450} + - component: {fileID: 3908379299743407417} + - component: {fileID: 1056798440275425373} + m_Layer: 5 + m_Name: CostPanel + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8507021733924720450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1855824799099284199} + m_Father: {fileID: 7139562062302679022} + 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: 14} + m_SizeDelta: {x: 45, y: 45} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3908379299743407417 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447975007169538114} + m_CullTransparentMesh: 1 +--- !u!114 &1056798440275425373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447975007169538114} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7da46239a132d3d449d2ebaf941eb750, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3177769488067894455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8229442996054676719} + - component: {fileID: 5689823300698625128} + - component: {fileID: 3867529107105442162} + m_Layer: 0 + m_Name: nodeColorResult + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8229442996054676719 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3177769488067894455} + 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: 7139562062302679022} + 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: 0.000024318695, y: -1.5} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5689823300698625128 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3177769488067894455} + m_CullTransparentMesh: 1 +--- !u!114 &3867529107105442162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3177769488067894455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 23, y: 25} + m_Spacing: {x: 3, y: 0} + m_Constraint: 1 + m_ConstraintCount: 5 +--- !u!1 &4169693119190854323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7139562062302679022} + - component: {fileID: 806089455888247474} + - component: {fileID: 2213389614096314727} + - component: {fileID: 8400832028529023394} + - component: {fileID: 5545682449418996990} + - component: {fileID: 7526181906643281268} + - component: {fileID: 7619122435525404041} + - component: {fileID: 8541537608814013155} + - component: {fileID: 5354675593740436561} + m_Layer: 5 + m_Name: Card_v04.3-Common + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7139562062302679022 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + 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: 5891999358152162990} + - {fileID: 8417263142375954454} + - {fileID: 1083118128749949784} + - {fileID: 8507021733924720450} + - {fileID: 8989630736753615331} + - {fileID: 7708569023393197294} + - {fileID: 7083643264776544898} + - {fileID: 7285859145388931973} + - {fileID: 8229442996054676719} + - {fileID: 66461956134587324} + m_Father: {fileID: 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: -3.1, y: 29} + m_SizeDelta: {x: 132, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &806089455888247474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_CullTransparentMesh: 1 +--- !u!114 &2213389614096314727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1380875850, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8400832028529023394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9878eb734a9bb9e448c1a125b1e863e6, type: 3} + m_Name: + m_EditorClassIdentifier: + cardId: 0 + cost: {fileID: 2839742468483413986} + cardIndex: 0 + cardName: {fileID: 0} + cardImage: {fileID: 5159259897654068178} + canUse: 1 + fun1Image: {fileID: 0} + fun2Image: {fileID: 0} + fun3Image: {fileID: 0} + successCondition: {fileID: -1410864517, guid: e1b9157641a477c4eaca52a6c7ae4185, + type: 3} + unsuccessCondition: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe, + type: 3} + fun1Val: {fileID: 0} + fun2Val: {fileID: 0} + fun3Val: {fileID: 0} + smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, + type: 3} + noSmallCard: 0 + noSyncText: 0 + conditionList: + - {fileID: 4398690247767463098} + - {fileID: 5970626616650445913} + - {fileID: 7367770060306744678} + trueFun: {fileID: 688789690455570313} + trueFunPrefab: {fileID: 4818544559399868804, guid: 98bfb86ee08b4924e8175b9d6145957d, + type: 3} + nodeColorResultFrame: {fileID: 3177769488067894455} + nodeColorResultImage: {fileID: 2948337350984551391, guid: f5592fae7d00e404586800947db445f2, + type: 3} + castRange: {fileID: 5584794665957624749} + colorConditon: {fileID: 4414271769496108467, guid: 1fd0d425cafce3f4588b40c9cfe1ac25, + type: 3} + cardDataSummary: {fileID: 688789690455570313} +--- !u!114 &5545682449418996990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80971e1d1b78104439c3472d4276e502, type: 3} + m_Name: + m_EditorClassIdentifier: + originalParent: {fileID: 0} + originalpoint: {x: 0, y: 0, z: 0} + originalIndexInChild: 0 + eventSystem: {fileID: 0} + canUse: 1 + ainPanle: {fileID: 5174392397216232880} + currentNode: {fileID: 0} + dragState: 3 + ready: 0 + castingPool: [] + layerMask: + serializedVersion: 2 + m_Bits: 64 + cardOnMouseEnter: {fileID: 0} +--- !u!225 &7526181906643281268 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &7619122435525404041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 523596fd7703bbe44a0c37d83fd5c880, type: 3} + m_Name: + m_EditorClassIdentifier: + oringinIndex: 0 + cardDrag: {fileID: 0} + targetScale: {x: 0, y: 0, z: 0} + originScale: {x: 0, y: 0, z: 0} + speed: 4 + moveOffset: 50 + originPoint: {x: 0, y: 0, z: 0} + UpperOffset: {x: 0, y: 115, z: 0} + originRotation: {x: 0, y: 0, z: 0} +--- !u!114 &8541537608814013155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2213389614096314727} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5354675593740436561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09549bb4d612106489300b62c6890846, type: 3} + m_Name: + m_EditorClassIdentifier: + cardEntity: {fileID: 8400832028529023394} + button: {fileID: 8541537608814013155} +--- !u!1 &4343990849769966524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 66461956134587324} + - component: {fileID: 9073797113623819660} + - component: {fileID: 4177469149448917414} + m_Layer: 5 + m_Name: CastRangePanel + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &66461956134587324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4343990849769966524} + 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: 4872235896629707279} + m_Father: {fileID: 7139562062302679022} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -13.4, y: -7.52} + m_SizeDelta: {x: 45, y: 45} + m_Pivot: {x: 0, y: 0} +--- !u!222 &9073797113623819660 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4343990849769966524} + m_CullTransparentMesh: 1 +--- !u!114 &4177469149448917414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4343990849769966524} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 60dd2c714dd7ac548af3feab06a58487, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4398690247767463098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8989630736753615331} + - component: {fileID: 3754643477587389603} + - component: {fileID: 6002022395324240266} + - component: {fileID: 8883537695841318699} + m_Layer: 0 + m_Name: condition1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8989630736753615331 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4398690247767463098} + 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: 7139562062302679022} + 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.000012636, y: -32.199997} + m_SizeDelta: {x: 95.148, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3754643477587389603 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4398690247767463098} + m_CullTransparentMesh: 1 +--- !u!114 &6002022395324240266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4398690247767463098} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8883537695841318699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4398690247767463098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: -1 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 15, y: 16} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 +--- !u!1 &5174392397216232880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5891999358152162990} + - component: {fileID: 5304992815847150061} + - component: {fileID: 1230043771585378953} + - component: {fileID: 4530502908829594795} + m_Layer: 5 + m_Name: AimPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5891999358152162990 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174392397216232880} + 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: 7139562062302679022} + 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: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5304992815847150061 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174392397216232880} + m_CullTransparentMesh: 1 +--- !u!114 &1230043771585378953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174392397216232880} + 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.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + 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!114 &4530502908829594795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174392397216232880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dea2a5cfc33ee743a3afdfa030e52bc, type: 3} + m_Name: + m_EditorClassIdentifier: + arrowHeadPrefab: {fileID: 7429868863709343630, guid: f0b0ec00983ab49438a78adf75c2694c, + type: 3} + arrowNodePrefab: {fileID: 5422017731306186776, guid: 75f6f4f191fef2941a9c8f90833afbbf, + type: 3} + arrowNodeNum: 10 + scaleFactor: 0.5 +--- !u!1 &5970626616650445913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7708569023393197294} + - component: {fileID: 5787701428816686695} + - component: {fileID: 5392165220136475930} + - component: {fileID: 2647841805185336433} + m_Layer: 0 + m_Name: condition2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7708569023393197294 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5970626616650445913} + 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: 7139562062302679022} + 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.000012636, y: -52.52} + m_SizeDelta: {x: 95.148, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5787701428816686695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5970626616650445913} + m_CullTransparentMesh: 1 +--- !u!114 &5392165220136475930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5970626616650445913} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2647841805185336433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5970626616650445913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: -1 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 15, y: 16} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 +--- !u!1 &6018557167984620928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8417263142375954454} + - component: {fileID: 6630524511444619868} + - component: {fileID: 3893753280325337861} + m_Layer: 5 + m_Name: TopBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8417263142375954454 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6018557167984620928} + 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: 7139562062302679022} + 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: 0} + m_SizeDelta: {x: 132, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6630524511444619868 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6018557167984620928} + m_CullTransparentMesh: 1 +--- !u!114 &3893753280325337861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6018557167984620928} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1380875850, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6052323990296705033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1855824799099284199} + - component: {fileID: 6418759718487919919} + - component: {fileID: 2839742468483413986} + m_Layer: 5 + m_Name: CostText + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1855824799099284199 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6052323990296705033} + m_LocalRotation: {x: 0, y: 0, z: -0.073499195, w: 0.99729526} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 0.1, y: 0.12, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8507021733924720450} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -8.43} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -1.6, y: 1.3} + m_SizeDelta: {x: 450, y: 450} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6418759718487919919 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6052323990296705033} + m_CullTransparentMesh: 1 +--- !u!114 &2839742468483413986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6052323990296705033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 170 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 170 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1 +--- !u!1 &7367770060306744678 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7083643264776544898} + - component: {fileID: 6495211555079877352} + - component: {fileID: 1878412079889438759} + - component: {fileID: 6664117381034053926} + m_Layer: 0 + m_Name: condition3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7083643264776544898 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367770060306744678} + 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: 7139562062302679022} + 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.000012636, y: -72.99999} + m_SizeDelta: {x: 95.148, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6495211555079877352 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367770060306744678} + m_CullTransparentMesh: 1 +--- !u!114 &1878412079889438759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367770060306744678} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6664117381034053926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367770060306744678} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: -1 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 15, y: 16} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 +--- !u!1 &8081948450419621271 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4872235896629707279} + - component: {fileID: 7985228304631699869} + - component: {fileID: 5584794665957624749} + m_Layer: 5 + m_Name: CastRangeText + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4872235896629707279 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8081948450419621271} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 66461956134587324} + 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: -2.1000004, y: 0.00001335144} + m_SizeDelta: {x: 450, y: 450} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7985228304631699869 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8081948450419621271} + m_CullTransparentMesh: 1 +--- !u!114 &5584794665957624749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8081948450419621271} + 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.3679245, g: 0.3679245, b: 0.3679245, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 200 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 200 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1 +--- !u!1 &8951318475869846370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1083118128749949784} + - component: {fileID: 2748996186627099962} + - component: {fileID: 5159259897654068178} + m_Layer: 5 + m_Name: CardIcon + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1083118128749949784 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951318475869846370} + 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: 7139562062302679022} + 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: 0, y: -19.7} + m_SizeDelta: {x: 90, y: 90} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2748996186627099962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951318475869846370} + m_CullTransparentMesh: 1 +--- !u!114 &5159259897654068178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951318475869846370} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 677644212, guid: c0cdeb5700cf9a440a32d3f1466d5f75, 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/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop/Card_v02_OnlyChooseUI.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.3-Common.prefab.meta similarity index 74% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop/Card_v02_OnlyChooseUI.prefab.meta rename to ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.3-Common.prefab.meta index 84ee8a73..684d7a38 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop/Card_v02_OnlyChooseUI.prefab.meta +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.3-Common.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aca792d113461d44a8227dffd169496d +guid: d349e9c2ce0a808418c6eed487637259 PrefabImporter: externalObjects: {} userData: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop/Card_v02_OnlyChooseUI.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.3-Common.prefab similarity index 60% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop/Card_v02_OnlyChooseUI.prefab rename to ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.3-Common.prefab index 0de832be..a40d3340 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop/Card_v02_OnlyChooseUI.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.3-Common.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &122971084434177493 +--- !u!1 &688789690455570313 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,52 +8,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3603043219975788727} - - component: {fileID: 2528596487096277497} - - component: {fileID: 1711222861785223808} - m_Layer: 5 - m_Name: RangInforPanel - m_TagString: Card + - component: {fileID: 7285859145388931973} + - component: {fileID: 1556748052669264222} + - component: {fileID: 2102827337445216865} + - component: {fileID: 8780837206578477006} + m_Layer: 0 + m_Name: TrueFun + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3603043219975788727 +--- !u!224 &7285859145388931973 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 122971084434177493} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 688789690455570313} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 7579548714595582098} - - {fileID: 4796946214172175014} - m_Father: {fileID: 6088194398582117394} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7139562062302679022} 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: -90.899994, y: -108.90001} - m_SizeDelta: {x: 17.977, y: 49.3483} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2528596487096277497 + m_AnchoredPosition: {x: 0, y: -12.6} + m_SizeDelta: {x: 95.148, y: 20} + m_Pivot: {x: 0.5, y: 0.60132146} +--- !u!222 &1556748052669264222 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 122971084434177493} + m_GameObject: {fileID: 688789690455570313} m_CullTransparentMesh: 1 ---- !u!114 &1711222861785223808 +--- !u!114 &2102827337445216865 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 122971084434177493} + m_GameObject: {fileID: 688789690455570313} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -63,11 +62,11 @@ MonoBehaviour: 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: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1278342464, guid: a3cd79e2aac2026409fda39992809df4, type: 3} + m_Sprite: {fileID: 1177940304, guid: 2d6fbbc3c6767494eb3246e761b6dea2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -77,7 +76,31 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &440635417331003209 +--- !u!114 &8780837206578477006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 688789690455570313} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 5 + m_Right: 0 + m_Top: -2 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 15, y: 15} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 +--- !u!1 &1447975007169538114 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -85,69 +108,66 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 112866538506733683} - - component: {fileID: 2545866245979278040} - - component: {fileID: 3713793140209591933} + - component: {fileID: 8507021733924720450} + - component: {fileID: 3908379299743407417} + - component: {fileID: 1056798440275425373} m_Layer: 5 - m_Name: CardInforPanel + m_Name: CostPanel m_TagString: Card m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &112866538506733683 +--- !u!224 &8507021733924720450 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440635417331003209} + 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.5, y: 1.5, z: 1.5} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8062176084904280992} - - {fileID: 8005142546255168989} - - {fileID: 928194122518202843} - - {fileID: 6634975291145204097} - m_Father: {fileID: 6088194398582117394} + - {fileID: 1855824799099284199} + m_Father: {fileID: 7139562062302679022} 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.1, y: 3.8} - m_SizeDelta: {x: 98.3944, y: 168.3662} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2545866245979278040 + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -13.4, y: 14} + m_SizeDelta: {x: 45, y: 45} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3908379299743407417 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440635417331003209} + m_GameObject: {fileID: 1447975007169538114} m_CullTransparentMesh: 1 ---- !u!114 &3713793140209591933 +--- !u!114 &1056798440275425373 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440635417331003209} + m_GameObject: {fileID: 1447975007169538114} 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_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 7da46239a132d3d449d2ebaf941eb750, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -156,7 +176,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1547355189508981316 +--- !u!1 &3177769488067894455 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -164,74 +184,68 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1468542541505241226} - - component: {fileID: 8368999971505229184} - - component: {fileID: 347011869506427156} - m_Layer: 5 - m_Name: MidBorder + - component: {fileID: 8229442996054676719} + - component: {fileID: 5689823300698625128} + - component: {fileID: 3867529107105442162} + m_Layer: 0 + m_Name: nodeColorResult m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1468542541505241226 +--- !u!224 &8229442996054676719 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1547355189508981316} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 3177769488067894455} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6088194398582117394} + m_Father: {fileID: 7139562062302679022} 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.3478217, y: 16.799988} - m_SizeDelta: {x: 112.5645, y: 34.8011} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8368999971505229184 + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0.000024318695, y: -1.5} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5689823300698625128 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1547355189508981316} + m_GameObject: {fileID: 3177769488067894455} m_CullTransparentMesh: 1 ---- !u!114 &347011869506427156 +--- !u!114 &3867529107105442162 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1547355189508981316} + m_GameObject: {fileID: 3177769488067894455} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, 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: -1367631166, guid: c227a99a29e376f4ebbd02346dc40c6e, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2560877630837087600 + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 23, y: 25} + m_Spacing: {x: 3, y: 0} + m_Constraint: 1 + m_ConstraintCount: 5 +--- !u!1 &4169693119190854323 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -239,65 +253,80 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3450981793660124756} - - component: {fileID: 3643326138655725741} - - component: {fileID: 7700158052984547042} + - component: {fileID: 7139562062302679022} + - component: {fileID: 806089455888247474} + - component: {fileID: 2213389614096314727} + - component: {fileID: 8400832028529023394} + - component: {fileID: 5545682449418996990} + - component: {fileID: 7526181906643281268} + - component: {fileID: 7619122435525404041} + - component: {fileID: 8541537608814013155} + - component: {fileID: 552322036273091990} m_Layer: 5 - m_Name: CostPanel + m_Name: Card_v04.3-Common m_TagString: Card m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3450981793660124756 +--- !u!224 &7139562062302679022 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2560877630837087600} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 4169693119190854323} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6135546373982555227} - m_Father: {fileID: 6088194398582117394} + - {fileID: 5891999358152162990} + - {fileID: 8417263142375954454} + - {fileID: 1083118128749949784} + - {fileID: 8507021733924720450} + - {fileID: 8989630736753615331} + - {fileID: 7708569023393197294} + - {fileID: 7083643264776544898} + - {fileID: 7285859145388931973} + - {fileID: 8229442996054676719} + - {fileID: 66461956134587324} + m_Father: {fileID: 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: -96.91194, y: 139.1} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: -3.1, y: 29} + m_SizeDelta: {x: 132, y: 200} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3643326138655725741 +--- !u!222 &806089455888247474 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2560877630837087600} + m_GameObject: {fileID: 4169693119190854323} m_CullTransparentMesh: 1 ---- !u!114 &7700158052984547042 +--- !u!114 &2213389614096314727 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2560877630837087600} + m_GameObject: {fileID: 4169693119190854323} 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: 0 + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1928548215, guid: 3942cb915be4d49458ab17ae5bef32b4, type: 3} + m_Sprite: {fileID: -1380875850, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -307,82 +336,182 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4109686459493091903 -GameObject: +--- !u!114 &8400832028529023394 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6771572773922174228} - - component: {fileID: 9039797454776279552} - - component: {fileID: 8298135406204277643} - m_Layer: 5 - m_Name: Color - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6771572773922174228 -RectTransform: + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9878eb734a9bb9e448c1a125b1e863e6, type: 3} + m_Name: + m_EditorClassIdentifier: + cardId: 0 + cost: {fileID: 2839742468483413986} + cardIndex: 0 + cardName: {fileID: 0} + cardImage: {fileID: 5159259897654068178} + canUse: 1 + fun1Image: {fileID: 0} + fun2Image: {fileID: 0} + fun3Image: {fileID: 0} + successCondition: {fileID: -1410864517, guid: e1b9157641a477c4eaca52a6c7ae4185, + type: 3} + unsuccessCondition: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe, + type: 3} + fun1Val: {fileID: 0} + fun2Val: {fileID: 0} + fun3Val: {fileID: 0} + smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, + type: 3} + noSmallCard: 0 + noSyncText: 0 + conditionList: + - {fileID: 4398690247767463098} + - {fileID: 5970626616650445913} + - {fileID: 7367770060306744678} + trueFun: {fileID: 688789690455570313} + trueFunPrefab: {fileID: 4818544559399868804, guid: 98bfb86ee08b4924e8175b9d6145957d, + type: 3} + nodeColorResultFrame: {fileID: 3177769488067894455} + nodeColorResultImage: {fileID: 2948337350984551391, guid: f5592fae7d00e404586800947db445f2, + type: 3} + castRange: {fileID: 5584794665957624749} + colorConditon: {fileID: 4414271769496108467, guid: 1fd0d425cafce3f4588b40c9cfe1ac25, + type: 3} + cardDataSummary: {fileID: 688789690455570313} +--- !u!114 &5545682449418996990 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4109686459493091903} - 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: 3580920933959011654} - 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.8369, y: -1.8462} - m_SizeDelta: {x: 18.0408, y: 206.3964} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9039797454776279552 -CanvasRenderer: + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80971e1d1b78104439c3472d4276e502, type: 3} + m_Name: + m_EditorClassIdentifier: + originalParent: {fileID: 0} + originalpoint: {x: 0, y: 0, z: 0} + originalIndexInChild: 0 + eventSystem: {fileID: 0} + canUse: 1 + ainPanle: {fileID: 5174392397216232880} + currentNode: {fileID: 0} + dragState: 3 + ready: 0 + castingPool: [] + layerMask: + serializedVersion: 2 + m_Bits: 64 + cardOnMouseEnter: {fileID: 0} +--- !u!225 &7526181906643281268 +CanvasGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4109686459493091903} - m_CullTransparentMesh: 1 ---- !u!114 &8298135406204277643 + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &7619122435525404041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 523596fd7703bbe44a0c37d83fd5c880, type: 3} + m_Name: + m_EditorClassIdentifier: + oringinIndex: 0 + cardDrag: {fileID: 0} + targetScale: {x: 0, y: 0, z: 0} + originScale: {x: 0, y: 0, z: 0} + speed: 4 + moveOffset: 50 + originPoint: {x: 0, y: 0, z: 0} + UpperOffset: {x: 0, y: 115, z: 0} + originRotation: {x: 0, y: 0, z: 0} +--- !u!114 &8541537608814013155 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4109686459493091903} + m_GameObject: {fileID: 4169693119190854323} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2213389614096314727} + m_OnClick: m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -38845363, guid: 1a379197f4a248348889f3c0233f5c99, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4117916497485004965 + m_Calls: + - m_Target: {fileID: 552322036273091990} + m_TargetAssemblyTypeName: RewardCardNode, Assembly-CSharp + m_MethodName: RewardCardToDeck + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &552322036273091990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a52df32d6b281b4c80de6a8b468bc2f, type: 3} + m_Name: + m_EditorClassIdentifier: + cardID: + rewardTip: {fileID: 0} +--- !u!1 &4343990849769966524 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -390,78 +519,75 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6634975291145204097} - - component: {fileID: 4449309987271992678} - - component: {fileID: 6579321131344194404} + - component: {fileID: 66461956134587324} + - component: {fileID: 9073797113623819660} + - component: {fileID: 4177469149448917414} m_Layer: 5 - m_Name: CardDescription + m_Name: CastRangePanel m_TagString: Card m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6634975291145204097 +--- !u!224 &66461956134587324 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4117916497485004965} + m_GameObject: {fileID: 4343990849769966524} 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: 112866538506733683} + m_Children: + - {fileID: 4872235896629707279} + m_Father: {fileID: 7139562062302679022} 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: 2.9199, y: -55.779} - m_SizeDelta: {x: 89.549, y: 56.809} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4449309987271992678 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -13.4, y: -7.52} + m_SizeDelta: {x: 45, y: 45} + m_Pivot: {x: 0, y: 0} +--- !u!222 &9073797113623819660 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4117916497485004965} + m_GameObject: {fileID: 4343990849769966524} m_CullTransparentMesh: 1 ---- !u!114 &6579321131344194404 +--- !u!114 &4177469149448917414 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4117916497485004965} + m_GameObject: {fileID: 4343990849769966524} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + 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: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 10 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u529B\u9053\u4E2D\u7B49\u7684\u666E\u901A\u653B\u51FB\uFF0C\u9020\u621010\u70B9\u4F24\u5BB3\u5E76\u5C06\u5468\u56F4\u4E09\u683C\u67D3\u8272" ---- !u!1 &4464598393214348217 + m_Sprite: {fileID: 21300000, guid: 60dd2c714dd7ac548af3feab06a58487, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4398690247767463098 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -469,50 +595,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8062176084904280992} - - component: {fileID: 1132982714101388395} - - component: {fileID: 7593374307494910140} - m_Layer: 5 - m_Name: DescriptionBackBoard + - component: {fileID: 8989630736753615331} + - component: {fileID: 3754643477587389603} + - component: {fileID: 6002022395324240266} + - component: {fileID: 8883537695841318699} + m_Layer: 0 + m_Name: condition1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8062176084904280992 +--- !u!224 &8989630736753615331 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4464598393214348217} + m_GameObject: {fileID: 4398690247767463098} 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: 112866538506733683} + m_Father: {fileID: 7139562062302679022} 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.5903, y: -40.819817} - m_SizeDelta: {x: 89.2419, y: 81.6406} + m_AnchoredPosition: {x: -0.000012636, y: -32.199997} + m_SizeDelta: {x: 95.148, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1132982714101388395 +--- !u!222 &3754643477587389603 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4464598393214348217} + m_GameObject: {fileID: 4398690247767463098} m_CullTransparentMesh: 1 ---- !u!114 &7593374307494910140 +--- !u!114 &6002022395324240266 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4464598393214348217} + m_GameObject: {fileID: 4398690247767463098} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -520,13 +647,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + 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: 318835818, guid: 0822b301aca3f68409134d4f57612742, type: 3} + m_Sprite: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -536,7 +663,31 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4574127077892613365 +--- !u!114 &8883537695841318699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4398690247767463098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: -1 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 15, y: 16} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 +--- !u!1 &5174392397216232880 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -544,66 +695,66 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3580920933959011654} - - component: {fileID: 464082511877366754} - - component: {fileID: 5476584090117112269} + - component: {fileID: 5891999358152162990} + - component: {fileID: 5304992815847150061} + - component: {fileID: 1230043771585378953} + - component: {fileID: 4530502908829594795} m_Layer: 5 - m_Name: TopBorder + m_Name: AimPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3580920933959011654 + m_IsActive: 0 +--- !u!224 &5891999358152162990 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4574127077892613365} + m_GameObject: {fileID: 5174392397216232880} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 6771572773922174228} - m_Father: {fileID: 6088194398582117394} + m_Children: [] + m_Father: {fileID: 7139562062302679022} 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.8811469, y: 18.575363} - m_SizeDelta: {x: 147.36, y: 219.15} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &464082511877366754 + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5304992815847150061 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4574127077892613365} + m_GameObject: {fileID: 5174392397216232880} m_CullTransparentMesh: 1 ---- !u!114 &5476584090117112269 +--- !u!114 &1230043771585378953 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4574127077892613365} + m_GameObject: {fileID: 5174392397216232880} 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_Color: {r: 1, g: 1, b: 1, a: 0.392} + 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: [] - m_Sprite: {fileID: -767124711, guid: 7af48fcde55284c40b53d553f7083079, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -612,86 +763,25 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4628573578673898890 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7579548714595582098} - - component: {fileID: 5503415268052443796} - - component: {fileID: 3546705485501219580} - m_Layer: 5 - m_Name: SendRangText - m_TagString: Card - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7579548714595582098 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4628573578673898890} - 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: 3603043219975788727} - 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.000023841858, y: -11.25} - m_SizeDelta: {x: 20.239, y: 22.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5503415268052443796 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4628573578673898890} - m_CullTransparentMesh: 1 ---- !u!114 &3546705485501219580 +--- !u!114 &4530502908829594795 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4628573578673898890} + m_GameObject: {fileID: 5174392397216232880} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: 2dea2a5cfc33ee743a3afdfa030e52bc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 15 - 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: 1 ---- !u!1 &4791309908999584338 + arrowHeadPrefab: {fileID: 7429868863709343630, guid: f0b0ec00983ab49438a78adf75c2694c, + type: 3} + arrowNodePrefab: {fileID: 5422017731306186776, guid: 75f6f4f191fef2941a9c8f90833afbbf, + type: 3} + arrowNodeNum: 10 + scaleFactor: 0.5 +--- !u!1 &5970626616650445913 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -699,50 +789,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8005142546255168989} - - component: {fileID: 2782494964245741254} - - component: {fileID: 3259711102088257709} - m_Layer: 5 - m_Name: CardIcon - m_TagString: Card + - component: {fileID: 7708569023393197294} + - component: {fileID: 5787701428816686695} + - component: {fileID: 5392165220136475930} + - component: {fileID: 2647841805185336433} + m_Layer: 0 + m_Name: condition2 + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8005142546255168989 +--- !u!224 &7708569023393197294 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4791309908999584338} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 5970626616650445913} + 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: 112866538506733683} + m_Father: {fileID: 7139562062302679022} 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.00079345703, y: 39.51658} - m_SizeDelta: {x: 100, y: 80.7449} + m_AnchoredPosition: {x: -0.000012636, y: -52.52} + m_SizeDelta: {x: 95.148, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2782494964245741254 +--- !u!222 &5787701428816686695 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4791309908999584338} + m_GameObject: {fileID: 5970626616650445913} m_CullTransparentMesh: 1 ---- !u!114 &3259711102088257709 +--- !u!114 &5392165220136475930 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4791309908999584338} + m_GameObject: {fileID: 5970626616650445913} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -752,11 +843,11 @@ MonoBehaviour: 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: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 182c3c1bcddd9bd4a86cdaaf70e3d6b0, type: 3} + m_Sprite: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -766,7 +857,31 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4970746484562458087 +--- !u!114 &2647841805185336433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5970626616650445913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: -1 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 15, y: 16} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 +--- !u!1 &6018557167984620928 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -774,66 +889,65 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1439219356259293164} - - component: {fileID: 778393854169630565} - - component: {fileID: 5697059619970738035} - - component: {fileID: 2447622485407912730} + - component: {fileID: 8417263142375954454} + - component: {fileID: 6630524511444619868} + - component: {fileID: 3893753280325337861} m_Layer: 5 - m_Name: AimPanel + m_Name: TopBorder m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1439219356259293164 + m_IsActive: 1 +--- !u!224 &8417263142375954454 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4970746484562458087} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 6018557167984620928} + 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: 6088194398582117394} + m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &778393854169630565 + m_SizeDelta: {x: 132, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6630524511444619868 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4970746484562458087} + m_GameObject: {fileID: 6018557167984620928} m_CullTransparentMesh: 1 ---- !u!114 &5697059619970738035 +--- !u!114 &3893753280325337861 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4970746484562458087} + m_GameObject: {fileID: 6018557167984620928} 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.392} + 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: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -1380875850, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -842,25 +956,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2447622485407912730 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4970746484562458087} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2dea2a5cfc33ee743a3afdfa030e52bc, type: 3} - m_Name: - m_EditorClassIdentifier: - arrowHeadPrefab: {fileID: 7429868863709343630, guid: f0b0ec00983ab49438a78adf75c2694c, - type: 3} - arrowNodePrefab: {fileID: 5422017731306186776, guid: 75f6f4f191fef2941a9c8f90833afbbf, - type: 3} - arrowNodeNum: 10 - scaleFactor: 0.5 ---- !u!1 &5075253914794117200 +--- !u!1 &6052323990296705033 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -868,78 +964,78 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4796946214172175014} - - component: {fileID: 3411625519713267366} - - component: {fileID: 8791657407579364904} + - component: {fileID: 1855824799099284199} + - component: {fileID: 6418759718487919919} + - component: {fileID: 2839742468483413986} m_Layer: 5 - m_Name: EffectRangText + m_Name: CostText m_TagString: Card m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4796946214172175014 +--- !u!224 &1855824799099284199 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5075253914794117200} - 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_GameObject: {fileID: 6052323990296705033} + m_LocalRotation: {x: 0, y: 0, z: -0.073499195, w: 0.99729526} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 0.1, y: 0.12, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3603043219975788727} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Father: {fileID: 8507021733924720450} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -8.43} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.000015258789, y: 12.259901} - m_SizeDelta: {x: 17.977, y: 24.8279} + m_AnchoredPosition: {x: -1.6, y: 1.3} + m_SizeDelta: {x: 450, y: 450} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3411625519713267366 +--- !u!222 &6418759718487919919 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5075253914794117200} + m_GameObject: {fileID: 6052323990296705033} m_CullTransparentMesh: 1 ---- !u!114 &8791657407579364904 +--- !u!114 &2839742468483413986 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5075253914794117200} + m_GameObject: {fileID: 6052323990296705033} 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.19607843, g: 0.19607843, b: 0.19607843, a: 1} + 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: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 15 - m_FontStyle: 1 + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 170 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 - m_MaxSize: 40 + m_MaxSize: 170 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 3 ---- !u!1 &5462301247461204410 + m_Text: 1 +--- !u!1 &7367770060306744678 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -947,78 +1043,99 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 928194122518202843} - - component: {fileID: 6869129759814513598} - - component: {fileID: 5904868573995996698} - m_Layer: 5 - m_Name: CardName - m_TagString: Card + - component: {fileID: 7083643264776544898} + - component: {fileID: 6495211555079877352} + - component: {fileID: 1878412079889438759} + - component: {fileID: 6664117381034053926} + m_Layer: 0 + m_Name: condition3 + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &928194122518202843 +--- !u!224 &7083643264776544898 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5462301247461204410} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 7367770060306744678} + 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: 112866538506733683} + m_Father: {fileID: 7139562062302679022} 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.00093412, y: -17.750097} - m_SizeDelta: {x: 95.387, y: 19.2492} + m_AnchoredPosition: {x: -0.000012636, y: -72.99999} + m_SizeDelta: {x: 95.148, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6869129759814513598 +--- !u!222 &6495211555079877352 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5462301247461204410} + m_GameObject: {fileID: 7367770060306744678} m_CullTransparentMesh: 1 ---- !u!114 &5904868573995996698 +--- !u!114 &1878412079889438759 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5462301247461204410} + m_GameObject: {fileID: 7367770060306744678} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + 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: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 15 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u666E\u901A\u653B\u51FB" ---- !u!1 &6007039648128040781 + m_Sprite: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6664117381034053926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367770060306744678} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: -1 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 15, y: 16} + m_Spacing: {x: -2, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 +--- !u!1 &8081948450419621271 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1026,176 +1143,78 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6088194398582117394} - - component: {fileID: 4229757852823531479} - - component: {fileID: 7482239616752544677} - - component: {fileID: 7054367620093924515} - - component: {fileID: 6879114303616746767} - - component: {fileID: 5958595321674720040} + - component: {fileID: 4872235896629707279} + - component: {fileID: 7985228304631699869} + - component: {fileID: 5584794665957624749} m_Layer: 5 - m_Name: Card_v02_OnlyChooseUI + m_Name: CastRangeText m_TagString: Card m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6088194398582117394 +--- !u!224 &4872235896629707279 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6007039648128040781} + m_GameObject: {fileID: 8081948450419621271} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1439219356259293164} - - {fileID: 112866538506733683} - - {fileID: 1468542541505241226} - - {fileID: 3580920933959011654} - - {fileID: 3450981793660124756} - - {fileID: 3603043219975788727} - m_Father: {fileID: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 66461956134587324} 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: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -2.1000004, y: 0.00001335144} + m_SizeDelta: {x: 450, y: 450} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4229757852823531479 +--- !u!222 &7985228304631699869 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6007039648128040781} + m_GameObject: {fileID: 8081948450419621271} m_CullTransparentMesh: 1 ---- !u!114 &7482239616752544677 +--- !u!114 &5584794665957624749 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6007039648128040781} + m_GameObject: {fileID: 8081948450419621271} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + 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_Color: {r: 0.3679245, g: 0.3679245, b: 0.3679245, 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_Sprite: {fileID: -724633554, guid: c861ddefe26cc154e8de878c8bb9a40b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!225 &7054367620093924515 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6007039648128040781} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &6879114303616746767 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6007039648128040781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c3237ec859125a24a8de6cc0ccd79d00, type: 3} - m_Name: - m_EditorClassIdentifier: - cardId: 0 - cost: {fileID: 8516076965598280747} - cardIndex: 0 - cardDescription: {fileID: 6579321131344194404} - cardName: {fileID: 5904868573995996698} - cardImage: {fileID: 3259711102088257709} - costEnough: 1 - currentRewardCardTip: {fileID: 0} - canSale: 1 - price: 0 - discount: 0 - priceText: {fileID: 0} - saledIcon: {fileID: 0} ---- !u!114 &5958595321674720040 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6007039648128040781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7482239616752544677} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 6879114303616746767} - m_TargetAssemblyTypeName: CardDataForChooseUI, Assembly-CSharp - m_MethodName: ReturnSelectedDeleteIndex - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!1 &8741426241935460974 + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 200 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 200 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1 +--- !u!1 &8951318475869846370 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1203,74 +1222,70 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6135546373982555227} - - component: {fileID: 7720454113523540780} - - component: {fileID: 8516076965598280747} + - component: {fileID: 1083118128749949784} + - component: {fileID: 2748996186627099962} + - component: {fileID: 5159259897654068178} m_Layer: 5 - m_Name: CostText + m_Name: CardIcon m_TagString: Card m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6135546373982555227 +--- !u!224 &1083118128749949784 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8741426241935460974} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 8951318475869846370} + 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: 3450981793660124756} + m_Father: {fileID: 7139562062302679022} 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: 0} - m_SizeDelta: {x: 45, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7720454113523540780 + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -19.7} + m_SizeDelta: {x: 90, y: 90} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2748996186627099962 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8741426241935460974} + m_GameObject: {fileID: 8951318475869846370} m_CullTransparentMesh: 1 ---- !u!114 &8516076965598280747 +--- !u!114 &5159259897654068178 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8741426241935460974} + m_GameObject: {fileID: 8951318475869846370} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + 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: 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: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 1 + m_Sprite: {fileID: 677644212, guid: c0cdeb5700cf9a440a32d3f1466d5f75, 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/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.3-Common.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.3-Common.prefab.meta new file mode 100644 index 00000000..c42b7943 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.3-Common.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bde7b0a7c5fcf7145b84c1f52cb5dabc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Fun/NodeForSummary.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Fun/NodeForSummary.prefab index 80fa22bd..ebf923fe 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Fun/NodeForSummary.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Fun/NodeForSummary.prefab @@ -31,12 +31,13 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 8458917067245679644} + - {fileID: 7939080871448022204} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 7, y: -7.9000244} - m_SizeDelta: {x: 7.5, y: 7.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 23, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &819172502198749263 CanvasRenderer: @@ -60,7 +61,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -111,7 +112,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 230, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4042538890853660972 CanvasRenderer: @@ -135,19 +136,19 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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: 80 + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 160 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 220 + m_MaxSize: 300 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -155,3 +156,78 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 1 +--- !u!1 &3091641592789669261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7939080871448022204} + - component: {fileID: 5048468929479509903} + - component: {fileID: 6174348204424421663} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7939080871448022204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3091641592789669261} + 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: 8352083469037628100} + 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 &5048468929479509903 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3091641592789669261} + m_CullTransparentMesh: 1 +--- !u!114 &6174348204424421663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3091641592789669261} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 1826802122, guid: 7eec0ec9fd6052f4da1721b15cb450c5, 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/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/CardSaleNode.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/CardSaleNode.prefab index f3df8724..ac2ff696 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/CardSaleNode.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/CardSaleNode.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 5ff0e472e77d92047aaf4e4de3f60eb6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -221,7 +221,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/RelicSaleNode.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/RelicSaleNode.prefab index b16b5d9c..557f5859 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/RelicSaleNode.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/RelicSaleNode.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 5ff0e472e77d92047aaf4e4de3f60eb6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab.meta similarity index 77% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop.meta rename to ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab.meta index 26bed3c9..08b1a564 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop.meta +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c2b451633a3769042be3e29875748a4a +guid: 09cd70864cfb8ec4f83b6305f100454f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab/Tip.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab/Tip.prefab new file mode 100644 index 00000000..140c1da4 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab/Tip.prefab @@ -0,0 +1,173 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5497472336870809299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3764179499350328605} + - component: {fileID: 3624012971965434372} + - component: {fileID: 280194952009065439} + - component: {fileID: 7808846309543892925} + m_Layer: 5 + m_Name: Tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3764179499350328605 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5497472336870809299} + 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: 3063730107973493407} + m_Father: {fileID: 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3624012971965434372 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5497472336870809299} + m_CullTransparentMesh: 1 +--- !u!114 &280194952009065439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5497472336870809299} + 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: 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!114 &7808846309543892925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5497472336870809299} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ec528580423c754aa901f44d3231b5c, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 2323097163249105677} + fadeSpeed: 1 + startFadeTime: 1 +--- !u!1 &7610608083571596301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3063730107973493407} + - component: {fileID: 2167812618046495212} + - component: {fileID: 2323097163249105677} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3063730107973493407 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7610608083571596301} + 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: 3764179499350328605} + 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 &2167812618046495212 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7610608083571596301} + m_CullTransparentMesh: 1 +--- !u!114 &2323097163249105677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7610608083571596301} + 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.19607843, g: 0.19607843, b: 0.19607843, 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: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab/Tip.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab/Tip.prefab.meta new file mode 100644 index 00000000..5f6a2c92 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab/Tip.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e0a60d1ef5f1bbf40b92eefa1fee8d16 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 313bb89c..576420b6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -13176,6 +13176,106 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 704929075} m_CullTransparentMesh: 1 +--- !u!1 &709798418 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 709798419} + - component: {fileID: 709798422} + - component: {fileID: 709798421} + - component: {fileID: 709798420} + m_Layer: 5 + m_Name: TipFather + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &709798419 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 709798418} + 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: 789990414} + 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: -4.3796, y: 500} + m_SizeDelta: {x: 540.0161, y: 373.4404} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &709798420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 709798418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 7 + m_StartCorner: 2 + m_StartAxis: 1 + m_CellSize: {x: 500, y: 100} + m_Spacing: {x: 0, y: 0} + m_Constraint: 1 + m_ConstraintCount: 1 +--- !u!114 &709798421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 709798418} + 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!222 &709798422 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 709798418} + m_CullTransparentMesh: 1 --- !u!1 &725512355 GameObject: m_ObjectHideFlags: 0 @@ -14126,6 +14226,121 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &789990413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 789990414} + - component: {fileID: 789990417} + - component: {fileID: 789990416} + - component: {fileID: 789990415} + - component: {fileID: 789990418} + m_Layer: 5 + m_Name: TipsCanves + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &789990414 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789990413} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 709798419} + m_Father: {fileID: 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &789990415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789990413} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &789990416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789990413} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &789990417 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789990413} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &789990418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789990413} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37a25d73d3b60b74b9a1135e0228a764, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &791443577 GameObject: m_ObjectHideFlags: 0 @@ -18803,11 +19018,11 @@ MonoBehaviour: potionTipIcon: {fileID: 21300000, guid: 0f0274fed944193419950861f0f57273, type: 3} rewardsList: [] cardRewardList: [] - cardPrefabCommon: {fileID: 4169693119190854323, guid: c0b7ece12d08c994c8148e8c99779e95, + cardPrefabCommon: {fileID: 4169693119190854323, guid: bde7b0a7c5fcf7145b84c1f52cb5dabc, type: 3} - cardPrefabLegendary: {fileID: 4169693119190854323, guid: c0b7ece12d08c994c8148e8c99779e95, + cardPrefabLegendary: {fileID: 4169693119190854323, guid: bde7b0a7c5fcf7145b84c1f52cb5dabc, type: 3} - cardPrefabRare: {fileID: 4169693119190854323, guid: c0b7ece12d08c994c8148e8c99779e95, + cardPrefabRare: {fileID: 4169693119190854323, guid: bde7b0a7c5fcf7145b84c1f52cb5dabc, type: 3} cardChoosePanleFather: {fileID: 125896954} cardChoosePanlePrefab: {fileID: 589092828266680353, guid: eb223c06382861e4486db9aa6bb52050, @@ -29611,11 +29826,11 @@ MonoBehaviour: cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2} relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2} colorSortList: 010000000300000004000000 - commonCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, + commonCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, type: 3} - legendaryCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, + legendaryCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, type: 3} - rareCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, + rareCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, type: 3} --- !u!4 &1690695890 Transform: @@ -30721,7 +30936,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1750187012 RectTransform: m_ObjectHideFlags: 0 @@ -30806,6 +31021,53 @@ Canvas: m_SortingLayerID: 801241541 m_SortingOrder: 2 m_TargetDisplay: 0 +--- !u!1 &1751203282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1751203284} + - component: {fileID: 1751203283} + m_Layer: 0 + m_Name: TipManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1751203283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751203282} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee87c15a64f613844a87d107810032fd, type: 3} + m_Name: + m_EditorClassIdentifier: + tipFather: {fileID: 709798419} + tipContainer: {fileID: 5497472336870809299, guid: e0a60d1ef5f1bbf40b92eefa1fee8d16, + type: 3} +--- !u!4 &1751203284 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751203282} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.84116334, y: 2.8039339, z: -1.2433522} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1755253523 GameObject: m_ObjectHideFlags: 0 @@ -39765,3 +40027,5 @@ SceneRoots: - {fileID: 992566371} - {fileID: 395072433} - {fileID: 2068068679} + - {fileID: 789990414} + - {fileID: 1751203284} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity index 9c7e28bd..c09d94a5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity @@ -4848,7 +4848,7 @@ MonoBehaviour: m_Top: 7 m_Bottom: 0 m_ChildAlignment: 0 - m_StartCorner: 0 + m_StartCorner: 1 m_StartAxis: 0 m_CellSize: {x: 125, y: 200} m_Spacing: {x: 25, y: 100} @@ -5903,7 +5903,7 @@ MonoBehaviour: m_Top: 23 m_Bottom: 0 m_ChildAlignment: 0 - m_StartCorner: 0 + m_StartCorner: 1 m_StartAxis: 0 m_CellSize: {x: 124.64, y: 200} m_Spacing: {x: 25, y: 100} @@ -19437,8 +19437,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 378950670} - {fileID: 498734651} + - {fileID: 378950670} - {fileID: 866545451} - {fileID: 2004000271} - {fileID: 1083918071} @@ -27663,6 +27663,8 @@ MonoBehaviour: fun1Image: {fileID: 1339408805429835354} fun2Image: {fileID: 5226070091664710168} fun3Image: {fileID: 4924132909977853743} + successCondition: {fileID: 0} + unsuccessCondition: {fileID: 0} fun1Val: {fileID: 5204618098417416137} fun2Val: {fileID: 534906922457473645} fun3Val: {fileID: 8606927767695806529} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity index fd78d1ba..9272741b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity @@ -277,6 +277,168 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 52975079} m_CullTransparentMesh: 1 +--- !u!1 &61966376 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 61966381} + - component: {fileID: 61966380} + - component: {fileID: 61966379} + - component: {fileID: 61966378} + - component: {fileID: 61966377} + m_Layer: 5 + m_Name: TipsCanves + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &61966377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61966376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37a25d73d3b60b74b9a1135e0228a764, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &61966378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61966376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &61966379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61966376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &61966380 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61966376} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &61966381 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61966376} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 985714519} + m_Father: {fileID: 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &146625438 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 146625440} + - component: {fileID: 146625439} + m_Layer: 0 + m_Name: TipManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &146625439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146625438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee87c15a64f613844a87d107810032fd, type: 3} + m_Name: + m_EditorClassIdentifier: + tipFather: {fileID: 985714519} + tipContainer: {fileID: 5497472336870809299, guid: e0a60d1ef5f1bbf40b92eefa1fee8d16, + type: 3} +--- !u!4 &146625440 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146625438} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.84116334, y: 2.8039339, z: -1.2433522} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &148855150 GameObject: m_ObjectHideFlags: 0 @@ -889,11 +1051,11 @@ MonoBehaviour: cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2} relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2} colorSortList: - commonCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, + commonCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, type: 3} - legendaryCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, + legendaryCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, type: 3} - rareCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, + rareCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, type: 3} --- !u!4 &485170433 Transform: @@ -1219,6 +1381,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 761789730} m_CullTransparentMesh: 1 +--- !u!1 &773472459 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 773472461} + - component: {fileID: 773472460} + m_Layer: 0 + m_Name: CardResourcesManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &773472460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773472459} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 813097672e0cbe3448085cac4e3c47da, type: 3} + m_Name: + m_EditorClassIdentifier: + redNodeImage: {fileID: 21300000, guid: 981748b12f9371548b9c69073d83825d, type: 3} + blueNodeImage: {fileID: 21300000, guid: 260856292e6be62478629aebcd8d10a9, type: 3} + greenNodeImage: {fileID: 21300000, guid: cc399ccd6a80e2348bd7fecba8788159, type: 3} + whiteNodeImage: {fileID: 21300000, guid: 9eb1fbe667c110142a3ea9eeb798e869, type: 3} + blackNodeImage: {fileID: 21300000, guid: 0974efc85d0f5e4499e4e8268b66cc08, type: 3} + attack: {fileID: 2089713304, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + shield: {fileID: 298242201, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + step: {fileID: -1638093221, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + weak: {fileID: 1313707503, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + wet: {fileID: 807148770, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + costRestore: {fileID: 587810021, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + drawCard: {fileID: 162605382, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + posion: {fileID: -1661284519, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + vulnerable: {fileID: 30630105, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + fireSeed: {fileID: 562257326, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + imageInCondition: {fileID: 2948337350984551391, guid: f4c36c2c021e0954897974b7ad041903, + type: 3} + textInCondition: {fileID: 2195466461428280820, guid: ef66a5db78741da4d93f90fcdcb7176a, + type: 3} +--- !u!4 &773472461 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773472459} + serializedVersion: 2 + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &774346661 GameObject: m_ObjectHideFlags: 0 @@ -1400,6 +1625,106 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &985714518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 985714519} + - component: {fileID: 985714522} + - component: {fileID: 985714521} + - component: {fileID: 985714520} + m_Layer: 5 + m_Name: TipFather + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &985714519 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 985714518} + 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: 61966381} + 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: -4.3796, y: 500} + m_SizeDelta: {x: 540.0161, y: 373.4404} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &985714520 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 985714518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 7 + m_StartCorner: 2 + m_StartAxis: 1 + m_CellSize: {x: 500, y: 100} + m_Spacing: {x: 0, y: 0} + m_Constraint: 1 + m_ConstraintCount: 1 +--- !u!114 &985714521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 985714518} + 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!222 &985714522 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 985714518} + m_CullTransparentMesh: 1 --- !u!1 &1080464288 GameObject: m_ObjectHideFlags: 0 @@ -1882,63 +2207,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1322208515 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1322208517} - - component: {fileID: 1322208516} - m_Layer: 0 - m_Name: CardResourcesManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1322208516 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1322208515} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 813097672e0cbe3448085cac4e3c47da, type: 3} - m_Name: - m_EditorClassIdentifier: - redNodeImage: {fileID: 21300000, guid: 981748b12f9371548b9c69073d83825d, type: 3} - blueNodeImage: {fileID: 21300000, guid: 260856292e6be62478629aebcd8d10a9, type: 3} - greenNodeImage: {fileID: 21300000, guid: cc399ccd6a80e2348bd7fecba8788159, type: 3} - whiteNodeImage: {fileID: 21300000, guid: 9eb1fbe667c110142a3ea9eeb798e869, type: 3} - blackNodeImage: {fileID: 21300000, guid: 0974efc85d0f5e4499e4e8268b66cc08, type: 3} - attack: {fileID: 21300000, guid: 3bddb1e29933c8c4eac9f2f054ad43d1, type: 3} - shield: {fileID: 21300000, guid: f570dfeb705959d4d9551aadbb8817d4, type: 3} - step: {fileID: 21300000, guid: 5312c2d969ace5843abc2c7201679b9d, type: 3} - weak: {fileID: 262922594, guid: f9991f9de5deef7488a05908175569c3, type: 3} - imageInCondition: {fileID: 2948337350984551391, guid: f4c36c2c021e0954897974b7ad041903, - type: 3} - textInCondition: {fileID: 2195466461428280820, guid: ef66a5db78741da4d93f90fcdcb7176a, - type: 3} ---- !u!4 &1322208517 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1322208515} - serializedVersion: 2 - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1571871170 GameObject: m_ObjectHideFlags: 0 @@ -3146,4 +3414,6 @@ SceneRoots: - {fileID: 1571871172} - {fileID: 1224874803} - {fileID: 1612287987} - - {fileID: 1322208517} + - {fileID: 773472461} + - {fileID: 146625440} + - {fileID: 61966381} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs index 9b23f0e5..99b6cb52 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs @@ -261,6 +261,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag if (GameManager.Instance.playerState.currentCost - trueCost < 0) { Debug.Log("ò"); + TipManager.Instance.SendTip("ò"); cardEntity.canUse = false; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/InFightLookCardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/InFightLookCardManager.cs index 8f06c5dc..e289ee7d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/InFightLookCardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/InFightLookCardManager.cs @@ -25,7 +25,7 @@ public class InFightLookCardManager : MonoBehaviour for (int i = 0; i < cardList.Count; i++) { - var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform); + var currentCard = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardList[i], transform); currentCard.transform.localScale = cardScale; cardGameObjectList.Add(currentCard); } @@ -48,7 +48,7 @@ public class InFightLookCardManager : MonoBehaviour for (int i = 0; i < cardList.Count; i++) { - var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform); + var currentCard = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardList[i], transform); currentCard.transform.localScale = cardScale; cardGameObjectList.Add(currentCard); } @@ -71,7 +71,7 @@ public class InFightLookCardManager : MonoBehaviour for (int i = 0; i < cardList.Count; i++) { - var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform); + var currentCard = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardList[i], transform); currentCard.transform.localScale = cardScale; cardGameObjectList.Add(currentCard); } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs index 292bf8e2..129e8e13 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs @@ -126,6 +126,7 @@ public class TurnMaster : Singleton if (turn == Turn.enemyTurnBegin) { + //㲥ӿ LegacyManager.Instance.BroadCastSettleInEnemyTurnBegin(); @@ -137,7 +138,7 @@ public class TurnMaster : Singleton { //ȴ׼׶ЧϿʼغ //StartCoroutine(EnemyTurn()); - + //˶ƶͿɫ EnemyManager.Instance.EnemyTurn_Observer(); @@ -167,14 +168,20 @@ public class TurnMaster : Singleton IEnumerator EndPlayerTurnBegin() { turn = Turn.turnStop; + TipManager.Instance.SendTip("һغϣ"); yield return new WaitForSeconds(3.0f); // ȴ3 + + turn = Turn.playerTurn; } IEnumerator WaitEndPlayerTurn() { turn = Turn.turnStop; yield return new WaitUntil(()=>continueTurn ==true ); - yield return new WaitForSeconds(0.5f); + //ʾ + TipManager.Instance.SendTip("˻غϣ"); + + yield return new WaitForSeconds(2.5f); turn = Turn.enemyTurnBegin; } public void EndPlayerTurn() @@ -442,29 +449,30 @@ public class TurnMaster : Singleton public void createCardWithoutMove(int i) { GameObject cardPrefab; - int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[cardDeck.cardList[cardDeck.cardList.Count - 1]].Rarity; - cardPrefab = new GameObject(); - switch (cardRarity) - { - case Name.CardRarity.Legendary: - cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform); - break; - case Name.CardRarity.Rare: - cardPrefab = Instantiate(cardDeck.rareCardPrefab, handCard.cardPanle.transform); - break; - case Name.CardRarity.Common: - cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform); - break; - } -/* if (cardRarity == Name.CardRarity.Legendary) - { - cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform); - } - else - { - cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform); - }*/ - + cardPrefab = Instantiate(cardDeck.rareCardPrefab, handCard.cardPanle.transform); + /* int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[cardDeck.cardList[cardDeck.cardList.Count - 1]].Rarity; + cardPrefab = new GameObject(); + switch (cardRarity) + { + case Name.CardRarity.Legendary: + cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform); + break; + case Name.CardRarity.Rare: + cardPrefab = Instantiate(cardDeck.rareCardPrefab, handCard.cardPanle.transform); + break; + case Name.CardRarity.Common: + cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform); + break; + } + if (cardRarity == Name.CardRarity.Legendary) + { + cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform); + } + else + { + cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform); + } + */ cardPrefab.GetComponent().localEulerAngles = new Vector3(0, 0, 0); CardEntity cardEntity = cardPrefab.GetComponent(); cardEntity.createCard(cardDeck.cardList[cardDeck.cardList.Count - 1], i,true); @@ -472,28 +480,4 @@ public class TurnMaster : Singleton handCard.cardEntityList.Add(cardEntity); } - - public GameObject CreateCardWithIDForLook(string id,Transform cardFrather) - { - GameObject cardPrefab; - cardPrefab = new GameObject(); - int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[id].Rarity; - switch (cardRarity) - { - case Name.CardRarity.Legendary: - cardPrefab = Instantiate(PlayerStatsManager .Instance.legendaryCardForLook, cardFrather); - break; - case Name.CardRarity.Rare: - cardPrefab = Instantiate(PlayerStatsManager.Instance.rareCardForLook, cardFrather); - break; - case Name.CardRarity.Common: - cardPrefab = Instantiate(PlayerStatsManager.Instance.commonCardForLook, cardFrather); - break; - } - cardPrefab.GetComponent().localEulerAngles = new Vector3(0, 0, 0); - CardEntity cardEntity = cardPrefab.GetComponent(); - cardEntity.createCard(id, 0,false); - - return cardPrefab; - } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs index 868b45af..ebb8172e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs @@ -126,20 +126,7 @@ public class RewardManager : Singleton public GameObject CreateCardWithIDForReward(string id, Transform cardFrather) { GameObject cardPrefab; - cardPrefab = new GameObject(); - int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[id].Rarity; - switch (cardRarity) - { - case Name.CardRarity.Legendary: - cardPrefab = Instantiate(cardPrefabLegendary, cardFrather); - break; - case Name.CardRarity.Rare: - cardPrefab = Instantiate(cardPrefabRare, cardFrather); - break; - case Name.CardRarity.Common: - cardPrefab = Instantiate(cardPrefabCommon, cardFrather); - break; - } + cardPrefab = Instantiate(cardPrefabCommon, cardFrather); cardPrefab.GetComponent().localEulerAngles = new Vector3(0, 0, 0); CardEntity cardEntity = cardPrefab.GetComponent(); cardEntity.createCard(id, 0,false); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs index 1e2aa5e7..2e1b93d1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs @@ -6,7 +6,7 @@ public class LegacyNode_DamagedBag : LegacyNode { public override void OnGet() { - GameManager.Instance.playerState.cardRewardNumToChoose -= 2; - GameManager.Instance.playerState.maxCost ++; + PlayerStatsManager .Instance.playerState.cardRewardNumToChoose -= 2; + PlayerStatsManager .Instance.playerState.maxCost ++; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_StrongBody.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_StrongBody.cs index 12ffc44b..5616686d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_StrongBody.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_StrongBody.cs @@ -6,9 +6,9 @@ public class LegacyNode_StrongBody : LegacyNode { public override void OnGet() { - int upHp = (int)(GameManager.Instance.playerState.maxHP * 0.2f); - GameManager.Instance.playerState.maxHP += upHp; - GameManager.Instance.playerState.currentHP += upHp; + int upHp = (int)(PlayerStatsManager .Instance.playerState.maxHP * 0.2f); + PlayerStatsManager .Instance.playerState.maxHP += upHp; + PlayerStatsManager.Instance.playerState.currentHP += upHp; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs index 1e78ee13..169c75f9 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs @@ -46,6 +46,7 @@ public class LegacyManager : Singleton method.Invoke(legacyClass, parameters ); relicClassNameList.Add(className); + } public void ShowLegacyClassAsOwned() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs index 9c88cbe8..dc1adc0c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs @@ -98,20 +98,7 @@ public class PlayerStatsManager : Singleton public GameObject CreateCardWithIDForLook(string id, Transform cardFrather) { GameObject cardPrefab; - cardPrefab = new GameObject(); - int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[id].Rarity; - switch (cardRarity) - { - case Name.CardRarity.Legendary: - cardPrefab = Instantiate(PlayerStatsManager.Instance.legendaryCardForLook, cardFrather); - break; - case Name.CardRarity.Rare: - cardPrefab = Instantiate(PlayerStatsManager.Instance.rareCardForLook, cardFrather); - break; - case Name.CardRarity.Common: - cardPrefab = Instantiate(PlayerStatsManager.Instance.commonCardForLook, cardFrather); - break; - } + cardPrefab = Instantiate(commonCardForLook, cardFrather); cardPrefab.GetComponent().localEulerAngles = new Vector3(0, 0, 0); CardEntity cardEntity = cardPrefab.GetComponent(); cardEntity.createCard(id, 0, false); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/CardSaleNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/CardSaleNode.cs index 63f710b0..ab91396b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/CardSaleNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/CardSaleNode.cs @@ -1,9 +1,11 @@ using System.Collections; using System.Collections.Generic; +using Unity.VisualScripting; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.UI; -public class CardSaleNode : MonoBehaviour +public class CardSaleNode : MonoBehaviour,IPointerEnterHandler ,IPointerExitHandler { public int price=100; public Text priceText; @@ -16,9 +18,29 @@ public class CardSaleNode : MonoBehaviour ShopManager.Instance.cardDeck.Add(cardID); ShopManager.Instance.playerState.money -= price; saledMark.SetActive(true); + transform .GetChild (0).gameObject .SetActive(false); + transform.localScale = new Vector3(1, 1, 1); + TipManager.Instance.SendTip("ɹ"); + } + else + { + TipManager.Instance.SendTip("Ҳ"); } - // AudioManager.Instance.BuyVoicePlayer(); } + public void OnPointerEnter(PointerEventData eventData) + { + if(saledMark.activeInHierarchy ==false ) + transform.localScale = new Vector3(1.4f, 1.4f, 1.4f); + } + public void OnPointerExit(PointerEventData eventData) + { + transform.localScale = new Vector3(1, 1, 1); + + } + + + + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs index 48c9fa9c..b4907067 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs @@ -13,9 +13,14 @@ public class RelicSaleNode : MonoBehaviour { if (ShopManager.Instance.playerState.money >= price) { - + LegacyManager.Instance.CreateLegacyClassAsNew(relicName); ShopManager.Instance.playerState.money -= price; saledMark.SetActive(true); + TipManager.Instance.SendTip("ɹ"); + } + else + { + TipManager.Instance.SendTip("Ҳ"); } // diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs index b893fa52..ee0121ec 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs @@ -120,7 +120,7 @@ public class ShopManager : Singleton { for(int i=0;i< 3;i++) { - int cardId = (int)Random.Range(1001, 1004); + int cardId = (int)Random.Range(1010, 1037); var currentSaleCardNode = Instantiate(saleCardNode, cardFather1); var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardId.ToString(), currentSaleCardNode.transform); card.transform.localPosition = new Vector3(0, 0, 0); @@ -129,7 +129,7 @@ public class ShopManager : Singleton } for (int i = 0; i < 3; i++) { - int cardId = (int)Random.Range(1001, 1004); + int cardId = (int)Random.Range(1010, 1037); var currentSaleCardNode = Instantiate(saleCardNode, cardFather2); var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardId.ToString(), currentSaleCardNode.transform); card.transform.localPosition = new Vector3(0, 0, 0); @@ -137,7 +137,7 @@ public class ShopManager : Singleton currentSaleCardNode.GetComponent().cardID = cardId.ToString(); } //ɫ - int noneColorCardId = (int)Random.Range(1001, 1004); + int noneColorCardId = (int)Random.Range(1010, 1037); var noneColorCardNode = Instantiate(saleCardNode, cardNoneColorFather); var noneColorCard = PlayerStatsManager.Instance.CreateCardWithIDForLook(noneColorCardId.ToString(), noneColorCardNode.transform); noneColorCard.transform.localPosition = new Vector3(0, 0, 0); @@ -164,6 +164,7 @@ public class ShopManager : Singleton { var relic = LegacyManager.Instance.ShowRelicAsSale(relicSaleNodePrefab, relicClassName[i],relicSaleFather); RelicSaleNode relicSaleNode = relic.GetComponent(); + relicSaleNode .relicName = relicClassName[i]; relicSaleNodesList.Add(relicSaleNode); } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tips.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips.meta new file mode 100644 index 00000000..cead5694 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 998e51a8d6db3f746bf58d173eea1edb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipManager.cs new file mode 100644 index 00000000..db6abaf2 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipManager.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TipManager : Singleton +{ + [Header("ʾ")] + public Transform tipFather; + [Header("ʾԤ")] + public GameObject tipContainer; + + private void Start() + { + DontDestroyOnLoad(this.gameObject); + } + + public void SendTip(string message) + { + var tip = Instantiate(tipContainer, tipFather.transform); + tip.transform.SetAsFirstSibling(); + TipNode tipNode = tip.GetComponent(); + tipNode.SetMessage(message); + } + public void SendTip(string message ,Vector3 scale) + { + var tip = Instantiate(tipContainer, tipFather.transform); + tip.transform.SetAsFirstSibling(); + tip.transform.localScale = scale; + TipNode tipNode = tip.GetComponent(); + tipNode.SetMessage(message); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipManager.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipManager.cs.meta new file mode 100644 index 00000000..3c91846d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ee87c15a64f613844a87d107810032fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipNode.cs new file mode 100644 index 00000000..dddf3749 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipNode.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class TipNode : MonoBehaviour +{ + public Text text; + public float fadeSpeed=2; + public float startFadeTime=2; + private void Start() + { + StartCoroutine(TipFade()); + } + IEnumerator TipFade() + { + yield return new WaitForSeconds(startFadeTime); + while (true ) + { + text.color -= new Color(0, 0, 0,Time.deltaTime * fadeSpeed); + if (text.color.a <= 0) + { + Destroy(this.gameObject); + yield break; + } + yield return null; + } + + } + public void SetMessage(string message) + { + text.text = message; + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipNode.cs.meta new file mode 100644 index 00000000..d186e9a1 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3ec528580423c754aa901f44d3231b5c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/DontDestoryGameObject.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/DontDestoryGameObject.cs new file mode 100644 index 00000000..42299972 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/DontDestoryGameObject.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DontDestoryGameObject : MonoBehaviour +{ + private void Start() + { + DontDestroyOnLoad(this.gameObject); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/DontDestoryGameObject.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/DontDestoryGameObject.cs.meta new file mode 100644 index 00000000..6c5d45b4 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/DontDestoryGameObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 37a25d73d3b60b74b9a1135e0228a764 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: