diff --git a/Assets/GameObjects/Cards/Dance Move.prefab b/Assets/GameObjects/Cards/Dance Move.prefab index 158bd039da04cd7af7459c809778ae9a6b4346db..31d7c3901c791284ead572b669a01dbffc0dbf71 100644 --- a/Assets/GameObjects/Cards/Dance Move.prefab +++ b/Assets/GameObjects/Cards/Dance Move.prefab @@ -99,7 +99,6 @@ MonoBehaviour: highlightBorder: {fileID: 4860694058704454321} mCost: 1 Name: Dance Move - wasDuplicated: 0 --- !u!114 &2931771172728402081 MonoBehaviour: m_ObjectHideFlags: 0 @@ -261,7 +260,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ed23625203f293f4b918309f8493bf2a, type: 3} + m_Sprite: {fileID: 21300000, guid: 533b3c3785dd42a40b426a53bc70d3de, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/GameObjects/Cards/FinishingMove.prefab b/Assets/GameObjects/Cards/FinishingMove.prefab index 4a347d6d04a77b01025ca8f9aabb1c801d3c46b3..ff83a12428b5a60edf1433eea7cfeb9b98600f23 100644 --- a/Assets/GameObjects/Cards/FinishingMove.prefab +++ b/Assets/GameObjects/Cards/FinishingMove.prefab @@ -37,7 +37,6 @@ RectTransform: m_Children: - {fileID: 448342097897208476} - {fileID: 1799442862301425606} - - {fileID: 8192850258945441467} - {fileID: 5177576588784684247} - {fileID: 4530878911297551259} - {fileID: 7980689947875364731} @@ -101,7 +100,6 @@ MonoBehaviour: highlightBorder: {fileID: 3668138921792019783} mCost: 1 Name: Grand Finale - wasDuplicated: 0 --- !u!114 &2931771172728402081 MonoBehaviour: m_ObjectHideFlags: 0 @@ -240,7 +238,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 697331425601601877} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -289,80 +287,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 9 ---- !u!1 &1566870625698230602 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8192850258945441467} - - component: {fileID: 5085272180452514659} - - component: {fileID: 690979992509243403} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8192850258945441467 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1566870625698230602} - 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_Children: [] - m_Father: {fileID: 697331425601601877} - m_RootOrder: 2 - 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 &5085272180452514659 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1566870625698230602} - m_CullTransparentMesh: 0 ---- !u!114 &690979992509243403 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1566870625698230602} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ed23625203f293f4b918309f8493bf2a, 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 --- !u!1 &3628344925915742013 GameObject: m_ObjectHideFlags: 0 @@ -393,7 +317,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 697331425601601877} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -546,7 +470,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 697331425601601877} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -660,7 +584,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ed23625203f293f4b918309f8493bf2a, type: 3} + m_Sprite: {fileID: 21300000, guid: c3d7804dbe346284e915fd9ac4235302, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/GameObjects/Cards/Inhale.prefab b/Assets/GameObjects/Cards/Inhale.prefab index a208ed22e64f403a74337ddf1c7fc7a76d217443..bec120ba3c494eae7b71659ae20a8f5ffb9f9a77 100644 --- a/Assets/GameObjects/Cards/Inhale.prefab +++ b/Assets/GameObjects/Cards/Inhale.prefab @@ -174,7 +174,6 @@ MonoBehaviour: highlightBorder: {fileID: 580484224365187089} mCost: 1 Name: Inhale - wasDuplicated: 0 --- !u!114 &2931771172728402081 MonoBehaviour: m_ObjectHideFlags: 0 @@ -428,7 +427,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ed23625203f293f4b918309f8493bf2a, type: 3} + m_Sprite: {fileID: 21300000, guid: 18fdfe5397cb72a44a41dd54485414f8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Sprites/Cards/UPDB_Dance_move.png b/Assets/Sprites/Cards/UPDB_Dance_move.png new file mode 100644 index 0000000000000000000000000000000000000000..21e8a7103b4444c2bb740931a9a8c6cbd54455c8 Binary files /dev/null and b/Assets/Sprites/Cards/UPDB_Dance_move.png differ diff --git a/Assets/Sprites/Cards/UPDB_Dance_move.png.meta b/Assets/Sprites/Cards/UPDB_Dance_move.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..28bb9fe4eef1fda174df8cc7042d0ebdba8503e8 --- /dev/null +++ b/Assets/Sprites/Cards/UPDB_Dance_move.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 533b3c3785dd42a40b426a53bc70d3de +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 67f9dd2d587941f47bd2cbd9042a9ef1 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Cards/UPDB_Grand_Finale.png b/Assets/Sprites/Cards/UPDB_Grand_Finale.png new file mode 100644 index 0000000000000000000000000000000000000000..16af258b00ca9b67c5d5759888bc9ab6e320b79d Binary files /dev/null and b/Assets/Sprites/Cards/UPDB_Grand_Finale.png differ diff --git a/Assets/Sprites/Cards/UPDB_Grand_Finale.png.meta b/Assets/Sprites/Cards/UPDB_Grand_Finale.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..b663aa2e077823197209d5762fa6ab4a347f8a37 --- /dev/null +++ b/Assets/Sprites/Cards/UPDB_Grand_Finale.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: c3d7804dbe346284e915fd9ac4235302 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e64e26d79cb5b7c48b514c761a63a4bc + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Cards/UPDB_Inhale.png b/Assets/Sprites/Cards/UPDB_Inhale.png new file mode 100644 index 0000000000000000000000000000000000000000..83f62044abac030a9d5590847222ca8240a05956 Binary files /dev/null and b/Assets/Sprites/Cards/UPDB_Inhale.png differ diff --git a/Assets/Sprites/Cards/UPDB_Inhale.png.meta b/Assets/Sprites/Cards/UPDB_Inhale.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..390daee73e98b396cc39b8895776c87e5398b12a --- /dev/null +++ b/Assets/Sprites/Cards/UPDB_Inhale.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 18fdfe5397cb72a44a41dd54485414f8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c95f43f354649b941af836538882c22b + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: