iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closes #210 보스 체력바 연동

Browse Source 
+ 보스방 진입시 보스 전용 Hp UI 추가
+ 전투 플레이어 스킬(검의 왈츠)의 공격할 때 나타나는 파티클의 위치가 랜덤으로 변경되었습니다.
This commit is contained in:
NTG 2024-02-16 18:50:48 +09:00
parent 6bbf6b2b86
commit 8a2eb81bee
12 changed files with 1357 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

611
BlueWater/Assets/01.Scenes/02.Combat.unity
View File

@ -50457,215 +50457,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7c74013a507d5ee41aaa788b34008632, type: 3}
--- !u!1001 &227408847
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1033584370}
m_Modifications:
- target: {fileID: 6935276923615949947, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_SizeDelta.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: 6935276923615949947, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161161, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_Value
value: 38.3
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_SizeDelta.x
value: 550
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_SizeDelta.y
value: 25
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalScale.x
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalScale.y
value: 2.4999998
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalScale.z
value: 4.9999995
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 70
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161207, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_Name
value: FieldBossHpSlider
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161207, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925344686068, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.383
objectReference: {fileID: 0}
- target: {fileID: 6935276925344686068, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925344686068, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.383
objectReference: {fileID: 0}
- target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.383
objectReference: {fileID: 0}
- target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_SizeDelta.x
value: -4
objectReference: {fileID: 0}
- target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 6935276924355341542, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
insertIndex: 1
addedObject: {fileID: 1487152771}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 27422d4ba1ec18843b41367444c27888, type: 3}
--- !u!224 &227408848 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
m_PrefabInstance: {fileID: 227408847}
m_PrefabAsset: {fileID: 0}
--- !u!224 &227408849 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6935276924355341542, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
m_PrefabInstance: {fileID: 227408847}
m_PrefabAsset: {fileID: 0}
--- !u!1 &227422892
GameObject:
m_ObjectHideFlags: 0
@ -224976,7 +224767,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
autoInit: 1
<MainCanvas>k__BackingField: {fileID: 1033584369}
<MainSkillUi>k__BackingField: {fileID: 0}
<MainSkillUi>k__BackingField: {fileID: 1049575630}
<FieldBossHpSlider>k__BackingField: {fileID: 259569763562170414}
--- !u!114 &1033584366
MonoBehaviour:
m_ObjectHideFlags: 0
@ -225067,7 +224859,7 @@ RectTransform:
m_Children:
- {fileID: 1049575629}
- {fileID: 1263289741}
- {fileID: 227408848}
- {fileID: 6935276924833861689}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -267008,7 +266800,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3ee283b48c3d38c4690a7711c3276571, type: 3}
m_Name:
m_EditorClassIdentifier:
<BossPrefab>k__BackingField: {fileID: 1907803032604947452, guid: 9ea7800dae26e5f4bbbfba64b7e9485a,
<FieldBossPrefab>k__BackingField: {fileID: 4327795848059932565, guid: 9ea7800dae26e5f4bbbfba64b7e9485a,
type: 3}
<BossSpawnTransform>k__BackingField: {fileID: 1695233646}
<PlayerSpawnTransform>k__BackingField: {fileID: 1879350455}
@ -324946,225 +324738,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b2b66f67c4e0cd1428fa2979ab927044, type: 3}
--- !u!1001 &1487152770
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 227408849}
m_Modifications:
- target: {fileID: 3117305648944083602, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276923615949944, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276923615949947, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_SizeDelta.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: 6935276923615949947, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276924355341560, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_SizeDelta.x
value: 550
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_SizeDelta.y
value: 25
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 7.1249886
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6935276925009161207, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_Name
value: DamageEffectSlider
objectReference: {fileID: 0}
- target: {fileID: 6935276925344686068, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925344686068, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925344686068, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925499279529, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925499279529, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925499279529, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_SizeDelta.x
value: -4
objectReference: {fileID: 0}
- target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 27422d4ba1ec18843b41367444c27888, type: 3}
--- !u!224 &1487152771 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6935276925009161206, guid: 27422d4ba1ec18843b41367444c27888,
type: 3}
m_PrefabInstance: {fileID: 1487152770}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1487228916
GameObject:
m_ObjectHideFlags: 0
@ -470744,6 +470317,18 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5298767684352439159}
m_Mesh: {fileID: 4454405101669365225, guid: 5a63bad46f4cf7d44be13283c7a7ba43, type: 3}
--- !u!114 &259569763562170414 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8872277884121036844, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
m_PrefabInstance: {fileID: 4829317944892221277}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 83ac3111825f0b644bf51d74137b4215, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!23 &311912098363045613
MeshRenderer:
m_ObjectHideFlags: 0
@ -482815,6 +482400,164 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1001 &4829317944892221277
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1033584370}
m_Modifications:
- target: {fileID: 1313160884585907518, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.383
objectReference: {fileID: 0}
- target: {fileID: 1313160884585907518, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1313160884585907518, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.383
objectReference: {fileID: 0}
- target: {fileID: 2513939532057100650, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2513939532057100650, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6183366295492682478, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_Name
value: FieldBossHpSlider
objectReference: {fileID: 0}
- target: {fileID: 6183366295492682478, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6974188938870355608, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.383
objectReference: {fileID: 0}
- target: {fileID: 6974188938870355608, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_SizeDelta.x
value: 550
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_SizeDelta.y
value: 25
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 70
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 39cf0016300932947917aaefb2a0c1ef, type: 3}
--- !u!23 &4911918927702558746
MeshRenderer:
m_ObjectHideFlags: 0
@ -495923,6 +495666,12 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!224 &6935276924833861689 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef,
type: 3}
m_PrefabInstance: {fileID: 4829317944892221277}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7005472922457178149
GameObject:
m_ObjectHideFlags: 0

24
BlueWater/Assets/02.Scripts/BossController.cs
View File

@ -5,12 +5,12 @@ namespace BlueWaterProject
{
public class BossController : MonoBehaviour
{
[field: SerializeField] public GameObject BossPrefab { get; set; }
[field: SerializeField] public FieldBoss FieldBossPrefab { get; set; }
[field: SerializeField] public Transform BossSpawnTransform { get; set; }
[field: SerializeField] public Transform PlayerSpawnTransform { get; set; }
[SerializeField] private Transform bossInstantiateLocation;
private GameObject instantiatedBoss;
private FieldBoss instantiatedBoss;
private void Start()
{
@ -21,40 +21,44 @@ namespace BlueWaterProject
{
if (!instantiatedBoss)
{
instantiatedBoss = Instantiate(BossPrefab, BossSpawnTransform.position, Quaternion.identity, bossInstantiateLocation);
instantiatedBoss = Instantiate(FieldBossPrefab, BossSpawnTransform.position, Quaternion.identity, bossInstantiateLocation);
}
instantiatedBoss.SetActive(false);
instantiatedBoss.gameObject.SetActive(false);
}
public void ResetBoss()
{
if (instantiatedBoss)
{
if (instantiatedBoss.activeSelf)
if (instantiatedBoss.gameObject.activeSelf)
{
Destroy(instantiatedBoss);
Destroy(instantiatedBoss.gameObject);
}
}
UiManager.Inst.CombatUi.FieldBossHpSlider.SetActiveHpSlider(false);
}
public void Respawn()
{
if (instantiatedBoss)
{
if (instantiatedBoss.activeSelf)
if (instantiatedBoss.gameObject.activeSelf)
{
Destroy(instantiatedBoss);
Destroy(instantiatedBoss.gameObject);
}
else
{
instantiatedBoss.transform.position = BossSpawnTransform.position;
instantiatedBoss.SetActive(true);
instantiatedBoss.gameObject.SetActive(true);
UiManager.Inst.CombatUi.FieldBossHpSlider.SetHpSlider(instantiatedBoss.MaxHp, instantiatedBoss.name);
return;
}
}
instantiatedBoss = Instantiate(BossPrefab, BossSpawnTransform.position, Quaternion.identity, bossInstantiateLocation);
instantiatedBoss = Instantiate(FieldBossPrefab, BossSpawnTransform.position, Quaternion.identity, bossInstantiateLocation);
UiManager.Inst.CombatUi.FieldBossHpSlider.SetHpSlider(instantiatedBoss.MaxHp, instantiatedBoss.name);
}
}
}

12
BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldBoss/FieldBoss.cs
View File

@ -27,8 +27,9 @@ namespace BlueWaterProject
[SerializeField] protected SpriteRenderer spriteRenderer;
// 보스 스탯
[Title("보스 스탯")]
[SerializeField] protected float maxHp = 100f;
[field: Title("보스 스탯")]
[field: SerializeField] protected string Name { get; private set; }
[field: SerializeField] public float MaxHp { get; private set; } = 500f;
[SerializeField] protected float moveSpeed = 3f;
[SerializeField] protected LayerMask targetLayer;
@ -67,10 +68,6 @@ namespace BlueWaterProject
protected static readonly int IsHitHash = Shader.PropertyToID("_IsHit");
// [SerializeField] private Slider hpSlider;
// [SerializeField] private Slider damageEffectSlider;
// [SerializeField] private float damageEffectSpeed = 0.1f;
#endregion
/***********************************************************************
@ -118,7 +115,7 @@ namespace BlueWaterProject
{
agent.updateRotation = false;
agent.speed = moveSpeed;
SetCurrentHp(maxHp);
SetCurrentHp(MaxHp);
Target = GameObject.FindGameObjectWithTag("CombatPlayer").GetComponent<Collider>();
flashWhiteWaitTime = new WaitForSeconds(flashWhiteTime);
@ -148,6 +145,7 @@ namespace BlueWaterProject
var changeHp = Mathf.Max(CurrentHp - attackerPower, 0);
SetCurrentHp(changeHp);
UiManager.Inst.CombatUi.FieldBossHpSlider.UpdateHpSlider(changeHp);
// 죽었는지 체크
if (changeHp == 0f)

8
BlueWater/Assets/02.Scripts/CombatUi.cs
View File

@ -1,6 +1,5 @@
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.UI;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
@ -13,6 +12,7 @@ namespace BlueWaterProject
[field: Title("UI")]
[field: SerializeField] public Canvas MainCanvas { get; private set; }
[field: SerializeField] public SkillUi MainSkillUi { get; private set; }
[field: SerializeField] public FieldBossHpSlider FieldBossHpSlider { get; private set; }
[Button("셋팅 초기화")]
@ -26,6 +26,7 @@ namespace BlueWaterProject
}
MainSkillUi = MainCanvas.transform.Find("MainSkillUi").GetComponent<SkillUi>();
FieldBossHpSlider = MainCanvas.transform.Find("FieldBossHpSlider").GetComponent<FieldBossHpSlider>();
}
private void Awake()
@ -37,10 +38,5 @@ namespace BlueWaterProject
UiManager.Inst.CombatUi = this;
}
private void Update()
{
}
}
}

2
BlueWater/Assets/02.Scripts/NewSkill/Rhinoceros/JumpSmash.cs
View File

@ -23,7 +23,7 @@ namespace RhinocerosSkill
{
if (SkillInputData.TargetCollider)
{
SkillInputData.TargetCollider.GetComponent<IStun>().IsStunned = true;
SkillInputData.TargetCollider.GetComponent<IStun>().IsStunned = false;
}
}

16
BlueWater/Assets/02.Scripts/NewSkill/Type/TheWaltzOfTheSword.cs
View File

@ -2,6 +2,7 @@ using System;
using System.Linq;
using Sirenix.OdinInspector;
using UnityEngine;
using Random = UnityEngine.Random;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
@ -67,8 +68,6 @@ namespace BlueWaterProject
{
var iDamageable = hitCollider.GetComponent<IDamageable>();
iDamageable.TakeDamage(Damage);
var effect = Instantiate(hitEffect, hitCollider.transform.position, Quaternion.identity, instantiateLocation);
effect.Play();
if (iDamageable.GetCurrentHp() == 0f)
{
@ -78,6 +77,19 @@ namespace BlueWaterProject
VisualFeedbackManager.Inst.TriggerHitStop(hitStopDuration);
}
}
if (hitEffect)
{
var bounds = hitCollider.bounds;
var randomPosition = new Vector3(
Random.Range(bounds.min.x, bounds.max.x),
Random.Range(bounds.min.y, bounds.max.y),
Random.Range(bounds.min.z, bounds.max.z)
);
var effect = Instantiate(hitEffect, randomPosition, Quaternion.identity, instantiateLocation);
effect.Play();
}
}
public bool IsTargetAlive(Collider hitCollider)

60
BlueWater/Assets/02.Scripts/Ui/FieldBossHpSlider.cs Normal file
View File

@ -0,0 +1,60 @@
using System.Collections;
using Sirenix.OdinInspector;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class FieldBossHpSlider : MonoBehaviour
{
[SerializeField] private Slider slider;
[SerializeField] private TMP_Text nameText;
[SerializeField] private Slider damageEffectSlider;
[SerializeField] private float damageEffectSpeed = 0.1f;
[Button("셋팅 초기화")]
private void Init()
{
slider = GetComponent<Slider>();
nameText = transform.Find("NameText").GetComponent<TMP_Text>();
damageEffectSlider = transform.Find("Fill Area/Background/DamageEffectSlider").GetComponent<Slider>();
}
public void SetHpSlider(float maxHp, string bossName)
{
if (!slider || !damageEffectSlider) return;
slider.maxValue = maxHp;
damageEffectSlider.maxValue = maxHp;
slider.value = maxHp;
damageEffectSlider.value = maxHp;
nameText.text = nameText ? bossName : null;
SetActiveHpSlider(true);
}
public void UpdateHpSlider(float value)
{
if (!slider || !damageEffectSlider) return;
StartCoroutine(DamageEffect(value));
}
private IEnumerator DamageEffect(float value)
{
slider.value = value;
while (damageEffectSlider.value > value)
{
damageEffectSlider.value -= damageEffectSpeed;
yield return null;
}
}
public void SetActiveHpSlider(bool value) => gameObject.SetActive(value);
}
}

2
BlueWater/Assets/02.Scripts/Ui/FieldBossHpSlider.cs.meta Normal file
View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 83ac3111825f0b644bf51d74137b4215

4
BlueWater/Assets/05.Prefabs/Characters/Enemies/FieldBosses/Rhinoceros.prefab
View File

@ -170,11 +170,13 @@ MonoBehaviour:
visualLook: {fileID: 695049024773443745}
animator: {fileID: 3402580928633681741}
spriteRenderer: {fileID: 8089310337301863899}
maxHp: 500
<Name>k__BackingField: Rhinoceros
<MaxHp>k__BackingField: 500
moveSpeed: 3
targetLayer:
serializedVersion: 2
m_Bits: 512
flashWhiteTime: 0.1
skillList:
- {fileID: 302495082473197838, guid: 193b84f23515e2947ad12f1d574e6211, type: 3}
- {fileID: 1802435259650247748, guid: 62d1ce673ad01eb4197cabbcb20d42df, type: 3}

24
BlueWater/Assets/05.Prefabs/HpSliders/EnemyHpSlider.prefab
View File

@ -261,5 +261,27 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1525762081838968274, guid: bb4f1e43ee7824c8e8009facee710768,
type: 3}
insertIndex: -1
addedObject: {fileID: 259569763335001057}
m_SourcePrefab: {fileID: 100100000, guid: bb4f1e43ee7824c8e8009facee710768, type: 3}
--- !u!1 &6935276925009161207 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1525762081838968274, guid: bb4f1e43ee7824c8e8009facee710768,
type: 3}
m_PrefabInstance: {fileID: 8436250465056310821}
m_PrefabAsset: {fileID: 0}
--- !u!114 &259569763335001057
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6935276925009161207}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 83ac3111825f0b644bf51d74137b4215, type: 3}
m_Name:
m_EditorClassIdentifier:

1046
BlueWater/Assets/05.Prefabs/HpSliders/FieldBossHpSlider.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
BlueWater/Assets/05.Prefabs/HpSliders/FieldBossHpSlider.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 39cf0016300932947917aaefb2a0c1ef
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: