diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 3ed2b3f..9cdfb3f 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1447,6 +1447,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71182d4f46b120048b0b05c13189fcf3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &96523248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 96523249} + - component: {fileID: 96523251} + - component: {fileID: 96523250} + m_Layer: 5 + m_Name: front + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &96523249 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 96523248} + 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: 1 + m_Children: [] + m_Father: {fileID: 273429520} + 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: -120} + m_SizeDelta: {x: 327, y: 252} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &96523250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 96523248} + 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: fb7684a482c165a42a1a56e0e6e0fc7a, 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!222 &96523251 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 96523248} + m_CullTransparentMesh: 1 --- !u!1 &105269239 GameObject: m_ObjectHideFlags: 0 @@ -9260,6 +9335,76 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71182d4f46b120048b0b05c13189fcf3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &273429519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 273429520} + - component: {fileID: 273429522} + - component: {fileID: 273429521} + m_Layer: 5 + m_Name: DoubleDouble + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &273429520 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 273429519} + 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: 328219359} + - {fileID: 1972513733} + - {fileID: 1882737402} + - {fileID: 96523249} + m_Father: {fileID: 6584367418171633635} + 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: 900, y: 350} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &273429521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 273429519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71182d4f46b120048b0b05c13189fcf3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!111 &273429522 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 273429519} + m_Enabled: 1 + serializedVersion: 4 + m_Animation: {fileID: 7400000, guid: cfd0c5842e973e84f96871f92305662f, type: 2} + m_Animations: + - {fileID: 7400000, guid: cfd0c5842e973e84f96871f92305662f, type: 2} + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_UpdateMode: 0 + m_CullingType: 0 --- !u!1 &274555032 GameObject: m_ObjectHideFlags: 0 @@ -10123,6 +10268,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &328219358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 328219359} + - component: {fileID: 328219361} + - component: {fileID: 328219360} + m_Layer: 5 + m_Name: glow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &328219359 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328219358} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.6, y: 1.6, z: 1.6} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 273429520} + 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: 576, y: 579} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &328219360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328219358} + 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: 52b87c5dac4cd004281ddbe6250578a8, 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!222 &328219361 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328219358} + m_CullTransparentMesh: 1 --- !u!1 &328468908 GameObject: m_ObjectHideFlags: 0 @@ -32201,6 +32421,7 @@ MonoBehaviour: go_SangdaeBonus: {fileID: 950082467} go_bomb: {fileID: 1111898338} go_double: {fileID: 1828062684} + go_doubledouble: {fileID: 273429519} --- !u!225 &771770705 CanvasGroup: m_ObjectHideFlags: 0 @@ -97535,6 +97756,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1880837237} m_CullTransparentMesh: 1 +--- !u!1 &1882737401 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1882737402} + - component: {fileID: 1882737404} + - component: {fileID: 1882737403} + m_Layer: 5 + m_Name: back + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1882737402 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882737401} + 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: 273429520} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 360} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 122} + m_SizeDelta: {x: 267, y: 320} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1882737403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882737401} + 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: 56df95677c0041b47bdef91a763910c7, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1882737404 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882737401} + m_CullTransparentMesh: 1 --- !u!1 &1884557256 GameObject: m_ObjectHideFlags: 0 @@ -104133,6 +104429,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1972504264} m_CullTransparentMesh: 1 +--- !u!1 &1972513732 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1972513733} + - component: {fileID: 1972513735} + - component: {fileID: 1972513734} + m_Layer: 5 + m_Name: sparkle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1972513733 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1972513732} + 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: 273429520} + 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: 661, y: 487} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1972513734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1972513732} + 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: 959763eb7b5c360488d33c655f551163, 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!222 &1972513735 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1972513732} + m_CullTransparentMesh: 1 --- !u!1 &1974860226 GameObject: m_ObjectHideFlags: 0 @@ -140476,6 +140847,7 @@ RectTransform: - {fileID: 950082468} - {fileID: 1111898339} - {fileID: 1828062685} + - {fileID: 273429520} m_Father: {fileID: 301590531} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/Assets/Scripts/UI/GamePanel/GamePanel.cs b/Assets/Scripts/UI/GamePanel/GamePanel.cs index 6c96072..1e0f135 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs @@ -273,7 +273,10 @@ public partial class GamePanel : MonoBehaviour // 두배면 두배 이펙트 실행 if(_hashScoreMultiplyTypes.Contains(EScoreMutiplyType.ClickedFromResultPopup)) { - EffectPanel.Direct(EEffectDirectType.Double, true); + if (Player_Milgi == 1) + EffectPanel.Direct(EEffectDirectType.Double, true); + else + EffectPanel.Direct(EEffectDirectType.DoubleDouble, true); } if (IsChallengeMode) diff --git a/Assets/Scripts/UI/GamePanel/GamePanel_Effect.cs b/Assets/Scripts/UI/GamePanel/GamePanel_Effect.cs index 78ccec5..b74b7c8 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel_Effect.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel_Effect.cs @@ -12,7 +12,7 @@ public class GamePanel_Effect : MonoBehaviour public GameObject go_Godori, go_Ddadak, go_Be3Gwang, go_3Gwang, go_4Gwang, go_5Gwang, go_nagari, go_Bbuk, go_Stop; public GameObject go_SSackssri, go_Kiss, go_Chodan, go_Chungdan, go_Hongdan, go_muhyo, go_jabbuk, go_eatbbuk; public GameObject go_eatmybbuk, go_Firstbbuk, go_ChongTong, go_Shake, go_Bonus, go_SangdaeBonus; - public GameObject go_bomb, go_double; + public GameObject go_bomb, go_double, go_doubledouble; private Dictionary _dictAnimTriggerHash = new Dictionary(); private Dictionary _dicEffectDurations = new Dictionary(); @@ -320,7 +320,13 @@ public class GamePanel_Effect : MonoBehaviour go_double.SetActive(true); GameManager.Sound.PlaySFX(ESFXType.Godori_2); yield return new WaitForSeconds(1f); - go_Ddadak.SetActive(false); + go_double.SetActive(false); + break; + case EEffectDirectType.DoubleDouble: + go_doubledouble.SetActive(true); + GameManager.Sound.PlaySFX(ESFXType.Godori_2); + yield return new WaitForSeconds(1f); + go_doubledouble.SetActive(false); break; } diff --git a/Assets/Scripts/Utilities/Enumerations.cs b/Assets/Scripts/Utilities/Enumerations.cs index 882fa9b..b8f9b6b 100644 --- a/Assets/Scripts/Utilities/Enumerations.cs +++ b/Assets/Scripts/Utilities/Enumerations.cs @@ -192,6 +192,8 @@ namespace CodeJay // 2배 Double, + // 4배 + DoubleDouble, Bonus, Stop, diff --git a/Assets/UI/Image/Effect/Double/x4 image_x4.png b/Assets/UI/Image/Effect/Double/x4 image_x4.png new file mode 100644 index 0000000..554fe26 Binary files /dev/null and b/Assets/UI/Image/Effect/Double/x4 image_x4.png differ diff --git a/Assets/UI/Image/Effect/Double/x4 image_x4.png.meta b/Assets/UI/Image/Effect/Double/x4 image_x4.png.meta new file mode 100644 index 0000000..23da380 --- /dev/null +++ b/Assets/UI/Image/Effect/Double/x4 image_x4.png.meta @@ -0,0 +1,155 @@ +fileFormatVersion: 2 +guid: 56df95677c0041b47bdef91a763910c7 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8051115683872842379 + second: x4 image_x4_0 + externalObjects: {} + serializedVersion: 13 + 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + 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: 4 + 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: 4 + buildTarget: Android + 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: x4 image_x4_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 267 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 57dde2131f0b44090800000000000000 + internalID: -8051115683872842379 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/Image/Effect/Double/x4 txt_x4.png b/Assets/UI/Image/Effect/Double/x4 txt_x4.png new file mode 100644 index 0000000..bc0ba21 Binary files /dev/null and b/Assets/UI/Image/Effect/Double/x4 txt_x4.png differ diff --git a/Assets/UI/Image/Effect/Double/x4 txt_x4.png.meta b/Assets/UI/Image/Effect/Double/x4 txt_x4.png.meta new file mode 100644 index 0000000..6964341 --- /dev/null +++ b/Assets/UI/Image/Effect/Double/x4 txt_x4.png.meta @@ -0,0 +1,280 @@ +fileFormatVersion: 2 +guid: fb7684a482c165a42a1a56e0e6e0fc7a +TextureImporter: + internalIDToNameTable: + - first: + 213: 9142711019248707799 + second: x4 txt_x4_0 + - first: + 213: 4515563834478866585 + second: x4 txt_x4_1 + - first: + 213: 2770706672834204959 + second: x4 txt_x4_2 + - first: + 213: -3149482732586053877 + second: x4 txt_x4_3 + - first: + 213: 3031164623916733861 + second: x4 txt_x4_4 + - first: + 213: -1163630176965902218 + second: x4 txt_x4_5 + externalObjects: {} + serializedVersion: 13 + 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + 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: 4 + 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: 4 + buildTarget: Android + 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: x4 txt_x4_0 + rect: + serializedVersion: 2 + x: 0 + y: 148 + width: 62 + height: 104 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 7d86e5a5b3f61ee70800000000000000 + internalID: 9142711019248707799 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: x4 txt_x4_1 + rect: + serializedVersion: 2 + x: 65 + y: 143 + width: 30 + height: 109 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 990b6ba02618aae30800000000000000 + internalID: 4515563834478866585 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: x4 txt_x4_2 + rect: + serializedVersion: 2 + x: 94 + y: 144 + width: 100 + height: 108 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f1556130a07837620800000000000000 + internalID: 2770706672834204959 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: x4 txt_x4_3 + rect: + serializedVersion: 2 + x: 217 + y: 144 + width: 110 + height: 108 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: b0f4bf1342aca44d0800000000000000 + internalID: -3149482732586053877 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: x4 txt_x4_4 + rect: + serializedVersion: 2 + x: 31 + y: 1 + width: 129 + height: 140 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5a599486a2cd01a20800000000000000 + internalID: 3031164623916733861 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: x4 txt_x4_5 + rect: + serializedVersion: 2 + x: 161 + y: 0 + width: 131 + height: 142 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 670c50ce484f9dfe0800000000000000 + internalID: -1163630176965902218 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/UIAtlas.spriteatlas b/Assets/UI/UIAtlas.spriteatlas index c3e6a84..0b31e6f 100644 --- a/Assets/UI/UIAtlas.spriteatlas +++ b/Assets/UI/UIAtlas.spriteatlas @@ -99,6 +99,7 @@ SpriteAtlas: - 946d9b343ae931646886ffb83251235f: 21300000 - b953d484def6511438cffad4d330c881: 21300000 - c7be9d948878f3d4abcff3f46819093e: 21300000 + - fb7684a482c165a42a1a56e0e6e0fc7a: 21300000 - 7191e8a4e91b6b041a2186f439616094: 21300000 - 482ff405e1f0a0a4885faf2099f34eec: 21300000 - 8dc3c875171e26e48af6694d40d8df72: 21300000 @@ -118,6 +119,7 @@ SpriteAtlas: - 9a4e02c6e5890d64a8a84d7c268fe66a: 21300000 - 3a59cff615a2f0748810b82b4c401c55: 21300000 - b0e59167e28b8c2439802c1301767ac8: 21300000 + - 56df95677c0041b47bdef91a763910c7: 21300000 - 242cb3974cefd0e46aade680f04dd832: 21300000 - ccfdd697b3fac6041ae86c011597e221: 21300000 - edb524b79cd5212478a3f81b25857157: 21300000 @@ -256,6 +258,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 946d9b343ae931646886ffb83251235f, type: 3} - {fileID: 21300000, guid: b953d484def6511438cffad4d330c881, type: 3} - {fileID: 21300000, guid: c7be9d948878f3d4abcff3f46819093e, type: 3} + - {fileID: 21300000, guid: fb7684a482c165a42a1a56e0e6e0fc7a, type: 3} - {fileID: 21300000, guid: 7191e8a4e91b6b041a2186f439616094, type: 3} - {fileID: 21300000, guid: 482ff405e1f0a0a4885faf2099f34eec, type: 3} - {fileID: 21300000, guid: 8dc3c875171e26e48af6694d40d8df72, type: 3} @@ -275,6 +278,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 9a4e02c6e5890d64a8a84d7c268fe66a, type: 3} - {fileID: 21300000, guid: 3a59cff615a2f0748810b82b4c401c55, type: 3} - {fileID: 21300000, guid: b0e59167e28b8c2439802c1301767ac8, type: 3} + - {fileID: 21300000, guid: 56df95677c0041b47bdef91a763910c7, type: 3} - {fileID: 21300000, guid: 242cb3974cefd0e46aade680f04dd832, type: 3} - {fileID: 21300000, guid: ccfdd697b3fac6041ae86c011597e221, type: 3} - {fileID: 21300000, guid: edb524b79cd5212478a3f81b25857157, type: 3} @@ -412,6 +416,7 @@ SpriteAtlas: - icon 1_play - shop bar back_shop - close btn + - x4 txt_x4 - appreciate mode window_appreciate - appreciate mode icon 4_appreciate - 5go image_5go @@ -431,6 +436,7 @@ SpriteAtlas: - window 2 - jabbuck txt_jabbuck - label victory origimal_result + - x4 image_x4 - lock icon - new pattern - ddadack txt_ddadack