From ccb96e74c50c13c8fea4b31a0337bf0c9b70b82e Mon Sep 17 00:00:00 2001 From: Nam Tae Gun Date: Sun, 30 Jun 2024 16:26:14 +0900 Subject: [PATCH] =?UTF-8?q?Ver=200.2.3.3=20=EC=B6=94=EA=B0=80=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + 타이틀 씬에서 전투 씬으로 넘어갈 때 Fade 효과 추가 + 맵 하드리셋(개발자 기능) 기능 보완 + 전투 씬 투명 벽 기울기 변경 --- Assets/01.Scenes/00.CombatTitle.unity | 242 +++++++++++++++++- Assets/01.Scenes/02.Combat.unity | 133 ++++++++-- Assets/02.Scripts/CombatTitle.cs | 29 ++- Assets/02.Scripts/FadeableObject.cs | 8 +- Assets/02.Scripts/Item/Item.cs | 7 + Assets/02.Scripts/Map/BossMapController.cs | 10 +- Assets/02.Scripts/Map/MapManager.cs | 55 +++- Assets/02.Scripts/Prop/DamageableProps.cs | 1 + Assets/02.Scripts/SceneController.cs | 64 +++++ Assets/02.Scripts/SceneController.cs.meta | 2 + .../GhostBarrelMapController.prefab | 32 ++- .../RhinocerosMapController.prefab | 12 + .../SandMoleMapController.prefab | 24 ++ .../TitanSlimeMapController.prefab | 12 + 14 files changed, 571 insertions(+), 60 deletions(-) create mode 100644 Assets/02.Scripts/SceneController.cs create mode 100644 Assets/02.Scripts/SceneController.cs.meta diff --git a/Assets/01.Scenes/00.CombatTitle.unity b/Assets/01.Scenes/00.CombatTitle.unity index 1e8ba4fda..571d40aee 100644 --- a/Assets/01.Scenes/00.CombatTitle.unity +++ b/Assets/01.Scenes/00.CombatTitle.unity @@ -566,19 +566,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 730470679} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1033584371} - m_TargetAssemblyTypeName: BlueWater.CombatTitle, Assembly-CSharp - m_MethodName: MoveCombatScene - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!222 &70018144 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2097,6 +2085,108 @@ Transform: m_CorrespondingSourceObject: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3} m_PrefabInstance: {fileID: 290960549} m_PrefabAsset: {fileID: 0} +--- !u!1 &318028664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 318028665} + - component: {fileID: 318028668} + - component: {fileID: 318028667} + - component: {fileID: 318028666} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &318028665 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318028664} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 892343558} + m_Father: {fileID: 1146332831} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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_Pivot: {x: 0, y: 0} +--- !u!114 &318028666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318028664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 131071 +--- !u!114 &318028667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318028664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &318028668 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318028664} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 --- !u!1001 &323457238 PrefabInstance: m_ObjectHideFlags: 0 @@ -2458,7 +2548,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0.2.3.1 + m_text: 0.2.3.3 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} @@ -4691,6 +4781,81 @@ Transform: m_CorrespondingSourceObject: {fileID: 1759992658637499492, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3} m_PrefabInstance: {fileID: 885041302} m_PrefabAsset: {fileID: 0} +--- !u!1 &892343557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 892343558} + - component: {fileID: 892343561} + - component: {fileID: 892343560} + m_Layer: 5 + m_Name: FadeImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &892343558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892343557} + 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: 318028665} + 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 &892343560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892343557} + 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} + 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: 0} + 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!222 &892343561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892343557} + m_CullTransparentMesh: 1 --- !u!1001 &899742314 PrefabInstance: m_ObjectHideFlags: 0 @@ -5180,6 +5345,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _playerInput: {fileID: 1033584372} + _startGameButton: {fileID: 0} _versionText: {fileID: 397955065} --- !u!114 &1033584372 MonoBehaviour: @@ -5663,6 +5829,53 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8cb4efe6ab794f4589d73b6409c0805, type: 3} +--- !u!1 &1146332829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1146332831} + - component: {fileID: 1146332830} + m_Layer: 0 + m_Name: SceneController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1146332830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1146332829} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5ca94a2fd9aa2c14887148a32c81c89d, type: 3} + m_Name: + m_EditorClassIdentifier: + _persistent: 1 + _fadeImage: {fileID: 0} +--- !u!4 &1146332831 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1146332829} + serializedVersion: 2 + 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: 318028665} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1195513126 PrefabInstance: m_ObjectHideFlags: 0 @@ -8508,3 +8721,4 @@ SceneRoots: - {fileID: 1140484491} - {fileID: 755077372} - {fileID: 1737564161} + - {fileID: 1146332831} diff --git a/Assets/01.Scenes/02.Combat.unity b/Assets/01.Scenes/02.Combat.unity index 1287a01f4..47d705017 100644 --- a/Assets/01.Scenes/02.Combat.unity +++ b/Assets/01.Scenes/02.Combat.unity @@ -7166,6 +7166,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1206154451 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7552954649617714894, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + m_PrefabInstance: {fileID: 1213070729} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1213070729 PrefabInstance: m_ObjectHideFlags: 0 @@ -7174,6 +7179,70 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 211686351190013617, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 273643524520274305, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 508133420378597468, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 857551287423669627, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 1576972457658766333, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 2122778274936698033, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 2150817190929853395, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 2662135811704040197, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 2914730198431351358, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 3258375676830944573, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 3339358036742971384, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 3512591213849984336, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 3713544861169825562, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 4769361081507518620, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 5089318288915627261, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 5213666354453927902, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -7198,6 +7267,38 @@ PrefabInstance: propertyPath: _targetTransform value: objectReference: {fileID: 370354195} + - target: {fileID: 6989726840575198319, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 7084709524600620447, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 7224376288430619370, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 7757053934426929694, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 7901769230670009824, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 8307675722400072130, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 8486843696081227819, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} + - target: {fileID: 8517502738071781815, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + propertyPath: SpawnLocation + value: + objectReference: {fileID: 1206154451} - target: {fileID: 9047568094936844708, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} propertyPath: _targetTransform value: @@ -11626,6 +11727,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 0 + _titanSlimeMapControllerPrefab: {fileID: 7629976349863100293, guid: 9246d6576382b724b978b10dd59f0204, type: 3} + _rhinocerosMapControllerPrefab: {fileID: 7772076497191242295, guid: 7be5e4576e1df014681bc79bda3589f5, type: 3} + _sandMoleMapControllerPrefab: {fileID: 4232848145969149048, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} + _ghostBarrelMapControllerPrefab: {fileID: 3955281403578119589, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} k__BackingField: {fileID: 36953787} k__BackingField: {fileID: 1011270532} k__BackingField: {fileID: 1213070730} @@ -12508,34 +12613,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} - propertyPath: m_LocalPosition.z - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5230841042572963376, guid: 3440e59cd42f2524baa2539b7ace5ba4, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 diff --git a/Assets/02.Scripts/CombatTitle.cs b/Assets/02.Scripts/CombatTitle.cs index 47e44be38..9fdc8057c 100644 --- a/Assets/02.Scripts/CombatTitle.cs +++ b/Assets/02.Scripts/CombatTitle.cs @@ -4,7 +4,6 @@ using UnityEditor; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.InputSystem; -using UnityEngine.SceneManagement; using UnityEngine.UI; namespace BlueWater.Titles @@ -13,19 +12,42 @@ namespace BlueWater.Titles { [SerializeField] private PlayerInput _playerInput; + + [SerializeField] + private Button _startGameButton; [SerializeField] private TMP_Text _versionText; + private bool _isQuitting; + private void Awake() { InitializeComponents(); } + private void Start() + { + _startGameButton.onClick.AddListener(SceneController.Instance.FadeIn); + } + + private void OnApplicationQuit() + { + _isQuitting = true; + } + + private void OnDestroy() + { + if (_isQuitting) return; + + _startGameButton.onClick.RemoveListener(SceneController.Instance.FadeIn); + } + [Button("컴포넌트 초기화")] private void InitializeComponents() { _playerInput = GetComponent(); + _startGameButton = transform.Find("TitleMenuUi/ButtonPanel/StartGameButton").GetComponent