From 26d62a77407d0675ccadac9daba165655a4b1bbd Mon Sep 17 00:00:00 2001 From: Ino Date: Fri, 4 Apr 2025 08:12:48 +0900 Subject: [PATCH] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A7=B5=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Ino_nerdnavis.txt | 8 - Assets/Res_Addr/MainUI/NewGameUI.prefab | 656 ++++++++++++++++++ Assets/Script/HUD/HUDBase.cs | 20 +- Assets/Script/HUD/HUDDMGUI.cs | 2 + Assets/Script/Info/ActorInfo.cs | 31 +- Assets/Script/Info/SceneInfo.cs | 2 +- Assets/Script/UI/Menu/Menu_Pet.cs | 2 +- Assets/Script/UI/PC/PCUI.cs | 2 +- Assets/Script/UI/TestMap/TM_MonsterCard.cs | 2 +- .../Script/UI/TestMap/TM_MonsterCard.prefab | 2 +- Assets/Script/UI/TestMap/TM_MonsterSet.cs | 4 + Assets/Script/UI/TestMap/TestMapUIMgr.cs | 26 + 12 files changed, 734 insertions(+), 23 deletions(-) diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 85644f764..89000302f 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -99,12 +99,4 @@ messageinfo 엄청 느린 버그 pc 애님 (캐스팅 추가) 보스 이펙트 -테스트맵 - - 원하는 몬스터 소환 - -- 소환할 위치 - -- 몬스터 지정(grid) - -- 스탯을 참고할 스폰 아이디 지정 (grid) - -- 마리 수 지정 (화살표) - - 스킬 사용 - -- 스크롤뷰와 grid로 모든 스킬을 보여주자 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index d777c8b1c..de63dd344 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -4130,6 +4130,7 @@ MonoBehaviour: m_Content: {fileID: 0} go_card: {fileID: 2261714799255785422, guid: 711c0c87409b1b24b81d190342cea22a, type: 3} m_Tab: {fileID: 6414270508706471073} + IF_SpwandID: {fileID: 8111143800296665369} --- !u!1 &292069746378707017 GameObject: m_ObjectHideFlags: 0 @@ -13800,6 +13801,141 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1154921788146926715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5880807657122190105} + - component: {fileID: 3160522675146919740} + - component: {fileID: 793632240392250547} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5880807657122190105 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154921788146926715} + 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: 4536373089078247988} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3160522675146919740 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154921788146926715} + m_CullTransparentMesh: 1 +--- !u!114 &793632240392250547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154921788146926715} + 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: "\u200B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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_enableWordWrapping: 0 + 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 &1191353588696093643 GameObject: m_ObjectHideFlags: 0 @@ -16154,6 +16290,141 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1333461458682339234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2384986109559161238} + - component: {fileID: 7483432302236970769} + - component: {fileID: 4869585984678516786} + m_Layer: 5 + m_Name: New TMP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2384986109559161238 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333461458682339234} + 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: 8266477789588184924} + 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: -48, y: 45} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7483432302236970769 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333461458682339234} + m_CullTransparentMesh: 1 +--- !u!114 &4869585984678516786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333461458682339234} + 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: "\uC2A4\uD3F0ID\uB97C \uC785\uB825\uD574 \uC8FC\uC138\uC694." + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + 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: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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_enableWordWrapping: 0 + 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 &1334210832602912031 GameObject: m_ObjectHideFlags: 0 @@ -36015,6 +36286,162 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2780785783093285931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3704281907013353072} + - component: {fileID: 3696327606723345937} + - component: {fileID: 2677928960182262936} + - component: {fileID: 1815141337697422892} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3704281907013353072 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2780785783093285931} + 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: 4536373089078247988} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3696327606723345937 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2780785783093285931} + m_CullTransparentMesh: 1 +--- !u!114 &2677928960182262936 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2780785783093285931} + 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: 1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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_enableWordWrapping: 0 + 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!114 &1815141337697422892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2780785783093285931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &2785771500466844372 GameObject: m_ObjectHideFlags: 0 @@ -49642,6 +50069,182 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &3811100858001179390 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8266477789588184924} + - component: {fileID: 3082191524986047560} + - component: {fileID: 1289406038699387690} + - component: {fileID: 8111143800296665369} + m_Layer: 5 + m_Name: inputfield_ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8266477789588184924 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3811100858001179390} + 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: 4536373089078247988} + - {fileID: 2384986109559161238} + m_Father: {fileID: 8585202757416314878} + 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: 908, y: 409} + m_SizeDelta: {x: 250, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3082191524986047560 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3811100858001179390} + m_CullTransparentMesh: 1 +--- !u!114 &1289406038699387690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3811100858001179390} + 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: 65f581562538e304cbbfe8ee3beab09c, 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!114 &8111143800296665369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3811100858001179390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, 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: 1289406038699387690} + m_TextViewport: {fileID: 4536373089078247988} + m_TextComponent: {fileID: 793632240392250547} + m_Placeholder: {fileID: 2677928960182262936} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 2 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 4 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 2 + m_RegexValue: + m_GlobalPointSize: 20 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: 1 + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + m_InputValidator: {fileID: 0} --- !u!1 &3812173630179791725 GameObject: m_ObjectHideFlags: 0 @@ -53085,6 +53688,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5838774971616076489} + - {fileID: 8266477789588184924} m_Father: {fileID: 4118852035281969175} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -114198,6 +114802,58 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8937069097238302383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4536373089078247988} + - component: {fileID: 7290604346969224186} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4536373089078247988 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8937069097238302383} + 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: 3704281907013353072} + - {fileID: 5880807657122190105} + m_Father: {fileID: 8266477789588184924} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7290604346969224186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8937069097238302383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -8, y: -5, z: -8, w: -5} + m_Softness: {x: 0, y: 0} --- !u!1 &8941710599572121335 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/HUD/HUDBase.cs b/Assets/Script/HUD/HUDBase.cs index 95acd9a0e..76ef18e78 100644 --- a/Assets/Script/HUD/HUDBase.cs +++ b/Assets/Script/HUD/HUDBase.cs @@ -7,6 +7,7 @@ public class HUDBase : MyCoroutine protected Camera m_Camera; protected float OffTime; + protected bool isUpdate = true; bool isRect = false, isCanvasRect = false, isMainCam = false, isTarget = false; @@ -38,14 +39,8 @@ public class HUDBase : MyCoroutine void Update() { - if (isTarget && isCanvasRect && isMainCam) - { - Vector2 ViewportPosition = m_Camera.WorldToViewportPoint(m_Target.position); - Vector2 WorldObject_ScreenPosition = new Vector2( - (ViewportPosition.x * m_CanvasRect.sizeDelta.x) - (m_CanvasRect.sizeDelta.x * 0.5f), - (ViewportPosition.y * m_CanvasRect.sizeDelta.y) - (m_CanvasRect.sizeDelta.y * 0.5f) - 15f); - m_RectTransform.anchoredPosition = WorldObject_ScreenPosition; - } + if (isUpdate && isTarget && isCanvasRect && isMainCam) + Set_Pos(); if (OffTime > 0f) { @@ -55,6 +50,15 @@ public class HUDBase : MyCoroutine } } + protected void Set_Pos() + { + Vector2 ViewportPosition = m_Camera.WorldToViewportPoint(m_Target.position); + Vector2 WorldObject_ScreenPosition = new Vector2( + (ViewportPosition.x * m_CanvasRect.sizeDelta.x) - (m_CanvasRect.sizeDelta.x * 0.5f), + (ViewportPosition.y * m_CanvasRect.sizeDelta.y) - (m_CanvasRect.sizeDelta.y * 0.5f) - 15f); + m_RectTransform.anchoredPosition = WorldObject_ScreenPosition; + } + public static string Get_TextColor(eAttackType _attacktype) { switch (_attacktype) diff --git a/Assets/Script/HUD/HUDDMGUI.cs b/Assets/Script/HUD/HUDDMGUI.cs index a34935709..c452cacbd 100644 --- a/Assets/Script/HUD/HUDDMGUI.cs +++ b/Assets/Script/HUD/HUDDMGUI.cs @@ -21,6 +21,7 @@ public class HUDDMGUI : HUDBase gameObject.SetActive(true); Set_Target(_target); + Set_Pos(); Vector3 randomPosition = new Vector3( Random.Range(-25f, 25f), // x 축 랜덤 범위 @@ -37,6 +38,7 @@ public class HUDDMGUI : HUDBase m_Index = usedmg2 ? 1 : 0; OffTime = destroyTime; + isUpdate = false; } private void LateUpdate() diff --git a/Assets/Script/Info/ActorInfo.cs b/Assets/Script/Info/ActorInfo.cs index 5229b0b96..4f59a8f0d 100644 --- a/Assets/Script/Info/ActorInfo.cs +++ b/Assets/Script/Info/ActorInfo.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using UnityEngine; public class ActorInfo : MonoBehaviour @@ -21,7 +20,7 @@ public class ActorInfo : MonoBehaviour Actor m_MyWorker; - public void Destroy_Mobs() + public void Destroy_All() { if (!DSUtil.CheckNull(m_MyWorker)) Destroy(m_MyWorker.gameObject); @@ -55,6 +54,34 @@ public class ActorInfo : MonoBehaviour } } } + public void Destroy_Mob() + { + // dic_actor 딕셔너리에서 destroylst에 포함된 역할(eRole)에 해당하는 항목만 처리 + if (dic_actor.ContainsKey(eRole.Mob)) + { + // 역할에 해당하는 그룹들을 가져옴 + var groupDict = dic_actor[eRole.Mob]; + + foreach (var groupEntry in groupDict) + { + // 그룹 내의 모든 MobActor 리스트를 비움 + foreach (var prefabEntry in groupEntry.Value) + { + foreach (var mobActor in prefabEntry.Value) + { + if (mobActor != null) + { + // mobActor 게임 오브젝트를 제거 + Destroy(mobActor.gameObject); + } + } + + // 해당 리스트를 비움 + prefabEntry.Value.Clear(); + } + } + } + } public void All_Stop(bool _stop) { diff --git a/Assets/Script/Info/SceneInfo.cs b/Assets/Script/Info/SceneInfo.cs index f908ba3fd..6aeb7eb0a 100644 --- a/Assets/Script/Info/SceneInfo.cs +++ b/Assets/Script/Info/SceneInfo.cs @@ -28,7 +28,7 @@ public class SceneInfo : MonoBehaviour IEnumerator Co_Control_AddScene(BattleMapConfigTableData _stagedata, bool _add, Action addloadend) { - ActorInfo.Ins.Destroy_Mobs(); + ActorInfo.Ins.Destroy_All(); if (_add) { DSUtil.StartStopWatch(); diff --git a/Assets/Script/UI/Menu/Menu_Pet.cs b/Assets/Script/UI/Menu/Menu_Pet.cs index f0dd70b12..f86f267e2 100644 --- a/Assets/Script/UI/Menu/Menu_Pet.cs +++ b/Assets/Script/UI/Menu/Menu_Pet.cs @@ -6,7 +6,7 @@ public class Menu_Pet : MenuBase GameUI.Ins.Clear_newItem(eItem.Pet); GameUI.Ins.LobbyUI.Set_Noti(); - ActorInfo.Ins.Destroy_Mobs(); + ActorInfo.Ins.Destroy_All(); PCInfo.Ins.Make_Actors(false, ServerInfo.Ins.m_ServerData); } } \ No newline at end of file diff --git a/Assets/Script/UI/PC/PCUI.cs b/Assets/Script/UI/PC/PCUI.cs index e987d029a..9d1bf63d6 100644 --- a/Assets/Script/UI/PC/PCUI.cs +++ b/Assets/Script/UI/PC/PCUI.cs @@ -39,7 +39,7 @@ public class PCUI : BotMenuBase var sdata = ServerInfo.Ins.m_ServerData; if (PCInfoUI.Ins.m_PCInfoUI_Center.CostumeIdWhenEnter != sdata.Get_EqiupmentEquip(eItem.PCCostume)) { - ActorInfo.Ins.Destroy_Mobs(); + ActorInfo.Ins.Destroy_All(); CoroutineMgr.Ins.Set_Coroutine(() => { PCInfo.Ins.Make_Actors(false, ServerInfo.Ins.m_ServerData); diff --git a/Assets/Script/UI/TestMap/TM_MonsterCard.cs b/Assets/Script/UI/TestMap/TM_MonsterCard.cs index 797b296e0..5c02b555e 100644 --- a/Assets/Script/UI/TestMap/TM_MonsterCard.cs +++ b/Assets/Script/UI/TestMap/TM_MonsterCard.cs @@ -19,6 +19,6 @@ public class TM_MonsterCard : CardBase public void OnClick_Monster() { - + TestMapUIMgr.Ins.MakeMob(m_Data); } } \ No newline at end of file diff --git a/Assets/Script/UI/TestMap/TM_MonsterCard.prefab b/Assets/Script/UI/TestMap/TM_MonsterCard.prefab index a8148dfe1..c0de9efb2 100644 --- a/Assets/Script/UI/TestMap/TM_MonsterCard.prefab +++ b/Assets/Script/UI/TestMap/TM_MonsterCard.prefab @@ -37,7 +37,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 350, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1963176489152581527 MonoBehaviour: diff --git a/Assets/Script/UI/TestMap/TM_MonsterSet.cs b/Assets/Script/UI/TestMap/TM_MonsterSet.cs index 543ae6402..abe1702b0 100644 --- a/Assets/Script/UI/TestMap/TM_MonsterSet.cs +++ b/Assets/Script/UI/TestMap/TM_MonsterSet.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; +using TMPro; public class TM_MonsterSet : uScrollViewMgr { public TabUIBase m_Tab; + public TMP_InputField IF_SpwandID; List tabUIDatas = new List { @@ -26,4 +28,6 @@ public class TM_MonsterSet : uScrollViewMgr { Set_ScrollView(table_monsterlist.Ins.Get_DataList(eSubRol.None + m_Tab.Get_Index())); } + + public int Get_SpawnID() { return int.Parse(IF_SpwandID.text); } } \ No newline at end of file diff --git a/Assets/Script/UI/TestMap/TestMapUIMgr.cs b/Assets/Script/UI/TestMap/TestMapUIMgr.cs index 477f8abe4..27ec2431c 100644 --- a/Assets/Script/UI/TestMap/TestMapUIMgr.cs +++ b/Assets/Script/UI/TestMap/TestMapUIMgr.cs @@ -7,6 +7,9 @@ public class TestMapUIMgr : MonoBehaviourSingletonTemplate public TM_ClassChange m_TM_ClassChange; public TM_MonsterSet m_TM_MonsterSet; + MobActor MobActor; + Vector3 MobPos = new Vector3(15, 0, 20); + private void Start() { Set_TestBtns(false); } public void Set_TestBtns(bool active) { @@ -26,4 +29,27 @@ public class TestMapUIMgr : MonoBehaviourSingletonTemplate break; } } + + public void MakeMob(MonsterTableData mobData) + { + if (!DSUtil.CheckNull(MobActor)) + { + ActorInfo.Ins.Destroy_Mob(); + ActorInfo.Ins.All_DelTarget(); + MobActor = null; + } + AddrResourceMgr.Ins.LoadObject(mobData.s_MonsterPrefab, handle => + { + MobActor = DSUtil.Get_Clone(handle.Result); + AddrResourceMgr.Ins.Set_AddressableReleaseSelf(MobActor.gameObject); + ActorInfo.Ins.Add_Actor(MobActor, eRole.Mob, m_TM_MonsterSet.Get_SpawnID(), mobData.s_MonsterPrefab); + + MobActor.Set(true, null, null, m_TM_MonsterSet.Get_SpawnID(), false); + MobActor.Set(mobData, MobPos, null, 0); + MobActor.MagicID = 0; + + ToastUI.Ins.Set(174, "스폰 아이디 : " + m_TM_MonsterSet.Get_SpawnID()); + m_TM_MonsterSet.OnClick_Back(); + }); + } } \ No newline at end of file