From 2bfbd23efaa88e5f4fc7d3c79a4fc5dab40319c3 Mon Sep 17 00:00:00 2001 From: Ino Date: Mon, 30 Dec 2024 12:38:36 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EB=B9=84=20=EC=9E=AC=ED=99=94=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Ino_nerdnavis.txt | 7 +- Assets/Res_Addr/MainUI/NewGameUI.prefab | 122 ++++++------------ Assets/Script/UI/Lobby.meta | 8 ++ Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs | 16 +++ .../UI/Lobby/Lobby_TopRightMoney.cs.meta | 11 ++ 5 files changed, 80 insertions(+), 84 deletions(-) create mode 100644 Assets/Script/UI/Lobby.meta create mode 100644 Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs create mode 100644 Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs.meta diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 32f4c899e..e7b299a1f 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -39,12 +39,9 @@ classconfig 에 의해 정해짐 인게임 - 터레인 제외, 메시 베이커로 통째로 묶기 //로비 - 퍼펙트 컬링 -로비 UI - 어드레서블 다운로드 % 정상적으로 나오게 수정 코스튬 - - 3D 캐릭터도 PCActor를 이용하거나 하나의 클래스를 이용해서 코스튬 변경 공통 처리 - 코스튬 이미지는 아틀라스가 아닌 동적 로딩 - - 코스튬 테이블 (코스튬 이미지 컬럼 필요) - + - 캐릭터 세팅 함수 만들기 (wizardactor 추가, 실드, 오른손 무기 부모 오브젝트) - 이 세팅은 직업 추가마다 필요 +// - 코스튬마다 PC프리팹 생성(메시 동적 로딩 시 렌더링이 안됨) diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 02a0da717..d5005e141 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -13330,6 +13330,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6415367922768528216} - {fileID: 4670786236948560329} - {fileID: 3948127612777823680} - {fileID: 365265949171303323} @@ -43278,6 +43279,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6415367922768528216} + - component: {fileID: 3003035928386648149} m_Layer: 5 m_Name: TopRightMoney m_TagString: Untagged @@ -43292,20 +43294,35 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3340698869356713028} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 454094203320341425} - {fileID: 6074532687477413714} - m_Father: {fileID: 8541309915134075684} + m_Father: {fileID: 2931286266799411332} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} 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!114 &3003035928386648149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3340698869356713028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc30b105a4b475440840fcb059c719dc, type: 3} + m_Name: + m_EditorClassIdentifier: + moneyForms: + - {fileID: 5368538365786500580} + - {fileID: 1765611427192416519} --- !u!1 &3352638603616735713 GameObject: m_ObjectHideFlags: 0 @@ -66578,81 +66595,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &5140779454963648927 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4017780368161633585} - - component: {fileID: 6331997280093003375} - - component: {fileID: 8206848122107761042} - m_Layer: 5 - m_Name: New Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4017780368161633585 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5140779454963648927} - 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: 5707331028172779298} - 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 &6331997280093003375 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5140779454963648927} - m_CullTransparentMesh: 1 ---- !u!114 &8206848122107761042 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5140779454963648927} - 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.39215687} - 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: e8d93d38bbbbcf24692e0d83f25bd03b, 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 &5146723921990515021 GameObject: m_ObjectHideFlags: 0 @@ -95958,7 +95900,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3764310506534080148} - - {fileID: 6415367922768528216} - {fileID: 795777954291663711} - {fileID: 4698706880244843650} m_Father: {fileID: 5707331028172779298} @@ -113057,7 +112998,6 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4017780368161633585} - {fileID: 8144537169185330793} - {fileID: 7862232602542509387} - {fileID: 8460797171243959167} @@ -135174,6 +135114,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 150bed98d110cb24292c78f18534decd, type: 3} +--- !u!114 &1765611427192416519 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + m_PrefabInstance: {fileID: 4579599350137899904} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &6074532687477413714 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, @@ -144173,6 +144125,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7894342126215516003} m_PrefabAsset: {fileID: 0} +--- !u!114 &5368538365786500580 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + m_PrefabInstance: {fileID: 7894342126215516003} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7983416844920088928 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Script/UI/Lobby.meta b/Assets/Script/UI/Lobby.meta new file mode 100644 index 000000000..b16c6b34f --- /dev/null +++ b/Assets/Script/UI/Lobby.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d42b2ef0b25cab94881b7731770e0bbe +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs b/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs new file mode 100644 index 000000000..8a53a26d6 --- /dev/null +++ b/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs @@ -0,0 +1,16 @@ +public class Lobby_TopRightMoney : MyCoroutine +{ + public MoneyForm[] moneyForms; + + private void Start() + { + Set_Money(); + Act_Repeat_for1sec = Set_Money; + } + + void Set_Money() + { + moneyForms[0].Set(1); + moneyForms[1].Set(2); + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs.meta b/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs.meta new file mode 100644 index 000000000..263f53783 --- /dev/null +++ b/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cc30b105a4b475440840fcb059c719dc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: