diff --git a/Assets/ResWork/UI_Image/money_coin.png b/Assets/ResWork/UI_Image/money_coin.png deleted file mode 100644 index 7c49e17..0000000 Binary files a/Assets/ResWork/UI_Image/money_coin.png and /dev/null differ diff --git a/Assets/ResWork/UI_Image/money_gacha.png b/Assets/ResWork/UI_Image/money_gacha.png index 9f6cbd2..7c49e17 100644 Binary files a/Assets/ResWork/UI_Image/money_gacha.png and b/Assets/ResWork/UI_Image/money_gacha.png differ 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 0000000..90dd20a Binary files /dev/null and b/Assets/ResWork/UI_Image/money_heart.png differ 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 0000000..9f6cbd2 Binary files /dev/null and b/Assets/ResWork/UI_Image/money_lucky.png differ 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 {