diff --git a/Assets/ResWork/UI_Prefab/ProfileCard.prefab b/Assets/ResWork/UI_Prefab/ProfileCard.prefab index 3d13203..e83e9dc 100644 --- a/Assets/ResWork/UI_Prefab/ProfileCard.prefab +++ b/Assets/ResWork/UI_Prefab/ProfileCard.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uB370\uC774\uD2B8 \uC77C\uC9C0" + m_text: "\uCE90\uB9AD\uD130 \uC5F4\uAE30" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} @@ -680,6 +680,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1368934236442359443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7424248208501071733} + - component: {fileID: 7056230276935685709} + - component: {fileID: 28775962029469211} + m_Layer: 5 + m_Name: Lock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7424248208501071733 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368934236442359443} + 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: 2198343314357404905} + 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 &7056230276935685709 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368934236442359443} + m_CullTransparentMesh: 1 +--- !u!114 &28775962029469211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368934236442359443} + 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: 0.99607843} + 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: b839469401ee8ae43b315c709f1c2c1e, 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!1 &1812564448893730408 GameObject: m_ObjectHideFlags: 0 @@ -755,6 +830,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2471925338338434829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 594374514011203856} + - component: {fileID: 8747423659550864430} + - component: {fileID: 182698008305147382} + m_Layer: 5 + m_Name: i_girl + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &594374514011203856 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471925338338434829} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.05, y: 1.05, z: 1.05} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2818588515836731281} + 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: 800, y: 1200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8747423659550864430 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471925338338434829} + m_CullTransparentMesh: 1 +--- !u!114 &182698008305147382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471925338338434829} + 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: 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!1 &3354796956953253563 GameObject: m_ObjectHideFlags: 0 @@ -953,13 +1103,13 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8261734003590410589} - m_TargetAssemblyTypeName: - m_MethodName: + - m_Target: {fileID: 1500570637917298069} + m_TargetAssemblyTypeName: ProfileCard, Assembly-CSharp + m_MethodName: OnClick_Preview m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -991,7 +1141,7 @@ GameObject: - component: {fileID: 3794086305937583354} - component: {fileID: 5724245782865690301} m_Layer: 5 - m_Name: btn_date + m_Name: btn_open m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1246,13 +1396,13 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8261734003590410589} - m_TargetAssemblyTypeName: - m_MethodName: + - m_Target: {fileID: 1500570637917298069} + m_TargetAssemblyTypeName: ProfileCard, Assembly-CSharp + m_MethodName: OnClick_Chat m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -1417,78 +1567,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4848326f7db925d4fbcdb35f789b75f5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &7152525620851818114 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4843280630633616871} - - component: {fileID: 6072438213773435589} - - component: {fileID: 3020232006706770101} - m_Layer: 5 - m_Name: RawImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4843280630633616871 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7152525620851818114} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.05, y: 1.05, z: 1.05} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 2818588515836731281} - 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: 800, y: 1200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6072438213773435589 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7152525620851818114} - m_CullTransparentMesh: 1 ---- !u!114 &3020232006706770101 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7152525620851818114} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 38faf4b1b79d421409ae711c54f00723, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!1 &7329642902270004680 GameObject: m_ObjectHideFlags: 0 @@ -1657,10 +1735,11 @@ RectTransform: - {fileID: 2818588515836731281} - {fileID: 1039204968577201673} - {fileID: 3180898226814736061} - - {fileID: 2193820590508799635} - - {fileID: 5404220870936619555} - {fileID: 8841014955698521924} - {fileID: 6865647023647736279} + - {fileID: 7424248208501071733} + - {fileID: 2193820590508799635} + - {fileID: 5404220870936619555} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1680,6 +1759,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3f9736f5cf1c4e74cac0a6beacb2757e, type: 3} m_Name: m_EditorClassIdentifier: + i_girl: {fileID: 182698008305147382} + texts: + - {fileID: 5855298802571274231} + - {fileID: 1655211012379948500} + go_lock: {fileID: 1368934236442359443} --- !u!1 &8512964498684640329 GameObject: m_ObjectHideFlags: 0 @@ -1787,7 +1871,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4843280630633616871} + - {fileID: 594374514011203856} m_Father: {fileID: 2198343314357404905} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 0db0ec7..bb1f19f 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2433,6 +2433,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 85747004} + - component: {fileID: 85747005} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -2452,7 +2453,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1908634718} - {fileID: 1483615884} + - {fileID: 1374291676} - {fileID: 215303475} - {fileID: 1637965215} m_Father: {fileID: 2062026438} @@ -2462,6 +2465,22 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} +--- !u!114 &85747005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 85747003} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 47a841eb82f38f245b3986ab80185b77, type: 3} + m_Name: + m_EditorClassIdentifier: + arr_profileCard: + - {fileID: 1908634719} + - {fileID: 1483615885} + - {fileID: 1374291675} --- !u!1 &90196064 GameObject: m_ObjectHideFlags: 0 @@ -5408,14 +5427,14 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1703079397} - m_TargetAssemblyTypeName: - m_MethodName: - m_Mode: 1 + - m_Target: {fileID: 85747005} + m_TargetAssemblyTypeName: LobbyCenterProfileUI, Assembly-CSharp + m_MethodName: OnClick_Arrow + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: -1 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -5435,7 +5454,7 @@ MonoBehaviour: 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_RaycastPadding: {x: -50, y: -500, z: 0, w: -500} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -32355,6 +32374,135 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373561823} m_CullTransparentMesh: 1 +--- !u!1001 &1374291674 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 85747004} + m_Modifications: + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_SizeDelta.x + value: 830.30005 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_SizeDelta.y + value: 1156.2 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 232 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 178.3 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8261734003590410589, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_Name + value: ProfileCard_next + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} +--- !u!114 &1374291675 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1500570637917298069, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + m_PrefabInstance: {fileID: 1374291674} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f9736f5cf1c4e74cac0a6beacb2757e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1374291676 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + m_PrefabInstance: {fileID: 1374291674} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1377006156 PrefabInstance: m_ObjectHideFlags: 0 @@ -34631,6 +34779,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} m_PrefabInstance: {fileID: 7617528676548254869} m_PrefabAsset: {fileID: 0} +--- !u!114 &1483615885 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1500570637917298069, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + m_PrefabInstance: {fileID: 7617528676548254869} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f9736f5cf1c4e74cac0a6beacb2757e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1483641687 GameObject: m_ObjectHideFlags: 0 @@ -38065,14 +38224,14 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1703079397} - m_TargetAssemblyTypeName: - m_MethodName: - m_Mode: 1 + - m_Target: {fileID: 85747005} + m_TargetAssemblyTypeName: LobbyCenterProfileUI, Assembly-CSharp + m_MethodName: OnClick_Arrow + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 1 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -38092,7 +38251,7 @@ MonoBehaviour: 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_RaycastPadding: {x: -50, y: -500, z: 0, w: -500} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -40005,6 +40164,7 @@ MonoBehaviour: m_OptionUI: {fileID: 2034573240} m_ProfileUI: {fileID: 1457200138} m_ToastUI: {fileID: 1357839140} + m_LobbyCenterProfileUI: {fileID: 85747005} m_AlbumUI: {fileID: 476355707} m_GachaUI: {fileID: 2013608479} gos_homeBot: @@ -44217,6 +44377,135 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1902189014} m_CullTransparentMesh: 1 +--- !u!1001 &1908634717 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 85747004} + m_Modifications: + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_SizeDelta.x + value: 830.3 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_SizeDelta.y + value: 1156.2 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchoredPosition.x + value: -232 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 178.3 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8261734003590410589, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + propertyPath: m_Name + value: ProfileCard_pre + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} +--- !u!224 &1908634718 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2198343314357404905, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + m_PrefabInstance: {fileID: 1908634717} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1908634719 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1500570637917298069, guid: 9df5d1d82e35edb4e98c606d7d69f8f4, type: 3} + m_PrefabInstance: {fileID: 1908634717} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f9736f5cf1c4e74cac0a6beacb2757e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1915699143 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index 2af503b..46a474c 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -213,6 +213,17 @@ public class SaveMgr : MonoBehaviourSingletonTemplate public void Open_Image() { ++m_SaveData.GirlUnLockIndex; } public int Get_UnLockIndex() { return m_SaveData.GirlUnLockIndex; } public int Get_SelectGirlID() { return m_SaveData.SelectGirlID; } + public int Get_ImageCount(int girlid) + { + var lst = table_album.Ins.Get_DataList(girlid); + var count = 0; + for (int i = 0; i < lst.Count; i++) + { + if (lst[i].n_Index <= Get_UnLockIndex()) + ++count; + } + return count; + } public bool CanShowGachaAD(bool showtoast = true) { diff --git a/Assets/Scripts/UI/LobbyCenterProfileUI.cs b/Assets/Scripts/UI/LobbyCenterProfileUI.cs index 3cc6937..c82b8f6 100644 --- a/Assets/Scripts/UI/LobbyCenterProfileUI.cs +++ b/Assets/Scripts/UI/LobbyCenterProfileUI.cs @@ -1,13 +1,34 @@ using UnityEngine; -public class LobbyCenterProfileUI : uScrollViewMgr +public class LobbyCenterProfileUI : MonoBehaviour { // 카드는 3개만 있으면 됨 // 움직이는 연출 후 UI 갱신하면 될 듯 public ProfileCard[] arr_profileCard; + int curGirl = 0; + public void Set() { + if (curGirl == 0) curGirl = SaveMgr.Ins.Get_SelectGirlID(); + var pre_girl = curGirl - 1; + if (pre_girl <= 0) pre_girl = 8; + arr_profileCard[0].Set(pre_girl); + + arr_profileCard[1].Set(curGirl); + + var next_girl = curGirl + 1; + if (next_girl > 8) next_girl = 1; + arr_profileCard[2].Set(next_girl); + } + + public void OnClick_Arrow(int add) + { + curGirl += add; + if (curGirl <= 0) curGirl = 8; + if (curGirl > 8) curGirl = 1; + + Set(); } } \ No newline at end of file diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index 896670f..a205760 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -13,6 +13,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate public ToastUI m_ToastUI; [Header("Center UI")] + [SerializeField] LobbyCenterProfileUI m_LobbyCenterProfileUI; public AlbumUI m_AlbumUI; [SerializeField] GachaUI m_GachaUI; @@ -30,6 +31,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate if (SaveMgr.Ins.CanGet_Attandance()) m_AttandanceUI.Set(); ADInfo.Ins.Set_Banner(true); + m_LobbyCenterProfileUI.Set(); //Act_Repeat_for1sec = () => //{ // if (SaveMgr.Ins.Get_Money(eMoney.MiniGameHP) <= 0) diff --git a/Assets/Scripts/UI/ProfileCard.cs b/Assets/Scripts/UI/ProfileCard.cs index 6b5ee96..fd100ab 100644 --- a/Assets/Scripts/UI/ProfileCard.cs +++ b/Assets/Scripts/UI/ProfileCard.cs @@ -1,14 +1,50 @@ +using TMPro; using UnityEngine; +using UnityEngine.ResourceManagement.AsyncOperations; +using UnityEngine.UI; -public class ProfileCard : CardBase +public class ProfileCard : MonoBehaviour { - public override void Set(T _base, int iLoop = -1, int idata = -1) + public Image i_girl; + public TextMeshProUGUI[] texts; // 0 이름, 1 카운트 + public GameObject go_lock; + + girltabledata m_Data; + AsyncOperationHandle m_Handle; + + public void Set(int girlid) { - base.Set(_base, iLoop, idata); + m_Data = table_girl.Ins.Get_Data(girlid); + var count = SaveMgr.Ins.Get_ImageCount(girlid); + texts[0].text = m_Data.s_Name; + texts[1].text = $"{count}/{table_album.Ins.Get_DataList(girlid).Count}"; + + i_girl.enabled = false; + AddrResourceMgr.Ins.Relese(m_Handle); + AddrResourceMgr.Ins.LoadObject(m_Data.s_ProfileImage, handle => + { + m_Handle = handle; + i_girl.enabled = true; + i_girl.sprite = handle.Result; + go_lock.SetActive(count == 0); + }); } public void OnClick_Profile() { - LobbyUI.Ins.Show_Profile(1); + LobbyUI.Ins.Show_Profile(m_Data.n_GirlID); + } + + public void OnClick_Chat() + { + + } + + public void OnClick_Preview() + { // 훔쳐보기 + ADInfo.Ins.Show_AD(false, () => + { + + }); } } \ No newline at end of file diff --git a/Assets/SheGotWet_Memo.txt b/Assets/SheGotWet_Memo.txt index 187e6ed..c867edf 100644 --- a/Assets/SheGotWet_Memo.txt +++ b/Assets/SheGotWet_Memo.txt @@ -1,6 +1,5 @@ 사운드 및 BGM 요청 훔쳐보기 -프로필 카드 광고 제거권 - 구매 후 UI 처리 \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c71c37a..e0b004f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -676,7 +676,7 @@ PlayerSettings: webGLCloseOnQuit: 0 webWasm2023: 0 scriptingDefineSymbols: - Android: OneStore + Android: additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: @@ -754,7 +754,7 @@ PlayerSettings: XboxOneOverrideIdentityPublisher: vrEditorSettings: {} cloudServicesEnabled: - Purchasing: 1 + Purchasing: 0 luminIcon: m_Name: m_ModelFolderPath: @@ -776,11 +776,11 @@ PlayerSettings: captureStartupLogs: {} activeInputHandler: 2 windowsGamepadBackendHint: 0 - cloudProjectId: 0104de87-c3cd-4a56-9e76-7f5636d25f9e + cloudProjectId: d97188a8-ddcf-4c62-aec0-61e04758fd10 framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] - projectName: Shegotwet - organizationId: kuma3trio + projectName: "\uC816\uC5B4\uBC84\uB9B0 \uADF8\uB140" + organizationId: toneworker cloudEnabled: 0 legacyClampBlendShapeWeights: 0 hmiLoadingImage: {fileID: 0} diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 66a0c3a..699db18 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -17,7 +17,7 @@ UnityConnectSettings: m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: - m_Enabled: 1 + m_Enabled: 0 m_TestMode: 0 UnityAnalyticsSettings: m_Enabled: 1