Skip to content

Commit

Permalink
Crew가 현재 들고있는 아이템명칭 UI로 띄우기 (#204)
Browse files Browse the repository at this point in the history
Crew가 현재 들고있는 아이템명칭 UI로 띄우기
  • Loading branch information
suyeon-ham-01 authored Jul 21, 2024
1 parent 3041152 commit 1d93767
Show file tree
Hide file tree
Showing 4 changed files with 413 additions and 9 deletions.
135 changes: 135 additions & 0 deletions Client/Assets/Resources/Prefabs/UI/SubItem/UI_Inventory.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ RectTransform:
- {fileID: 3237544514257050735}
- {fileID: 2174876590518667757}
- {fileID: 2617318669170650890}
- {fileID: 1313470784907506597}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
Expand Down Expand Up @@ -424,6 +425,140 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6484190912747206503
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1313470784907506597}
- component: {fileID: 9209733745396284250}
- component: {fileID: 1417345290581535491}
m_Layer: 5
m_Name: ItemName
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1313470784907506597
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6484190912747206503}
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: 5087923306822077969}
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: 126}
m_SizeDelta: {x: 500, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9209733745396284250
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6484190912747206503}
m_CullTransparentMesh: 1
--- !u!114 &1417345290581535491
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6484190912747206503}
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: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9d24e6b3ecd1d2b479a31d3d0e7b1f9e, type: 2}
m_sharedMaterial: {fileID: 21148088844906328, guid: 9d24e6b3ecd1d2b479a31d3d0e7b1f9e, 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: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 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 &6819388505600152098
GameObject:
m_ObjectHideFlags: 0
Expand Down
3 changes: 3 additions & 0 deletions Client/Assets/Scripts/Contents/Items/Inventory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public void GetItem(int itemId)
{
ItemInventory[CurrentItemIdx] = itemId;
Owner.CrewIngameUI.InventoryUI.Show(CurrentItemIdx, itemId);
Owner.CrewIngameUI.InventoryUI.ShowItemName(itemId);
Rpc_ShowItem(itemId);
return;
}
Expand All @@ -81,6 +82,7 @@ public void GetItem(int itemId)
{
ItemInventory[i] = itemId;
Owner.CrewIngameUI.InventoryUI.Show(i, itemId);
Owner.CrewIngameUI.InventoryUI.ShowItemName(itemId);
return;
}
}
Expand Down Expand Up @@ -152,6 +154,7 @@ public void ChangeItem(int idx)
Rpc_ShowItem(ItemInventory[idx]);

Owner.CrewIngameUI.InventoryUI.Highlight(idx);
Owner.CrewIngameUI.InventoryUI.ShowItemName(ItemInventory[idx]);
}

[Rpc(RpcSources.StateAuthority, RpcTargets.All)]
Expand Down
23 changes: 23 additions & 0 deletions Client/Assets/Scripts/UI/SubItem/UI_Inventory.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using Data;
using DG.Tweening;
using TMPro;
using Unity.VisualScripting;
Expand All @@ -16,6 +17,10 @@ enum Images
InventoryBox3,

}
enum Texts
{
ItemName,
}

public enum GameObjects
{
Expand All @@ -32,6 +37,7 @@ public override bool Init()

Bind<Image>(typeof(Images));
Bind<GameObject>(typeof(GameObjects));
Bind<TMP_Text>(typeof(Texts));

ItemList = new List<GameObject>(Define.MAX_ITEM_NUM);

Expand Down Expand Up @@ -91,4 +97,21 @@ public void Highlight(int idx)
}

}

public void ShowItemName(int itemId)
{
if (itemId == -1)
{
GetText(Texts.ItemName).text = "";
return;
}

foreach (var itemData in Managers.DataMng.ItemDataDict)
{
if (itemData.Value.DataId == itemId)
{
GetText(Texts.ItemName).text = itemData.Value.Name;
}
}
}
}
Loading

0 comments on commit 1d93767

Please sign in to comment.