diff --git a/Assets/ResWork/Table/Export/GachaReward.json b/Assets/ResWork/Table/Export/GachaReward.json index 1af0d09..8f91a78 100644 --- a/Assets/ResWork/Table/Export/GachaReward.json +++ b/Assets/ResWork/Table/Export/GachaReward.json @@ -1 +1 @@ -[{"n_GachaGrade": "1", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "5", "n_RewardMaxCount": "10", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "2", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "3", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "4", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "5", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "6", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "7", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "8", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}] \ No newline at end of file +[{"n_GachaGrade": "1", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "2", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "3", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "2", "n_RewardMaxCount": "5", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "4", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "5", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "6", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "7", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "8", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/SheGotWet.xlsm b/Assets/ResWork/Table/SheGotWet.xlsm index 61e1f7d..fffaa98 100644 Binary files a/Assets/ResWork/Table/SheGotWet.xlsm and b/Assets/ResWork/Table/SheGotWet.xlsm differ diff --git a/Assets/ResWork/UI_Prefab/ProfileCard.prefab b/Assets/ResWork/UI_Prefab/ProfileCard.prefab index aa5bbc6..d2c3fae 100644 --- a/Assets/ResWork/UI_Prefab/ProfileCard.prefab +++ b/Assets/ResWork/UI_Prefab/ProfileCard.prefab @@ -755,6 +755,142 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1496588960619996004 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 689564406113734849} + - component: {fileID: 3982302324735865554} + - component: {fileID: 8761830655882391269} + m_Layer: 5 + m_Name: btnName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &689564406113734849 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1496588960619996004} + 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: 1587256608825020144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3982302324735865554 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1496588960619996004} + m_CullTransparentMesh: 1 +--- !u!114 &8761830655882391269 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1496588960619996004} + 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: "\uC568\uBC94 \uC5F4\uAE30" + 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: 20 + m_fontSizeMax: 80 + 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} --- !u!1 &1812564448893730408 GameObject: m_ObjectHideFlags: 0 @@ -1275,6 +1411,153 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Sound: 0 +--- !u!1 &6118212189904897713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1587256608825020144} + - component: {fileID: 8510158145573039426} + - component: {fileID: 1109412501006253144} + - component: {fileID: 601821858013055166} + - component: {fileID: 3803330935748310952} + m_Layer: 5 + m_Name: btn_album + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1587256608825020144 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6118212189904897713} + 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: 689564406113734849} + m_Father: {fileID: 2198343314357404905} + 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: 129} + m_SizeDelta: {x: 714, y: 158} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8510158145573039426 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6118212189904897713} + m_CullTransparentMesh: 1 +--- !u!114 &1109412501006253144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6118212189904897713} + 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: e177b954bb5aa1b4dbb1f46b9598ee42, 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!114 &601821858013055166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6118212189904897713} + 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: 1109412501006253144} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1500570637917298069} + m_TargetAssemblyTypeName: ProfileCard, Assembly-CSharp + m_MethodName: OnClick_Album + 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 &3803330935748310952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6118212189904897713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4848326f7db925d4fbcdb35f789b75f5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Sound: 0 --- !u!1 &6488644166046883144 GameObject: m_ObjectHideFlags: 0 @@ -1744,6 +2027,7 @@ RectTransform: - {fileID: 7424248208501071733} - {fileID: 2193820590508799635} - {fileID: 5404220870936619555} + - {fileID: 1587256608825020144} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1771,6 +2055,8 @@ MonoBehaviour: go_lock: {fileID: 1368934236442359443} go_openbtn: {fileID: 5762353980434385379} go_viewbtn: {fileID: 4007246598957671079} + go_albumbtn: {fileID: 6118212189904897713} + rect: {fileID: 0} --- !u!1 &8512964498684640329 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 73cc591..b716cf2 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -26418,6 +26418,8 @@ GameObject: - component: {fileID: 1017439550} - component: {fileID: 1017439552} - component: {fileID: 1017439551} + - component: {fileID: 1017439554} + - component: {fileID: 1017439553} m_Layer: 5 m_Name: btn_autorefill m_TagString: Untagged @@ -26485,6 +26487,75 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1017439549} m_CullTransparentMesh: 1 +--- !u!114 &1017439553 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1017439549} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4848326f7db925d4fbcdb35f789b75f5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Sound: 0 +--- !u!114 &1017439554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1017439549} + 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: 1485126439} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2013608479} + m_TargetAssemblyTypeName: GachaUI, Assembly-CSharp + m_MethodName: OnClick_Gacha + 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!1 &1017764907 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index ba8c381..a159e0e 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -160,7 +160,30 @@ public class SaveMgr : MonoBehaviourSingletonTemplate public bool Check_Money(eMoney money, int amount, bool showToast = true) { var enough = Get_Money(money) >= amount; - if (!enough && showToast) LobbyUI.Ins.m_ToastUI.Set("재화가 부족합니다."); + if (!enough && showToast) + { + switch (money) + { + case eMoney.AlbumOpen: + LobbyUI.Ins.m_ToastUI.Set("하트가 부족합니다."); + break; + case eMoney.Chat: + LobbyUI.Ins.m_ToastUI.Set("채팅 코인이 부족합니다."); + break; + case eMoney.Gacha: + LobbyUI.Ins.m_ToastUI.Set("뽑기 재화가 부족합니다."); + break; + case eMoney.Lucky: + LobbyUI.Ins.m_ToastUI.Set("클로버가 부족합니다."); + break; + case eMoney.MiniGameHP: + case eMoney.ItemBomb: + case eMoney.ItemUmbrella: + case eMoney.ItemDildo: + LobbyUI.Ins.m_ToastUI.Set("재화가 부족합니다."); + break; + } + } return enough; } diff --git a/Assets/Scripts/UI/AlbumUI.cs b/Assets/Scripts/UI/AlbumUI.cs index d76236c..73db0f5 100644 --- a/Assets/Scripts/UI/AlbumUI.cs +++ b/Assets/Scripts/UI/AlbumUI.cs @@ -6,11 +6,13 @@ public class AlbumUI : uScrollViewMgr int curGirl = 1; - public void Set() + public void Set(int girlid = 0) { gameObject.SetActive(true); SoundInfo.Ins.Play_BGM(eBGM.b006_Album); + if (girlid > 0) curGirl = girlid; + Set_ScrollView(table_album.Ins.Get_DataList(curGirl)); texts[0].text = table_girl.Ins.Get_Data(curGirl).s_Name; diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 5b8e284..89bfc27 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -38,7 +38,7 @@ public class GachaUI : uScrollViewMgr { SaveMgr.Ins.Add_Money(eMoney.Gacha, table_GlobalValue.Ins.Get_Int("GachaAutoRefill_Amount")); SaveMgr.Ins.Save(); - LobbyUI.Ins.m_ToastUI.Set($"가챠 코인 {table_GlobalValue.Ins.Get_Int("GachaAutoRefill_Amount")}개가 충전되었습니다."); + LobbyUI.Ins.m_ToastUI.Set($"뽑기 재화 {table_GlobalValue.Ins.Get_Int("GachaAutoRefill_Amount")}개가 충전되었습니다."); Set_Money(); } @@ -157,7 +157,7 @@ public class GachaUI : uScrollViewMgr ADInfo.Ins.Show_AD(false, () => { SaveMgr.Ins.Add_Money(eMoney.Gacha, table_GlobalValue.Ins.Get_Int("GachaAD_Reward")); - LobbyUI.Ins.m_ToastUI.Set($"가챠 코인 {table_GlobalValue.Ins.Get_Int("GachaAD_Reward")}개를 획득했습니다."); + LobbyUI.Ins.m_ToastUI.Set($"뽑기 재화 {table_GlobalValue.Ins.Get_Int("GachaAD_Reward")}개를 획득했습니다."); Set_Money(); }); } diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index 62f6510..da61b86 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -95,6 +95,13 @@ public class LobbyUI : MonoBehaviourSingletonTemplate DSUtil.ActivateGameObjects(gos_homeBot); } + public void Go_Album(int girlid) + { + Go_Home(); + m_AlbumUI.Set(girlid); + DSUtil.InActivateGameObjects(gos_homeBot); + } + public void Set_Money() { texts_money[0].text = SaveMgr.Ins.Get_Money(eMoney.AlbumOpen).ToString(); diff --git a/Assets/Scripts/UI/ProfileCard.cs b/Assets/Scripts/UI/ProfileCard.cs index 126512b..9ec8fbe 100644 --- a/Assets/Scripts/UI/ProfileCard.cs +++ b/Assets/Scripts/UI/ProfileCard.cs @@ -7,7 +7,7 @@ public class ProfileCard : MonoBehaviour { public Image i_girl, i_openbtn; public TextMeshProUGUI[] texts; // 0 이름, 1 카운트 - public GameObject go_lock, go_openbtn, go_viewbtn; + public GameObject go_lock, go_openbtn, go_viewbtn, go_albumbtn; public RectTransform rect; girltabledata m_Data; @@ -46,7 +46,8 @@ public class ProfileCard : MonoBehaviour go_lock.SetActive(count == 0); go_openbtn.SetActive(count == 0); i_openbtn.sprite = UIAtlasMgr.Ins.Get_Sprite(CanOpen() ? "red btn long" : "black btn"); - go_viewbtn.SetActive(count > 0 && count < maxcount); + go_viewbtn.SetActive(count == 0); + go_albumbtn.SetActive(count > 0); } bool CanOpen() @@ -99,4 +100,9 @@ public class ProfileCard : MonoBehaviour } } } + + public void OnClick_Album() + { + LobbyUI.Ins.Go_Album(m_Data.n_GirlID); + } } \ No newline at end of file diff --git a/Assets/Scripts/UI/ShopCard.cs b/Assets/Scripts/UI/ShopCard.cs index 3da704a..35f5ed2 100644 --- a/Assets/Scripts/UI/ShopCard.cs +++ b/Assets/Scripts/UI/ShopCard.cs @@ -111,7 +111,7 @@ public class ShopCard : MonoBehaviour if (m_Data.n_RewardGacha > 0) { if (!string.IsNullOrEmpty(msg)) msg += "\n"; - msg += $"가챠 코인 {m_Data.n_RewardGacha}개를 획득했습니다."; + msg += $"뽑기 재화 {m_Data.n_RewardGacha}개를 획득했습니다."; } if (string.IsNullOrEmpty(msg)) msg = "보상이 없습니다.\n보상을 설정해 주세요!";