From a078ab31e4f1b45050ee9bf75437359daff01799 Mon Sep 17 00:00:00 2001 From: Ino Date: Fri, 19 Sep 2025 12:21:14 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=A8=EB=B2=94=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=A4=91...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ResWork/UI_Image/Album.meta | 8 + .../ResWork/UI_Image/Album/open btn_album.png | Bin 0 -> 6563 bytes .../UI_Image/Album/open btn_album.png.meta | 156 +++++++++ .../ResWork/UI_Image/Album/window 1_album.png | Bin 0 -> 857 bytes .../UI_Image/Album/window 1_album.png.meta | 156 +++++++++ Assets/ResWork/UI_Prefab/AlbumCard.prefab | 217 ++++++------ .../MainUI/UIAtlas.spriteatlasv2.meta | 2 +- Assets/Scenes/SampleScene.unity | 320 ++++++++++++++---- Assets/Scripts/UI/AlbumCard.cs | 12 +- Assets/Scripts/UI/AlbumUI.cs | 20 +- Assets/Scripts/UI/LobbyUI.cs | 6 +- Assets/SheGotWet_Memo.txt | 5 +- 12 files changed, 703 insertions(+), 199 deletions(-) create mode 100644 Assets/ResWork/UI_Image/Album.meta create mode 100644 Assets/ResWork/UI_Image/Album/open btn_album.png create mode 100644 Assets/ResWork/UI_Image/Album/open btn_album.png.meta create mode 100644 Assets/ResWork/UI_Image/Album/window 1_album.png create mode 100644 Assets/ResWork/UI_Image/Album/window 1_album.png.meta diff --git a/Assets/ResWork/UI_Image/Album.meta b/Assets/ResWork/UI_Image/Album.meta new file mode 100644 index 0000000..8d5d59b --- /dev/null +++ b/Assets/ResWork/UI_Image/Album.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6287377511b27c34ba19d220e9719a38 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI_Image/Album/open btn_album.png b/Assets/ResWork/UI_Image/Album/open btn_album.png new file mode 100644 index 0000000000000000000000000000000000000000..34219579e5045a5c7656b6e0c2a3a6dc075f4232 GIT binary patch literal 6563 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 Vo}@wvZNmTn002ovPDHLkV1lGc;pqSX literal 0 HcmV?d00001 diff --git a/Assets/ResWork/UI_Image/Album/open btn_album.png.meta b/Assets/ResWork/UI_Image/Album/open btn_album.png.meta new file mode 100644 index 0000000..06cac89 --- /dev/null +++ b/Assets/ResWork/UI_Image/Album/open btn_album.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: ac0437df91a05594fb78fc6907c2ce7a +TextureImporter: + internalIDToNameTable: + - first: + 213: 933529478338558348 + second: open btn_album_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: 60, y: 39, z: 60, w: 40} + 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: open btn_album_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 151 + height: 79 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c89b9bf4d1094fc00800000000000000 + internalID: 933529478338558348 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + open btn_album_0: 933529478338558348 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI_Image/Album/window 1_album.png b/Assets/ResWork/UI_Image/Album/window 1_album.png new file mode 100644 index 0000000000000000000000000000000000000000..6eb48131f6a894662d2424d4d1bd81f3d74ad38b GIT binary patch literal 857 zcmeAS@N?(olHy`uVBq!ia0vp^2|ygj!3HGnybyc}q&N#aB8wRqxP?KOkzv*x2?hpc zZci7-kcv5P@A~=&J4&=Y+#T%Y!LYXBik{TbBNCjOp2+{$czOP-b1OQ%#dQQDCCz6z zOkffe^5i^vRK|Pd-vwLW3eSA*#nBf0YW7a-asbR{~&Hb7W^gd|(t`fb$WY*bObt?9;x&p)M z15w}Pqw<#@u-d?QWw)(CeRbNh+h3JFbp2TM{`qp%QsD!&4;Vkpl~}Sik8xVV^#f}k zo|`r$^8x3_@XLX_*-N-SNK|yje?2@w{a^17&NtiRcyjkWRQ#~#u&J~U!#u(3-_~=V zeJ3DpZ{D^rXtMIUw{xHAw@s_x&!BePA|y+#Gy6`&_h&#iJldh|bwR0cZR2SM)B$E3yHlFP1h> z0u}r*J%uYmVg#;#JJp-N`|gGOo6LJX&235_Fc;>oe^IimM)U`xj^KHh?FX+mY(H?l zOx&84!Q#}ul{`NENt;;SFy_D5boa6@!;$Z+qi;SJGB7;yFmF@v1K|&XKd!!Q-08Kl z>OXoA3eb#yW!L&vt18<%wr|x$bKVp&>t`B`L gU~anluieG`V3`!FVdQ&MBb@0HGIp6951J literal 0 HcmV?d00001 diff --git a/Assets/ResWork/UI_Image/Album/window 1_album.png.meta b/Assets/ResWork/UI_Image/Album/window 1_album.png.meta new file mode 100644 index 0000000..6f6a0c2 --- /dev/null +++ b/Assets/ResWork/UI_Image/Album/window 1_album.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 7f86f171e2d96b34cbd3ce44675ba66a +TextureImporter: + internalIDToNameTable: + - first: + 213: 9218043112110758248 + second: window 1_album_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: 35, y: 35, z: 35, w: 35} + 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: window 1_album_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 96 + height: 94 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 86919950f511def70800000000000000 + internalID: 9218043112110758248 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + window 1_album_0: 9218043112110758248 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI_Prefab/AlbumCard.prefab b/Assets/ResWork/UI_Prefab/AlbumCard.prefab index b021844..12fbc0a 100644 --- a/Assets/ResWork/UI_Prefab/AlbumCard.prefab +++ b/Assets/ResWork/UI_Prefab/AlbumCard.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 6099615855730022169} - component: {fileID: 7431777274635079671} - component: {fileID: 4409227361096382540} + - component: {fileID: 2216596260626803644} m_Layer: 5 m_Name: i_girl m_TagString: Untagged @@ -25,15 +26,15 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1025233669054666056} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} + m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 1784483653465108159} + m_Father: {fileID: 6569661889772096336} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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} @@ -75,7 +76,21 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3681562209362178655 +--- !u!114 &2216596260626803644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1025233669054666056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 3 + m_AspectRatio: 0.666667 +--- !u!1 &4050922967717521969 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -83,53 +98,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 103749632629533262} - - component: {fileID: 3542003914245259194} - - component: {fileID: 2947897106475491333} + - component: {fileID: 7208053090500090039} + - component: {fileID: 827560549073924371} + - component: {fileID: 7507613107863319625} m_Layer: 5 - m_Name: btnName + m_Name: i_price m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &103749632629533262 +--- !u!224 &7208053090500090039 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3681562209362178655} + m_GameObject: {fileID: 4050922967717521969} 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_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 6569661889772096336} + m_Father: {fileID: 2161759319219929201} 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_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -48.2, y: 1.2} + m_SizeDelta: {x: 112, y: 114} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3542003914245259194 +--- !u!222 &827560549073924371 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3681562209362178655} + m_GameObject: {fileID: 4050922967717521969} m_CullTransparentMesh: 1 ---- !u!114 &2947897106475491333 +--- !u!114 &7507613107863319625 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3681562209362178655} + m_GameObject: {fileID: 4050922967717521969} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -140,77 +155,16 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Button - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} - m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 25 - m_fontSizeMax: 100 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} + m_Sprite: {fileID: 21300000, guid: af3bdea9ab9e8d4449e22d0d23d27f92, 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 &5676652756216956804 GameObject: m_ObjectHideFlags: 0 @@ -223,7 +177,7 @@ GameObject: - component: {fileID: 100661785928780051} - component: {fileID: 3612782733089240175} m_Layer: 5 - m_Name: btnName + m_Name: t_price m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -245,7 +199,7 @@ RectTransform: 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_AnchoredPosition: {x: 30.099998, y: 1.9000015} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &100661785928780051 @@ -276,7 +230,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC5F4\uAE30" + m_text: 000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} @@ -285,8 +239,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4293256191 + m_fontColor: {r: 1, g: 0.8901961, b: 0.8980392, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -303,8 +257,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 25 @@ -377,7 +331,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6569661889772096336} - - {fileID: 6099615855730022169} - {fileID: 2161759319219929201} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -416,6 +369,8 @@ GameObject: - component: {fileID: 6582351684501251787} - component: {fileID: 6528198739471905525} - component: {fileID: 8864250440984958746} + - component: {fileID: 5691483861903231355} + - component: {fileID: 4947156098594558374} m_Layer: 5 m_Name: btn_bg m_TagString: Untagged @@ -435,7 +390,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 103749632629533262} + - {fileID: 6099615855730022169} m_Father: {fileID: 1784483653465108159} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -471,8 +426,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b0a7567624709ee45872c0e655845f2d, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 7f86f171e2d96b34cbd3ce44675ba66a, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -549,6 +504,33 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4848326f7db925d4fbcdb35f789b75f5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5691483861903231355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7577317983603397655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!114 &4947156098594558374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7577317983603397655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 100, y: 100} --- !u!1 &8113042082887579480 GameObject: m_ObjectHideFlags: 0 @@ -582,12 +564,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7347612258446092261} + - {fileID: 7208053090500090039} m_Father: {fileID: 1784483653465108159} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 52} - m_SizeDelta: {x: 150, y: 70} + m_SizeDelta: {x: 200, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9053791354744707679 CanvasRenderer: @@ -610,15 +593,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.96470594, g: 0.27450982, b: 0.96470594, a: 1} + 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: 21300000, guid: b0a7567624709ee45872c0e655845f2d, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: ac0437df91a05594fb78fc6907c2ce7a, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -670,7 +653,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 4356211809503063416} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 3717553095776443215} + m_TargetAssemblyTypeName: AlbumCard, Assembly-CSharp + m_MethodName: OnClick_Buy + 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 &7967308884494401776 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2.meta b/Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2.meta index 1ca1e54..46205d7 100644 --- a/Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2.meta +++ b/Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2.meta @@ -16,7 +16,7 @@ SpriteAtlasImporter: platformSettings: - serializedVersion: 4 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index e98f808..cda6dd5 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1461,8 +1461,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 41267003} - - component: {fileID: 41267005} - - component: {fileID: 41267004} m_Layer: 5 m_Name: Girl m_TagString: Untagged @@ -1485,51 +1483,14 @@ RectTransform: - {fileID: 1512606838} - {fileID: 245119520} - {fileID: 1207406151} + - {fileID: 1128410100} m_Father: {fileID: 476355706} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -150} + m_AnchoredPosition: {x: 0, y: -215} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &41267004 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 41267002} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b0a7567624709ee45872c0e655845f2d, 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 &41267005 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 41267002} - m_CullTransparentMesh: 1 --- !u!1 &44700974 GameObject: m_ObjectHideFlags: 0 @@ -6565,8 +6526,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: -211, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -439, y: 0} + m_SizeDelta: {x: 73, y: 114} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &245119521 MonoBehaviour: @@ -8200,6 +8161,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 294671298} m_CullTransparentMesh: 1 +--- !u!1 &295860786 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 295860787} + - component: {fileID: 295860789} + - component: {fileID: 295860788} + m_Layer: 5 + m_Name: t_count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &295860787 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 295860786} + 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: 1128410100} + 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: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &295860788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 295860786} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 00/00 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} + m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4293256191 + m_fontColor: {r: 1, g: 0.8901961, b: 0.8980392, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 60 + m_fontSizeBase: 60 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 25 + m_fontSizeMax: 100 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &295860789 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 295860786} + m_CullTransparentMesh: 1 --- !u!1 &301452043 GameObject: m_ObjectHideFlags: 0 @@ -9827,18 +9924,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 371721584} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2030797965} m_Father: {fileID: 476355706} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 0, y: 100} + m_AnchoredPosition: {x: 0, y: -68.599976} + m_SizeDelta: {x: 0, y: 137.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &371721586 MonoBehaviour: @@ -9853,15 +9950,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.08627451, g: 0.37647063, b: 0.50980395, 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: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b0a7567624709ee45872c0e655845f2d, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: a4851937abf9eb945a92d1d8e44ea9df, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -12206,8 +12303,8 @@ RectTransform: 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: -55.772705} - m_SizeDelta: {x: 0, y: -111.5455} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -0.000015258789} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &476355707 MonoBehaviour: @@ -12226,6 +12323,7 @@ MonoBehaviour: go_card: {fileID: 7007143279820371033, guid: 57bef01642d6bcb499dd08ed65819030, type: 3} texts: - {fileID: 1512606839} + - {fileID: 295860788} --- !u!1 &482081050 GameObject: m_ObjectHideFlags: 0 @@ -26766,6 +26864,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1124398510} m_CullTransparentMesh: 1 +--- !u!1 &1128410099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1128410100} + - component: {fileID: 1128410102} + - component: {fileID: 1128410101} + m_Layer: 5 + m_Name: count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1128410100 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1128410099} + 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: 295860787} + m_Father: {fileID: 41267003} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -157, y: -2.5} + m_SizeDelta: {x: 261.7, y: 95} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1128410101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1128410099} + 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: 7f86f171e2d96b34cbd3ce44675ba66a, type: 3} + 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 &1128410102 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1128410099} + m_CullTransparentMesh: 1 --- !u!1 &1132656310 GameObject: m_ObjectHideFlags: 0 @@ -27784,7 +27958,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0, y: 1} --- !u!114 &1191006681 MonoBehaviour: @@ -27813,15 +27987,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 25 + m_Left: 29 m_Right: 0 - m_Top: 5 + m_Top: 11 m_Bottom: 0 - m_ChildAlignment: 1 + m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 250, y: 400} - m_Spacing: {x: 10, y: 10} + m_CellSize: {x: 245, y: 340} + m_Spacing: {x: 15, y: 10} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1001 &1193438781 @@ -28363,8 +28537,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: 211, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 129, y: 0} + m_SizeDelta: {x: 73, y: 114} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1207406152 MonoBehaviour: @@ -36283,7 +36457,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: 0, y: 0} + m_AnchoredPosition: {x: -157, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1512606839 @@ -36315,8 +36489,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4293256191 + m_fontColor: {r: 1, g: 0.8901961, b: 0.8980392, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -36333,8 +36507,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 25 @@ -39991,14 +40165,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 1} + 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: 21300000, guid: b0a7567624709ee45872c0e655845f2d, type: 3} + m_Sprite: {fileID: 21300000, guid: efa293ad9fad59c4bbcebc15f2a71b85, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -48171,13 +48345,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2030797964} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 371721585} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -48212,8 +48386,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4293256191 + m_fontColor: {r: 1, g: 0.8901961, b: 0.8980392, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -49936,8 +50110,8 @@ RectTransform: 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: 51.0166} - m_SizeDelta: {x: 0, y: -502.05444} + m_AnchoredPosition: {x: 0, y: -44.400024} + m_SizeDelta: {x: 0, y: -519.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2093328781 MonoBehaviour: diff --git a/Assets/Scripts/UI/AlbumCard.cs b/Assets/Scripts/UI/AlbumCard.cs index 30be974..b28d029 100644 --- a/Assets/Scripts/UI/AlbumCard.cs +++ b/Assets/Scripts/UI/AlbumCard.cs @@ -1,6 +1,5 @@ using TMPro; using UnityEngine; -using UnityEngine.AddressableAssets; using UnityEngine.ResourceManagement.AsyncOperations; using UnityEngine.UI; @@ -19,24 +18,21 @@ public class AlbumCard : CardBase base.Set(_base, iLoop, idata); m_Data = _base as albumtabledata; - AddrResourceMgr.Ins.Relese(m_Handle); - gos[0].SetActive(m_Data.n_Index == SaveMgr.Ins.Get_UnLockIndex() + 1); i_girl.enabled = false; + AddrResourceMgr.Ins.Relese(m_Handle); AddrResourceMgr.Ins.LoadObject(m_Data.s_Image, handle => { m_Handle = handle; i_girl.enabled = true; i_girl.sprite = handle.Result; - - if (m_Data.n_Index > SaveMgr.Ins.Get_UnLockIndex()) - i_girl.material = mat_blur; - else - i_girl.material = null; + i_girl.material = IsObtain() ? null : mat_blur; }); } + public bool IsObtain() { return m_Data.n_Index <= SaveMgr.Ins.Get_UnLockIndex(); } + public void OnClick_Buy() { diff --git a/Assets/Scripts/UI/AlbumUI.cs b/Assets/Scripts/UI/AlbumUI.cs index 0237879..0c63a4d 100644 --- a/Assets/Scripts/UI/AlbumUI.cs +++ b/Assets/Scripts/UI/AlbumUI.cs @@ -2,15 +2,29 @@ using TMPro; public class AlbumUI : uScrollViewMgr { - public TextMeshProUGUI[] texts; // 0 이름 + public TextMeshProUGUI[] texts; // 0 이름, 1 카운팅 int curGirl = 1; public void Set() { gameObject.SetActive(true); - Set_ScrollView(table_album.Ins.Get_DataList(curGirl)); + Set_UI(); + } + + void Set_UI() + { + var lst = table_album.Ins.Get_DataList(curGirl); + Set_ScrollView(lst); texts[0].text = table_girl.Ins.Get_Data(curGirl).s_Name; + + var count = 0; + for (int i = 0; i < list_CardBase.Count; i++) + { + if ((list_CardBase[i] as AlbumCard).IsObtain()) + ++count; + } + texts[1].text = $"{count}/{lst.Count}"; } public void OnClick_Arrow(int add) @@ -18,6 +32,6 @@ public class AlbumUI : uScrollViewMgr curGirl += add; if (curGirl > 8) curGirl = 1; else if (curGirl < 1) curGirl = 8; - Set(); + Set_UI(); } } \ No newline at end of file diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index eec831c..ca202fd 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -46,7 +46,11 @@ public class LobbyUI : MonoBehaviourSingletonTemplate case "btn_attendance": m_AttandanceUI.Set(); break; case "btn_option": m_OptionUI.Set(); break; - case "btn_album": Go_Home(); m_AlbumUI.Set(); break; + case "btn_album": + Go_Home(); + m_AlbumUI.Set(); + DSUtil.InActivateGameObjects(gos_homeBot); + break; case "btn_home": Go_Home(); break; case "btn_gacha": m_GachaUI.Set(); break; case "btn_shop": diff --git a/Assets/SheGotWet_Memo.txt b/Assets/SheGotWet_Memo.txt index 317f281..187e6ed 100644 --- a/Assets/SheGotWet_Memo.txt +++ b/Assets/SheGotWet_Memo.txt @@ -1,5 +1,6 @@ 사운드 및 BGM 요청 -광고 제거권 훔쳐보기 -프로필 카드 \ No newline at end of file +프로필 카드 +광고 제거권 + - 구매 후 UI 처리 \ No newline at end of file