diff --git a/Assets/Prefabs/Bosses/NewEnemyData.asset b/Assets/Prefabs/Bosses/NewEnemyData.asset index 4898caa0..0df8600a 100644 --- a/Assets/Prefabs/Bosses/NewEnemyData.asset +++ b/Assets/Prefabs/Bosses/NewEnemyData.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1ecdc2379b078b246a0bd5c0fb58e346, type: 3} m_Name: NewEnemyData m_EditorClassIdentifier: Colosseum.Game::Colosseum.Enemy.EnemyData - enemyName: "\uD14C\uC2A4\uD2B8 \uBCF4\uC2A4" + enemyName: Boss The Test description: icon: {fileID: 21300000, guid: 452012ebe6d33bc4bbb53a355f77ce63, type: 3} baseStrength: 10 diff --git a/Assets/Scenes/Test.unity b/Assets/Scenes/Test.unity index f2bf4023..d9652e07 100644 --- a/Assets/Scenes/Test.unity +++ b/Assets/Scenes/Test.unity @@ -119,6 +119,17 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &56646641 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4278009329655597422, guid: 54087b4bd46db9e4fb7da13cf7a6cc69, type: 3} + m_PrefabInstance: {fileID: 437791323} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &115810401 GameObject: m_ObjectHideFlags: 0 @@ -251,6 +262,7 @@ RectTransform: - {fileID: 1162990049} - {fileID: 7078605117837265129} - {fileID: 1269404371} + - {fileID: 678443228} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -427,6 +439,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5d0fa667f83d4399abb45ffcaea31, type: 3} m_Name: m_EditorClassIdentifier: Colosseum.Game::Colosseum.UI.StatBar +--- !u!114 &378850066 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6434164023740824016, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + m_PrefabInstance: {fileID: 1305809339} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &437791323 PrefabInstance: m_ObjectHideFlags: 0 @@ -611,6 +634,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4521187534841194808, guid: 54087b4bd46db9e4fb7da13cf7a6cc69, type: 3} + propertyPath: valueText + value: + objectReference: {fileID: 56646641} - target: {fileID: 4759263938882641124, guid: 54087b4bd46db9e4fb7da13cf7a6cc69, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -775,6 +802,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 7606115145092636445, guid: 54087b4bd46db9e4fb7da13cf7a6cc69, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7657599853370186409, guid: 54087b4bd46db9e4fb7da13cf7a6cc69, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -831,6 +862,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8605971422793688558, guid: 54087b4bd46db9e4fb7da13cf7a6cc69, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8744015103177123418, guid: 54087b4bd46db9e4fb7da13cf7a6cc69, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1013,6 +1048,34 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &678443227 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1833205063244138202, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + m_PrefabInstance: {fileID: 1305809339} + m_PrefabAsset: {fileID: 0} +--- !u!224 &678443228 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + m_PrefabInstance: {fileID: 1305809339} + m_PrefabAsset: {fileID: 0} +--- !u!114 &678443229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 678443227} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 892f9842e85256b47b24e0aab016820b, type: 3} + m_Name: + m_EditorClassIdentifier: Colosseum.Game::Colosseum.UI.BossHealthBarUI + healthSlider: {fileID: 1425382920} + healthText: {fileID: 378850066} + bossNameText: {fileID: 1150905959} + targetBoss: {fileID: 0} + hideOnDeath: 1 + lerpSpeed: 15 --- !u!1 &845918606 GameObject: m_ObjectHideFlags: 0 @@ -1335,6 +1398,17 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_RenderingLayers: 1 m_ShadowRenderingLayers: 1 +--- !u!114 &1150905959 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7053117599274393893, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + m_PrefabInstance: {fileID: 1305809339} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1162990048 GameObject: m_ObjectHideFlags: 0 @@ -1497,6 +1571,125 @@ MonoBehaviour: slotPrefab: {fileID: 5402880947663824673, guid: 60d898ecea82b6c429850e04d2e95b7c, type: 3} maxSlots: 10 autoFindPlayer: 1 +--- !u!1001 &1305809339 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 260528176} + m_Modifications: + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_SizeDelta.x + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_AnchoredPosition.y + value: -70 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1384280946776679044, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1833205063244138202, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_Name + value: UI_BossHealthBar + objectReference: {fileID: 0} + - target: {fileID: 2971862343577199805, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2971862343577199805, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1833205063244138202, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + insertIndex: -1 + addedObject: {fileID: 678443229} + m_SourcePrefab: {fileID: 100100000, guid: 2122b1e1b36684a40978673f272f200e, type: 3} +--- !u!114 &1425382920 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1229044099469274636, guid: 2122b1e1b36684a40978673f272f200e, type: 3} + m_PrefabInstance: {fileID: 1305809339} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1432187382 GameObject: m_ObjectHideFlags: 0 @@ -1900,7 +2093,7 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 60 + field of view: 80 orthographic: 0 orthographic size: 5 m_Depth: -1 @@ -1927,7 +2120,7 @@ Transform: m_GameObject: {fileID: 2122318093} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 5, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2036,7 +2229,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5581648761285601425, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} propertyPath: m_Name - value: SM_Chr_BR_Troll_01 + value: TestBoss objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Skills/Effects/Melee_Slash_0.asset b/Assets/Skills/Effects/Melee_Slash_0.asset index c2756f75..cf42d6cd 100644 --- a/Assets/Skills/Effects/Melee_Slash_0.asset +++ b/Assets/Skills/Effects/Melee_Slash_0.asset @@ -18,7 +18,7 @@ MonoBehaviour: areaShape: 1 targetLayers: serializedVersion: 2 - m_Bits: 0 + m_Bits: 4294967295 areaRadius: 3 fanOriginDistance: 0 fanRadius: 3 diff --git a/Assets/Skills/Effects/Melee_Slash_Boss_0.asset b/Assets/Skills/Effects/Melee_Slash_Boss_0.asset index bef590e6..dac9f22a 100644 --- a/Assets/Skills/Effects/Melee_Slash_Boss_0.asset +++ b/Assets/Skills/Effects/Melee_Slash_Boss_0.asset @@ -23,6 +23,6 @@ MonoBehaviour: fanOriginDistance: 0 fanRadius: 3 fanHalfAngle: 45 - baseDamage: 10 + baseDamage: 1 damageType: 0 statScaling: 1