From fa6a6f094642866d56366680e9b320fd4f55338c Mon Sep 17 00:00:00 2001 From: Ino Date: Fri, 12 Sep 2025 13:04:46 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=AC=ED=99=94=204=EC=A2=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ResWork/UI_Image/money_coin.png | Bin 7438 -> 0 bytes Assets/ResWork/UI_Image/money_gacha.png | Bin 2089 -> 7438 bytes Assets/ResWork/UI_Image/money_gacha.png.meta | 20 +- Assets/ResWork/UI_Image/money_heart.png | Bin 0 -> 2005 bytes ...ney_coin.png.meta => money_heart.png.meta} | 20 +- Assets/ResWork/UI_Image/money_lucky.png | Bin 0 -> 2089 bytes Assets/ResWork/UI_Image/money_lucky.png.meta | 156 ++++++++ .../ResWork/UI_Prefab/AttandacneCard.prefab | 4 +- Assets/Scenes/SampleScene.unity | 370 +++++++++++++++++- Assets/Scripts/AttachToGameObject/SaveMgr.cs | 47 ++- Assets/Scripts/UI/LobbyUI.cs | 7 +- Assets/Scripts/UI/OptionUI.cs | 1 + 12 files changed, 580 insertions(+), 45 deletions(-) delete mode 100644 Assets/ResWork/UI_Image/money_coin.png create mode 100644 Assets/ResWork/UI_Image/money_heart.png rename Assets/ResWork/UI_Image/{money_coin.png.meta => money_heart.png.meta} (91%) create mode 100644 Assets/ResWork/UI_Image/money_lucky.png create mode 100644 Assets/ResWork/UI_Image/money_lucky.png.meta diff --git a/Assets/ResWork/UI_Image/money_coin.png b/Assets/ResWork/UI_Image/money_coin.png deleted file mode 100644 index 7c49e1766fbb71053b5d9600748cfa1c54f7f46a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7438 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 T66rOl00000NkvXXu0mjfO?Kl~ diff --git a/Assets/ResWork/UI_Image/money_gacha.png.meta b/Assets/ResWork/UI_Image/money_gacha.png.meta index 77d935a..fdc676b 100644 --- a/Assets/ResWork/UI_Image/money_gacha.png.meta +++ b/Assets/ResWork/UI_Image/money_gacha.png.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: dcc693d0e6e9e524eab9aa85ff65250b +guid: 32a7825797de0fb4a8f0cbf27f95ea48 TextureImporter: internalIDToNameTable: - first: - 213: 6521567286427641033 - second: icon_gem_0 + 213: 1703746987442083240 + second: money_gold_0 externalObjects: {} serializedVersion: 13 mipmaps: @@ -113,13 +113,13 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: icon_gem_0 + name: money_gold_0 rect: serializedVersion: 2 - x: 0 + x: 5 y: 0 - width: 32 - height: 34 + width: 68 + height: 77 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -128,8 +128,8 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 9c4e35ee4e2418a50800000000000000 - internalID: 6521567286427641033 + spriteID: 8a590a5bbdce4a710800000000000000 + internalID: 1703746987442083240 vertices: [] indices: edges: [] @@ -148,7 +148,7 @@ TextureImporter: spriteCustomMetadata: entries: [] nameFileIdTable: - icon_gem_0: 6521567286427641033 + money_gold_0: 1703746987442083240 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/ResWork/UI_Image/money_heart.png b/Assets/ResWork/UI_Image/money_heart.png new file mode 100644 index 0000000000000000000000000000000000000000..90dd20ac7aed57fcb0586e15b898a1a05afaf6a4 GIT binary patch literal 2005 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 literal 0 HcmV?d00001 diff --git a/Assets/ResWork/UI_Image/money_coin.png.meta b/Assets/ResWork/UI_Image/money_heart.png.meta similarity index 91% rename from Assets/ResWork/UI_Image/money_coin.png.meta rename to Assets/ResWork/UI_Image/money_heart.png.meta index fdc676b..3fb118a 100644 --- a/Assets/ResWork/UI_Image/money_coin.png.meta +++ b/Assets/ResWork/UI_Image/money_heart.png.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: 32a7825797de0fb4a8f0cbf27f95ea48 +guid: af3bdea9ab9e8d4449e22d0d23d27f92 TextureImporter: internalIDToNameTable: - first: - 213: 1703746987442083240 - second: money_gold_0 + 213: -4978290196938579389 + second: icon_soul_0 externalObjects: {} serializedVersion: 13 mipmaps: @@ -113,13 +113,13 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: money_gold_0 + name: icon_soul_0 rect: serializedVersion: 2 - x: 5 + x: 0 y: 0 - width: 68 - height: 77 + width: 31 + height: 34 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -128,8 +128,8 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 8a590a5bbdce4a710800000000000000 - internalID: 1703746987442083240 + spriteID: 342aaa6217f89eab0800000000000000 + internalID: -4978290196938579389 vertices: [] indices: edges: [] @@ -148,7 +148,7 @@ TextureImporter: spriteCustomMetadata: entries: [] nameFileIdTable: - money_gold_0: 1703746987442083240 + icon_soul_0: -4978290196938579389 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/ResWork/UI_Image/money_lucky.png b/Assets/ResWork/UI_Image/money_lucky.png new file mode 100644 index 0000000000000000000000000000000000000000..9f6cbd2b441004621f2f7127743e9b1426a4f484 GIT binary patch literal 2089 zcmV+^2-f$BP)f*zP3D{%{b&!ky6Ts|D^2NIF z>HFS-NMAp@W8;*LP4d;L(_{-fWR|ZmoJwi6JOh~&DwDx?s?F24>LBku7GQQJ`C5I| z1NR&(i{R7=w#JXM=v4`rCO>-d>zwKvByX27g^3oDzb;>5er=hqK#+448-Hm5_x7y^ z^**kHTzLp!b|(2t;MdLGq47y}#>QBQ$JwuxX>V)iJEzVvGcZK4YU67SS`#uYs>-MGJm>qiK{o$pcFz#rh)#Ab-b%fa6j8=;3sqQ zn;$g*^3>0C^qFavCnv~7+j*|1pA(5*Cc1lA+}`5D)EbFc2SF)mw?YhbbW(O~wo3(U zrKnV^>>QMFg@FKU$EIxCgk6`j4sIo>-!-mY+UD@CDP0Z1! zeSD>;xK#?360hX;@jrT>YO&COc*O)>Z9D~L&hW;$mw7hP%biLY&sP|R;NRIai?`Dl zp%8tsIHTSDB%(32^681j_}Z~&NayxQ=XNQS^AyVk+CyQalo&z~3x)|5=GTxOJK)wxGpq9_c!DjS$_vW(N}zOGlT1EEGg&?hgr?# zxKS+d+~{#eIuj_RaJ-s$!+fQ%U5AKeF+DiO3r8mi8z#Q;>*4~>^KcypgwcE=goOK% z3}9(1%liHviM9v@=YU^b_z)XOJQSwtx+tv?Lhz6Yuzd&5_c_|#L%R{6P%a~+1Oyeg zisL)T*11YHKS?Rc7WYXNas*A2-+uZp{=B@1)B<1oJn6F~5cpc*Di23_|OvB)t$ETU@ z9UvAAfv+C&l@AV>0h54~m78O+!eu)|?%k;Pl`yQb>lnj?~tm zS|M5hl-2|SL99Rk*L8`6Ld4qJ$vZZNlvsv=Zn*(k&A=cW2(nu#bF`zAmy?sYo{tuS z(ar>sP#D+u9|E|y5q%_9D2$W_T5AjiRv^groo%jeWw9NXh#9P{uzBSg0@A<=1W4`g zv6NY5C>kXm3gaptrF?qY+URSK0sJv&O>OGEo^|xT6c#_wHr3%?dHu-NSI}O_-I`%4q<`vsnTfN=_A| zxOa&x6OFi(ia=nR5?5=o zg*->@?$W!~QnjBq#s=bRz%Kx*xn24rVXpfgdDlTJzm^3lYyZ4b1WgO26}DR?91O8r zDsc1eUM-xE#6l6C9UMYy&Bp#Nmv5#y|M@B#*Dlj>;bV&F&4zeoZhrIoje=x>M)fNt z)`@9WhDJ$+19(DWm=@un#dvoQL-9mSOMup@{#zgvlstz_Zin(giM?_W$8qUUnyLML zB9|AD`TgeA|9EbG^XYoC&Pz>XDUIDUjkFo^Bh zXeB@h3?x=4z@1!)Z0-(rxj>s~ani1mSYJbLuAy6Z|Ig;;H{XWVqV!Z9;#{*QM|!X) zCizcqA33{1S5F@=j-4cGnjCmlKoBx5Qn?*IUAqdt$1o-*Gbz;CDt@`t9BrFgLHcfE z;Gw?YQJs)548+(3_V@&!giNBbPR=E#XtOMQt=Zh$;j`2#{jSdo`*{woUqSEO;Q_l? z7hh-|d|YSrdL5*#F(yM{#7L6OW5?L(?qOzhlHE#?<Vk-j2*T+eyI-f>=T`9 zcA+l5^d!ea0W^VpyACq+1ujc<;R}b2`BVT+Ak);U=~L7?;Pb#obMu?Ur;YVrlQOND T66rOl00000NkvXXu0mjfO?Kl~ literal 0 HcmV?d00001 diff --git a/Assets/ResWork/UI_Image/money_lucky.png.meta b/Assets/ResWork/UI_Image/money_lucky.png.meta new file mode 100644 index 0000000..77d935a --- /dev/null +++ b/Assets/ResWork/UI_Image/money_lucky.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: dcc693d0e6e9e524eab9aa85ff65250b +TextureImporter: + internalIDToNameTable: + - first: + 213: 6521567286427641033 + second: icon_gem_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: icon_gem_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 34 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 9c4e35ee4e2418a50800000000000000 + internalID: 6521567286427641033 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + icon_gem_0: 6521567286427641033 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI_Prefab/AttandacneCard.prefab b/Assets/ResWork/UI_Prefab/AttandacneCard.prefab index 6ffe635..d7840ea 100644 --- a/Assets/ResWork/UI_Prefab/AttandacneCard.prefab +++ b/Assets/ResWork/UI_Prefab/AttandacneCard.prefab @@ -92,7 +92,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: 32, y: 34} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5115547727534354017 CanvasRenderer: @@ -122,7 +122,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dcc693d0e6e9e524eab9aa85ff65250b, type: 3} + m_Sprite: {fileID: 21300000, guid: 32a7825797de0fb4a8f0cbf27f95ea48, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 26f0738..c7a2495 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1352,7 +1352,7 @@ GameObject: - component: {fileID: 278813021} - component: {fileID: 278813020} m_Layer: 5 - m_Name: t_amount + m_Name: t_amount_gacha m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3670,6 +3670,153 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 673671245} m_CullTransparentMesh: 1 +--- !u!1 &690239855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 690239856} + - component: {fileID: 690239860} + - component: {fileID: 690239859} + - component: {fileID: 690239858} + - component: {fileID: 690239857} + m_Layer: 5 + m_Name: btn_heart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &690239856 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690239855} + 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: 990497013} + - {fileID: 1092952229} + m_Father: {fileID: 1524862915} + 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: -294, y: 0} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &690239857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690239855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4848326f7db925d4fbcdb35f789b75f5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &690239858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690239855} + 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: 690239859} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1703079399} + m_TargetAssemblyTypeName: LobbyUI, Assembly-CSharp + m_MethodName: OnClick_Button + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 690239855} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &690239859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690239855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, 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 &690239860 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690239855} + m_CullTransparentMesh: 1 --- !u!1 &770900676 GameObject: m_ObjectHideFlags: 0 @@ -3923,7 +4070,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: -150, y: 0} + m_AnchoredPosition: {x: -23, y: 0} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &791099212 @@ -4947,6 +5094,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 989474287} m_CullTransparentMesh: 1 +--- !u!1 &990497010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 990497013} + - component: {fileID: 990497012} + - component: {fileID: 990497011} + m_Layer: 5 + m_Name: t_amount_heart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &990497011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 990497010} + 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: 0000 + 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: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 20 + m_fontSizeMax: 80 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + 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} +--- !u!222 &990497012 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 990497010} + m_CullTransparentMesh: 1 +--- !u!224 &990497013 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 990497010} + 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: 690239856} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -19, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1028843972 GameObject: m_ObjectHideFlags: 0 @@ -5106,7 +5389,7 @@ GameObject: - component: {fileID: 1035601638} - component: {fileID: 1035601641} m_Layer: 5 - m_Name: btn_coin + m_Name: btn_gacha m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5130,7 +5413,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: 150, y: 0} + m_AnchoredPosition: {x: 248, y: 0} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1035601638 @@ -5450,6 +5733,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1065264769} m_CullTransparentMesh: 1 +--- !u!1 &1092952228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1092952229} + - component: {fileID: 1092952231} + - component: {fileID: 1092952230} + m_Layer: 5 + m_Name: New Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1092952229 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092952228} + 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: 690239856} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 50, y: 0} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1092952230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092952228} + 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: 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!222 &1092952231 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092952228} + m_CullTransparentMesh: 1 --- !u!1 &1097484615 GameObject: m_ObjectHideFlags: 0 @@ -6263,7 +6621,7 @@ GameObject: - component: {fileID: 1301406510} - component: {fileID: 1301406509} m_Layer: 5 - m_Name: t_amount + m_Name: t_amount_chat m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7107,6 +7465,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1120373101} + - {fileID: 690239856} - {fileID: 791099211} - {fileID: 1035601637} - {fileID: 1851186853} @@ -8262,6 +8621,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: texts_money: + - {fileID: 990497011} - {fileID: 1301406509} - {fileID: 278813020} m_AttandanceUI: {fileID: 388368217} diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index 44b8c76..18d4c1e 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -40,9 +40,10 @@ public class SaveMgr : MonoBehaviourSingletonTemplate bBgm = true, Attendance = 0, - ChatCoin = 0, - Coin = 0, - GachaCoin = 0, + MoneyChatCoin = 0, + MoneyGacha = 0, + MoneyHeart = 0, + MoneyLucky = 0, GirlSelectIndex = 0, LastDoY = 0, AttendanceDoY = 0, @@ -82,14 +83,29 @@ public class SaveMgr : MonoBehaviourSingletonTemplate public int Get_DoY() { return m_SaveData.LastDoY; } - public void Add_ChatCoin(int add = 1) { m_SaveData.ChatCoin += add; LobbyUI.Ins.Set_Money(); } - public int Get_ChatCoin() { return m_SaveData.ChatCoin; } - - public void Add_Coin(int add = 1) { m_SaveData.Coin += add; LobbyUI.Ins.Set_Money(); } - public int Get_Coin() { return m_SaveData.Coin; } - - public void Add_MoneyGacha(int add) { m_SaveData.GachaCoin += add; } - public int Get_MoneyGacha() { return m_SaveData.GachaCoin; } + public void Add_Money(eMoney money, int add = 1) + { + switch (money) + { + case eMoney.AlbumOpen: m_SaveData.MoneyHeart+= add; break; + case eMoney.Chat: m_SaveData.MoneyChatCoin += add; break; + case eMoney.Gacha: m_SaveData.MoneyGacha += add; break; + case eMoney.Lucky: m_SaveData.MoneyLucky += add; break; + } + + LobbyUI.Ins.Set_Money(); + } + public int Get_Money(eMoney money) + { + switch (money) + { + case eMoney.AlbumOpen: return m_SaveData.MoneyHeart; + case eMoney.Chat: return m_SaveData.MoneyChatCoin; + case eMoney.Gacha: return m_SaveData.MoneyGacha; + case eMoney.Lucky: return m_SaveData.MoneyLucky; + } + return 0; + } public void DailyCheck() { @@ -118,7 +134,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate Add_AttendanceDay(); var curDay = Get_AttendanceDay(); var data = table_attandance.Ins.Get_Data(curDay); - Add_MoneyGacha(data.n_GachaAmount); + Add_Money(eMoney.Gacha, data.n_GachaAmount); m_SaveData.AttendanceDoY = InternetTime.Ins.Time.DayOfYear; Save(); } @@ -136,7 +152,8 @@ public class SaveData ProtectedInt32 _AttendanceDoY; public int AttendanceDoY { get { return _AttendanceDoY; } set { _AttendanceDoY = value; _AttendanceDoY.Obfuscate(); } } ProtectedInt32 _Attendance; public int Attendance { get { return _Attendance; } set { _Attendance = value; _Attendance.Obfuscate(); } } - ProtectedInt32 _Coin; public int Coin { get { return _Coin; } set { _Coin = value; _Coin.Obfuscate(); } } - ProtectedInt32 _ChatCoin; public int ChatCoin { get { return _ChatCoin; } set { _ChatCoin = value; _ChatCoin.Obfuscate(); } } - ProtectedInt32 _GachaCoin; public int GachaCoin { get { return _GachaCoin; } set { _GachaCoin = value; _GachaCoin.Obfuscate(); } } + ProtectedInt32 _MoneyHeart; public int MoneyHeart { get { return _MoneyHeart; } set { _MoneyHeart = value; _MoneyHeart.Obfuscate(); } } + ProtectedInt32 _MoneyChatCoin; public int MoneyChatCoin { get { return _MoneyChatCoin; } set { _MoneyChatCoin = value; _MoneyChatCoin.Obfuscate(); } } + ProtectedInt32 _MoneyGacha; public int MoneyGacha { get { return _MoneyGacha; } set { _MoneyGacha = value; _MoneyGacha.Obfuscate(); } } + ProtectedInt32 _MoneyLucky; public int MoneyLucky { get { return _MoneyLucky; } set { _MoneyLucky = value; _MoneyLucky.Obfuscate(); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index 779fd1b..c206f61 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -3,7 +3,7 @@ using UnityEngine; public class LobbyUI : MonoBehaviourSingletonTemplate { - [SerializeField] TextMeshProUGUI[] texts_money; // 0 채팅 코인, 1 코인 + [SerializeField] TextMeshProUGUI[] texts_money; // 0 앨범 개방 재화, 1 채팅 재화, 2 뽑기 재화 [SerializeField] AttandanceUI m_AttandanceUI; [SerializeField] OptionUI m_OptionUI; @@ -26,8 +26,9 @@ public class LobbyUI : MonoBehaviourSingletonTemplate public void Set_Money() { - texts_money[0].text = SaveMgr.Ins.Get_Coin().ToString(); - texts_money[1].text = SaveMgr.Ins.Get_Coin().ToString(); + texts_money[0].text = SaveMgr.Ins.Get_Money(eMoney.AlbumOpen).ToString(); + texts_money[1].text = SaveMgr.Ins.Get_Money(eMoney.Chat).ToString(); + texts_money[2].text = SaveMgr.Ins.Get_Money(eMoney.Gacha).ToString(); } public void Show_Profile(int girlid) diff --git a/Assets/Scripts/UI/OptionUI.cs b/Assets/Scripts/UI/OptionUI.cs index 7d76231..554f1c6 100644 --- a/Assets/Scripts/UI/OptionUI.cs +++ b/Assets/Scripts/UI/OptionUI.cs @@ -1,6 +1,7 @@ using UnityEngine; public enum eOption { Sound, Bgm } +public enum eMoney { AlbumOpen, Chat, Gacha, Lucky } public class OptionUI : MonoBehaviour {