diff --git a/Assets/_3Prefab/Character/Char_New.prefab b/Assets/_3Prefab/Character/Char_New.prefab index 4ee78baf0..459088357 100644 --- a/Assets/_3Prefab/Character/Char_New.prefab +++ b/Assets/_3Prefab/Character/Char_New.prefab @@ -48747,6 +48747,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1789420639220063645} - {fileID: 846454333228424675} - {fileID: 284362804769844370} - {fileID: 233731131514302392} @@ -48788,6 +48789,7 @@ MonoBehaviour: - {fileID: 6617136272195461049} - {fileID: 6029057865421967153} - {fileID: 7035876719942598435} + damageIndicatorPos: {fileID: 1789420639220063645} --- !u!23 &6357484439125969889 MeshRenderer: m_ObjectHideFlags: 0 @@ -48808,9 +48810,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f48c2a6723c3f6d4ca644a6db627f484, type: 2} - - {fileID: 2100000, guid: be345bdbddd3124429fb2c1451001711, type: 2} - - {fileID: 2100000, guid: f48c2a6723c3f6d4ca644a6db627f484, type: 2} + - {fileID: 2100000, guid: 901f3d006fa26f242b037deab458b868, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -92736,6 +92736,37 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 +--- !u!1 &7255242668981329521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1789420639220063645} + m_Layer: 7 + m_Name: DamageIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1789420639220063645 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7255242668981329521} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4777623805239655756} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8654776895986181956 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_3Prefab/Character/Monster.prefab b/Assets/_3Prefab/Character/Monster.prefab index b3dcfdc81..ce89e2428 100644 --- a/Assets/_3Prefab/Character/Monster.prefab +++ b/Assets/_3Prefab/Character/Monster.prefab @@ -54,7 +54,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 3802b872c0351814abaa33cc0e6f110a, type: 2} + - {fileID: 2100000, guid: ae12169efe4a7d84b99acc2900769a43, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -88,7 +88,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} m_Name: m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 0} + skeletonDataAsset: {fileID: 11400000, guid: 3275ba16044f969459273bbad2901e91, type: 2} initialSkinName: fixPrefabOverrideViaMeshFilter: 2 initialFlipX: 0 @@ -124,6 +124,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2851645605260699225} m_Mesh: {fileID: 0} +--- !u!1 &4102897445824731247 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6233911393864002191} + m_Layer: 7 + m_Name: DamageIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6233911393864002191 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4102897445824731247} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8552605779345850445} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8552605779345850444 GameObject: m_ObjectHideFlags: 0 @@ -154,6 +185,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: + - {fileID: 6233911393864002191} - {fileID: 2454313962163913697} - {fileID: 5425367491982522618} - {fileID: 3560128398464787722} @@ -174,6 +206,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e24050a3c3281614b843a0785b62f341, type: 3} m_Name: m_EditorClassIdentifier: + centerPivot: {fileID: 0} skAnim: {fileID: 6546559943585327132} animState: 0 creatureClass: 0 @@ -182,6 +215,7 @@ MonoBehaviour: ptcDieEffect: {fileID: 3560128398450630730} ptcHit2: {fileID: 5625646232351452951} ptcHit3: {fileID: 2415894152402999131} + damageIndicatorPos: {fileID: 6233911393864002191} --- !u!61 &8457670693139843168 BoxCollider2D: m_ObjectHideFlags: 0