From a20ab649bab645abd600a7e3cf75a51b6619e38c Mon Sep 17 00:00:00 2001 From: Ino Date: Sun, 26 Jan 2025 12:52:03 +0900 Subject: [PATCH] =?UTF-8?q?ingame=20=EB=8D=98=EC=A0=84=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B5=9C=EC=A0=81=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Res_Addr/MainUI/NewGameUI.prefab | 872 +++++++++++++++++- Assets/Script/Info/DungeonInfo.cs | 2 +- .../UI/Ingame/Dungeon/DungeonResultBase.cs | 6 +- .../UI/Ingame/Dungeon/DungeonResult_Mimic.cs | 8 +- .../UI/Ingame/Dungeon/Ingame_Dungeon.cs | 39 + .../UI/Ingame/Dungeon/Ingame_Dungeon.cs.meta | 11 + .../UI/Ingame/Dungeon/Ingame_DungeonBase.cs | 28 +- .../UI/Ingame/Dungeon/Ingame_DungeonResult.cs | 2 +- .../Script/UI/Ingame/Dungeon/Ingame_Maze.cs | 19 + .../UI/Ingame/Dungeon/Ingame_Maze.cs.meta | 11 + .../Script/UI/Ingame/Dungeon/Ingame_Mimic.cs | 17 +- Assets/Script/UI/NewGameUI.cs | 12 +- Assets/Script/Util/RealCamera.cs | 3 +- 13 files changed, 969 insertions(+), 61 deletions(-) create mode 100644 Assets/Script/UI/Ingame/Dungeon/Ingame_Dungeon.cs create mode 100644 Assets/Script/UI/Ingame/Dungeon/Ingame_Dungeon.cs.meta create mode 100644 Assets/Script/UI/Ingame/Dungeon/Ingame_Maze.cs create mode 100644 Assets/Script/UI/Ingame/Dungeon/Ingame_Maze.cs.meta diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 7c211be35..b0abac726 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -17414,17 +17414,15 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1747595491615064087} - 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: 6926501624763521184} - {fileID: 6726021543755060910} - {fileID: 5559723259040517081} - - {fileID: 2285388346794488827} - {fileID: 7740734557292902423} - m_Father: {fileID: 2647977513349308266} + m_Father: {fileID: 4024768543662385231} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17443,14 +17441,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf277f5bb8f738f43926a3ad2194673b, type: 3} m_Name: m_EditorClassIdentifier: - texts_base: - - {fileID: 3601867451939541280} - - {fileID: 730646458019674452} + texts_mimic: + - {fileID: 4312145534442857486} rewards: - {fileID: 5889812883037066294} - {fileID: 3893521988147105288} - texts_mimic: - - {fileID: 4312145534442857486} --- !u!1 &1749035969668327883 GameObject: m_ObjectHideFlags: 0 @@ -24351,6 +24346,155 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2305703955559398650 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5613022043633890129} + - component: {fileID: 2354267148583883516} + - component: {fileID: 8006139035428820225} + - component: {fileID: 988709634974324821} + m_Layer: 5 + m_Name: Local TMP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5613022043633890129 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2305703955559398650} + 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: 1205453522017600001} + 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: -0.5} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2354267148583883516 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2305703955559398650} + m_CullTransparentMesh: 1 +--- !u!114 &8006139035428820225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2305703955559398650} + 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: "\uADC0\uD658" + 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: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: -2 + 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 &988709634974324821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2305703955559398650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} + m_Name: + m_EditorClassIdentifier: + m_localtextKey: 0 --- !u!1 &2306231291553158214 GameObject: m_ObjectHideFlags: 0 @@ -26710,13 +26854,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2507736306777206807} - 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: 4125291560841242746} - m_Father: {fileID: 5608871440823519894} + m_Father: {fileID: 4024768543662385231} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -28157,14 +28301,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2644424872262499759} - 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: 4225438098843679793} - {fileID: 489680729177098707} - m_Father: {fileID: 5608871440823519894} + m_Father: {fileID: 4024768543662385231} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -31281,6 +31425,58 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2879830655862877759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6830918509122185040} + - component: {fileID: 2847080000113148853} + m_Layer: 5 + m_Name: Maze + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6830918509122185040 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2879830655862877759} + 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: 114266665929493878} + - {fileID: 1205453522017600001} + m_Father: {fileID: 4024768543662385231} + 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!114 &2847080000113148853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2879830655862877759} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a61071166a91194db8f077745f13f87, type: 3} + m_Name: + m_EditorClassIdentifier: + texts: + - {fileID: 8318546365529773748} --- !u!1 &2888385246475070331 GameObject: m_ObjectHideFlags: 0 @@ -31505,6 +31701,83 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2893895428447151847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1205453522017600001} + - component: {fileID: 911491269806375958} + - component: {fileID: 5575010546629682029} + m_Layer: 5 + m_Name: exit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1205453522017600001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2893895428447151847} + 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: 1481642389659742288} + - {fileID: 5613022043633890129} + m_Father: {fileID: 6830918509122185040} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -103, y: -107} + m_SizeDelta: {x: 103.23999, y: 105.28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &911491269806375958 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2893895428447151847} + m_CullTransparentMesh: 1 +--- !u!114 &5575010546629682029 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2893895428447151847} + 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: 79ed91652c5ba0c4a9b13c86ce407722, 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 &2910629264120723967 GameObject: m_ObjectHideFlags: 0 @@ -53463,6 +53736,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5035588907445856218 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1298389222829872580} + - component: {fileID: 6306967210243311188} + - component: {fileID: 5806428693164934216} + m_Layer: 5 + m_Name: i_money + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1298389222829872580 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5035588907445856218} + 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: 2775254610261780822} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 32.1, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6306967210243311188 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5035588907445856218} + m_CullTransparentMesh: 1 +--- !u!114 &5806428693164934216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5035588907445856218} + 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: 73e0df5777f8c384f85aea5ddb4e53d9, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5040239726474730018 GameObject: m_ObjectHideFlags: 0 @@ -55546,6 +55894,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5340370730190883327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 114266665929493878} + - component: {fileID: 5486215879314991116} + - component: {fileID: 5274219326297415717} + m_Layer: 5 + m_Name: remainmob + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &114266665929493878 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5340370730190883327} + 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: 2775254610261780822} + m_Father: {fileID: 6830918509122185040} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 200, y: -248} + m_SizeDelta: {x: 400, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5486215879314991116 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5340370730190883327} + m_CullTransparentMesh: 1 +--- !u!114 &5274219326297415717 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5340370730190883327} + 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: 0, g: 0, b: 0, a: 0.78431374} + 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: 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!1 &5343518034863687995 GameObject: m_ObjectHideFlags: 0 @@ -57594,6 +58018,151 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5534964448583472175 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1481642389659742288} + - component: {fileID: 8281871092071609663} + - component: {fileID: 7794487310436872140} + - component: {fileID: 8821201628474166939} + - component: {fileID: 5003639954578233386} + m_Layer: 5 + m_Name: btn_exit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1481642389659742288 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5534964448583472175} + 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: 1205453522017600001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 53.089985, y: -54.919983} + m_SizeDelta: {x: 89, y: 83} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8281871092071609663 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5534964448583472175} + m_CullTransparentMesh: 1 +--- !u!114 &7794487310436872140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5534964448583472175} + 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: 5fe23778afeb41641b0622fc1c91dc8d, 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 &8821201628474166939 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5534964448583472175} + 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: 7794487310436872140} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7427148544070994456} + m_TargetAssemblyTypeName: NewGameUI, Assembly-CSharp + m_MethodName: OnClick_Button + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 5534964448583472175} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &5003639954578233386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5534964448583472175} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5535659267998130781 GameObject: m_ObjectHideFlags: 0 @@ -62648,6 +63217,64 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 219 +--- !u!1 &6087577575337862780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4024768543662385231} + - component: {fileID: 1946010531556121886} + m_Layer: 5 + m_Name: Dungeon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4024768543662385231 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6087577575337862780} + 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: 6926501624763521184} + - {fileID: 2285388346794488827} + - {fileID: 5608871440823519894} + - {fileID: 6830918509122185040} + m_Father: {fileID: 2647977513349308266} + 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!114 &1946010531556121886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6087577575337862780} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c57e57be5ae5804abca520e1bcc6a7f, type: 3} + m_Name: + m_EditorClassIdentifier: + ingame_Dungeons: + - {fileID: 2334403847471317261} + - {fileID: 2847080000113148853} + texts_base: + - {fileID: 3601867451939541280} + - {fileID: 730646458019674452} --- !u!1 &6109199900000839799 GameObject: m_ObjectHideFlags: 0 @@ -79990,6 +80617,141 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 299 +--- !u!1 &7720334038578204869 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5569515327897315287} + - component: {fileID: 2040834458726603549} + - component: {fileID: 8318546365529773748} + m_Layer: 5 + m_Name: t_remainmob + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5569515327897315287 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7720334038578204869} + 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: 2775254610261780822} + 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.0000009536743} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2040834458726603549 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7720334038578204869} + m_CullTransparentMesh: 1 +--- !u!114 &8318546365529773748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7720334038578204869} + 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: 000.00a + 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: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: -8.97 + 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: 22.015648, 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 &7722005828032950067 GameObject: m_ObjectHideFlags: 0 @@ -81124,7 +81886,7 @@ RectTransform: - {fileID: 4825512513270908954} - {fileID: 9135424313123639976} - {fileID: 1905008210999496042} - - {fileID: 5608871440823519894} + - {fileID: 4024768543662385231} m_Father: {fileID: 5707331028172779298} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -90884,9 +91646,8 @@ MonoBehaviour: - {fileID: 4951935447657828334} gos_ingame: - {fileID: 2552047740856202517} - - {fileID: 1747595491615064087} - ingame_Dungeons: - - {fileID: 2334403847471317261} + - {fileID: 6087577575337862780} + ingame_dungeon: {fileID: 1946010531556121886} gos_etc: - {fileID: 2066618984469247578} tf_HUD: {fileID: 78458332371154066} @@ -92769,6 +93530,83 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8976538131098646968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2775254610261780822} + - component: {fileID: 2724899412017668770} + - component: {fileID: 3637599258925567498} + m_Layer: 5 + m_Name: MoneyForm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2775254610261780822 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8976538131098646968} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 5569515327897315287} + - {fileID: 1298389222829872580} + m_Father: {fileID: 114266665929493878} + 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: 200, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2724899412017668770 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8976538131098646968} + m_CullTransparentMesh: 1 +--- !u!114 &3637599258925567498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8976538131098646968} + 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: 43c835ef213bdb9418d24fd2a4be6237, 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 &8980096616651876263 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Info/DungeonInfo.cs b/Assets/Script/Info/DungeonInfo.cs index dbc433574..30e22a64d 100644 --- a/Assets/Script/Info/DungeonInfo.cs +++ b/Assets/Script/Info/DungeonInfo.cs @@ -13,7 +13,7 @@ public class DungeonInfo : MonoBehaviourSingletonTemplate ObscuredInt m_DieCount; - public void Stop_Dungeon(bool win) + public void Stop_Dungeon(bool? win) { act_Time = null; StopAllCoroutines(); diff --git a/Assets/Script/UI/Ingame/Dungeon/DungeonResultBase.cs b/Assets/Script/UI/Ingame/Dungeon/DungeonResultBase.cs index 4d3ecaa24..18db32e82 100644 --- a/Assets/Script/UI/Ingame/Dungeon/DungeonResultBase.cs +++ b/Assets/Script/UI/Ingame/Dungeon/DungeonResultBase.cs @@ -1,10 +1,6 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - public class DungeonResultBase : BackKeyAdd { - public virtual void Set(bool win) + public virtual void Set(bool? win) { base.Set(); } diff --git a/Assets/Script/UI/Ingame/Dungeon/DungeonResult_Mimic.cs b/Assets/Script/UI/Ingame/Dungeon/DungeonResult_Mimic.cs index c73e3f08b..b98389c71 100644 --- a/Assets/Script/UI/Ingame/Dungeon/DungeonResult_Mimic.cs +++ b/Assets/Script/UI/Ingame/Dungeon/DungeonResult_Mimic.cs @@ -5,8 +5,10 @@ public class DungeonResult_Mimic : DungeonResultBase public TextMeshProUGUI[] texts; // 0 성공 or 실패 public MoneyForm[] moneys; - public override void Set(bool win) + public override void Set(bool? win) { + if (DSUtil.CheckNull(win)) return; // 포기 + base.Set(win); var sdata = ServerInfo.Ins.m_ServerData; @@ -16,11 +18,11 @@ public class DungeonResult_Mimic : DungeonResultBase sdata.Use_Item(mapData.n_TicketID, 1); // 결과 표시 - texts[0].text = table_localtext.Ins.Get_Text(win ? 321 : 322); + texts[0].text = table_localtext.Ins.Get_Text(win.Value ? 321 : 322); moneys[0].Set(1, 0); moneys[1].Set(2, 0); - if (win) + if (win.Value) { // TODO 정인호 : 승리 시 보상 지급 if (sdata.Get_DungeonLv(eDungeon.d1_Mimic) < dungeonData.n_MapLv) diff --git a/Assets/Script/UI/Ingame/Dungeon/Ingame_Dungeon.cs b/Assets/Script/UI/Ingame/Dungeon/Ingame_Dungeon.cs new file mode 100644 index 000000000..51dcdbece --- /dev/null +++ b/Assets/Script/UI/Ingame/Dungeon/Ingame_Dungeon.cs @@ -0,0 +1,39 @@ +using TMPro; +using UnityEngine; + +public class Ingame_Dungeon : MonoBehaviour +{ + public Ingame_DungeonBase[] ingame_Dungeons; // 0 미믹, 1 미궁, 2 시련, 3 웨이브 + public TextMeshProUGUI[] texts_base; // 0 던전 정보, 1 남은 시간 + + public void Set(float time, int maxMobCount) + { + gameObject.SetActive(true); + Set_DungeonInfo(); + Set_TextTime(time); + for (int i = 0; i < ingame_Dungeons.Length; i++) + ingame_Dungeons[i].gameObject.SetActive(false); + ingame_Dungeons[MyValue.MyChoiceMapData.Get_DungeonIndex()].Set_DungeonInfo(maxMobCount); + DungeonInfo.Ins.m_Time = time; + DungeonInfo.Ins.act_Time = Set_TextTime; + } + + void Set_DungeonInfo() + { + var mapData = table_battlemapconfig.Ins.Get_Data(MyValue.MyChoiceMapData.n_MapID); + switch (MyValue.MyChoiceMapData.Get_DungeonMapData_orNull().e_DungeonType) + { + case eDungeon.d1_Mimic: + texts_base[0].text = $"{mapData.Get_Name()} Lv.{MyValue.MyChoiceMapData.n_DungeonLv}"; + break; + case eDungeon.d2_Maze: + texts_base[0].text = $"{mapData.Get_Name()} F{MyValue.MyChoiceMapData.n_DungeonLv}"; + break; + case eDungeon.d3_Nightmare: + break; + case eDungeon.d4_Wave: + break; + } + } + void Set_TextTime(float time) { texts_base[1].text = Mathf.Max(0f, time).ToString("F2"); } +} \ No newline at end of file diff --git a/Assets/Script/UI/Ingame/Dungeon/Ingame_Dungeon.cs.meta b/Assets/Script/UI/Ingame/Dungeon/Ingame_Dungeon.cs.meta new file mode 100644 index 000000000..e3b715128 --- /dev/null +++ b/Assets/Script/UI/Ingame/Dungeon/Ingame_Dungeon.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9c57e57be5ae5804abca520e1bcc6a7f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs b/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs index 4262a15a0..b64d68ba6 100644 --- a/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs +++ b/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs @@ -1,29 +1,21 @@ +using CodeStage.AntiCheat.ObscuredTypes; using TMPro; using UnityEngine; public class Ingame_DungeonBase : MonoBehaviour { - public TextMeshProUGUI[] texts_base; // 0 던전&Lv, 1 남은 시간 - public MoneyForm[] rewards; + protected ObscuredInt MaxMobCount, MobCount; - public virtual void Set(float time) + public virtual void Set_DungeonInfo(int maxMobCount) { gameObject.SetActive(true); - Set_DungeonNameLv(); - Set_TextTime(time); - DungeonInfo.Ins.m_Time = time; - DungeonInfo.Ins.act_Time = Set_TextTime; - // TODO 정인호 : 올바른 보상으로 변경 필요 - rewards[0].Set(1, 0); - rewards[1].Set(2, 0); - } - public void Set_DungeonNameLv() - { - var mapData = table_battlemapconfig.Ins.Get_Data(MyValue.MyChoiceMapData.n_MapID); - texts_base[0].text = $"{mapData.Get_Name()} Lv {MyValue.MyChoiceMapData.n_DungeonLv}"; - } - void Set_TextTime(float time) { texts_base[1].text = Mathf.Max(0f, time).ToString("F2"); } - public virtual void Set_MaxMobCount(int maxCount) { } + MaxMobCount = maxMobCount; + MaxMobCount.RandomizeCryptoKey(); + + DungeonInfo.Ins.m_MaxDieMobCount = MaxMobCount; + DungeonInfo.Ins.m_MaxDieMobCount.RandomizeCryptoKey(); + DungeonInfo.Ins.act_MobDieCount = Add_MobCount; + } public virtual void Add_MobCount(int mobid) { } } \ No newline at end of file diff --git a/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonResult.cs b/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonResult.cs index 9ca9580d3..7c4921d3b 100644 --- a/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonResult.cs +++ b/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonResult.cs @@ -2,7 +2,7 @@ public class Ingame_DungeonResult : MonoBehaviourSingletonTemplate { public GameObject[] gos; // 0 공용 ui, 1 로비 ui들, 2 인게임 ui들, 3 농장 ui들 - public GameObject[] gos_ingame; // 0 스테이지, 1 미믹, 2 미궁, 3 시련, 4 웨이브 - public Ingame_DungeonBase[] ingame_Dungeons; // 0 미믹, 1 미궁, 2 시련, 3 웨이브 + public GameObject[] gos_ingame; // 0 스테이지, 1 던전 + public Ingame_Dungeon ingame_dungeon; public GameObject[] gos_etc; // 0 힘민지 레벨업 public Transform tf_HUD; public GuideQuestUI m_GuideQuestUI; @@ -65,10 +65,7 @@ public class NewGameUI : MonoBehaviourSingletonTemplate DSUtil.InActivateGameObjects(gos_ingame, 1); var dungeonData = MyValue.MyChoiceMapData.Get_DungeonMapData_orNull(); if (!DSUtil.CheckNull(dungeonData)) - { - ingame_Dungeons[0].Set(dungeonData.f_Time); - ingame_Dungeons[0].Set_MaxMobCount(dungeonData.n_MobCount); - } + ingame_dungeon.Set(dungeonData.f_Time, dungeonData.n_MobCount); break; } @@ -104,7 +101,10 @@ public class NewGameUI : MonoBehaviourSingletonTemplate if (!DSUtil.CheckNull(FarmFarmUI.Ins) && FarmFarmUI.Ins.isActiveAndEnabled) FarmFarmUI.Ins.ReturnToFarm(); else + { + DungeonInfo.Ins.Stop_Dungeon(null); InGameInfo.Ins.Return_To_Lobby(); + } break; } } diff --git a/Assets/Script/Util/RealCamera.cs b/Assets/Script/Util/RealCamera.cs index e16cee680..d407139a7 100644 --- a/Assets/Script/Util/RealCamera.cs +++ b/Assets/Script/Util/RealCamera.cs @@ -181,7 +181,8 @@ public class RealCamera : MyCoroutine // TODO 정인호 : 게임 시작 시 컨텐츠 등 체크 주석 처리 switch (MyValue.MyChoiceMapData.n_MapID) { - case 1001: DungeonInfo.Ins.Start_Mimic(); break; // 미믹던전 + case 1001: DungeonInfo.Ins.Start_Mimic(); break; // 미믹 던전 + case 1002: break; // 수상한 미궁 } }