From 7628a8493699945605a6b99883fad68fc4822459 Mon Sep 17 00:00:00 2001 From: cd <-> Date: Thu, 8 Jun 2023 23:57:33 +0800 Subject: [PATCH] =?UTF-8?q?headbar=E4=BD=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98=E7=BC=93=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Game/Scripts/UI/Sub/PageHeadbar.cs | 73 +-- .../Game/Scripts/Util/Common/UtilCommon.cs | 5 + .../Game/Scripts/_Define/GameSetting.cs | 2 +- .../Resources/Prefab/Level/level0001.prefab | 470 +++++++----------- .../Timeline/bullet_hero0102.playable | 11 +- 5 files changed, 229 insertions(+), 332 deletions(-) diff --git a/client/Assets/Game/Scripts/UI/Sub/PageHeadbar.cs b/client/Assets/Game/Scripts/UI/Sub/PageHeadbar.cs index a76cdbd..386aa23 100644 --- a/client/Assets/Game/Scripts/UI/Sub/PageHeadbar.cs +++ b/client/Assets/Game/Scripts/UI/Sub/PageHeadbar.cs @@ -11,6 +11,8 @@ namespace Game { private int _targetCache = 0; + private readonly HashSet _allTargets = new HashSet(); + private readonly Dictionary> _hpBarDict = new Dictionary>(); @@ -39,6 +41,7 @@ namespace Game continue; } + _allTargets.Add(entity.ID()); SetHpBar(entity.ID(), true); SetHitNum(entity.ID(), true); SetInteract(entity.ID(), true); @@ -91,53 +94,20 @@ namespace Game private void UpdateHeadBarPos() { - foreach (var kvp in _hpBarDict) - { - var entity = Util.GetEntity(kvp.Key); - if (entity != null) - { - var headBarItem = kvp.Value; - var posScreen = GetScreenPos(Util.EntityViewPos(entity)); - headBarItem.Component.SetPosition(posScreen.x, posScreen.y - 80, posScreen.z); - } - } - - foreach (var kvp in _hitNumDict) + foreach (var entityId in _allTargets) { - var entity = Util.GetEntity(kvp.Key); - if (entity != null) - { - var hitNumList = kvp.Value; - var posScreen = GetScreenPos(Util.EntityViewPos(entity)); - foreach (var item in hitNumList) - { + var entity = Util.GetEntity(entityId); + var posScreen = GetScreenPos(Util.EntityViewPos(entity)); + if (_hpBarDict.TryGetValue(entityId, out var hpBar)) + hpBar.Component.SetPosition(posScreen.x, posScreen.y - 80, posScreen.z); + if (_interactDict.TryGetValue(entityId, out var interact)) + interact.Component.SetPosition(posScreen.x, posScreen.y - 80, posScreen.z); + if (_hitNumDict.TryGetValue(entityId, out var hitNum)) + foreach (var item in hitNum) + item.Component.SetPosition(posScreen.x, posScreen.y, posScreen.z); + if (_hitBuffDict.TryGetValue(entityId, out var hitBuff)) + foreach (var item in hitBuff) item.Component.SetPosition(posScreen.x, posScreen.y, posScreen.z); - } - } - } - - foreach (var kvp in _hitBuffDict) - { - var entity = Util.GetEntity(kvp.Key); - if (entity != null) - { - var hitNumList = kvp.Value; - var posScreen = GetScreenPos(Util.EntityViewPos(entity)); - foreach (var item in hitNumList) - { - item.Component.SetPosition(posScreen.x, posScreen.y - 40, posScreen.z); - } - } - } - foreach (var kvp in _interactDict) - { - var entity = Util.GetEntity(kvp.Key); - if (entity != null) - { - var interactItem = kvp.Value; - var posScreen = GetScreenPos(Util.EntityViewPos(entity)); - interactItem.Component.SetPosition(posScreen.x, posScreen.y - 80, posScreen.z); - } } } @@ -252,9 +222,16 @@ namespace Game return; } - SetHpBar(param.Entity, param.IsAlive); - SetHitNum(param.Entity, param.IsAlive); - SetInteract(param.Entity, param.IsAlive); + var isAlive = param.IsAlive; + + if (isAlive) + _allTargets.Add(entity); + else + _allTargets.Remove(entity); + + SetHpBar(entity, isAlive); + SetHitNum(entity, isAlive); + SetInteract(entity, isAlive); } private void SetInteract(int entityID, bool isAlive = true) diff --git a/client/Assets/Game/Scripts/Util/Common/UtilCommon.cs b/client/Assets/Game/Scripts/Util/Common/UtilCommon.cs index 7dd8881..d16560d 100644 --- a/client/Assets/Game/Scripts/Util/Common/UtilCommon.cs +++ b/client/Assets/Game/Scripts/Util/Common/UtilCommon.cs @@ -17,6 +17,11 @@ namespace Game public static void DrawShape(Shape shape, Vector3 posReal, Vector3 direction, Color color) { + if (!GameSetting.IsDebugDraw) + { + return; + } + var posRealTop = posReal + Vector3.up * shape.Height; var posRealMid = posReal + Vector3.up * (shape.Height / 2); switch (shape.Type) diff --git a/client/Assets/Game/Scripts/_Define/GameSetting.cs b/client/Assets/Game/Scripts/_Define/GameSetting.cs index 1a35f6e..e4b3691 100644 --- a/client/Assets/Game/Scripts/_Define/GameSetting.cs +++ b/client/Assets/Game/Scripts/_Define/GameSetting.cs @@ -6,7 +6,7 @@ namespace Game public static class GameSetting { public static Dictionary KeyMap; - public static bool IsDebugDraw = true; + public static bool IsDebugDraw = false; public static bool IsMasterControllable = true; public static bool IsShowExtraHeadBar = true; public static void Load() diff --git a/client/Assets/Resources/Prefab/Level/level0001.prefab b/client/Assets/Resources/Prefab/Level/level0001.prefab index 99f8452..0187f62 100644 --- a/client/Assets/Resources/Prefab/Level/level0001.prefab +++ b/client/Assets/Resources/Prefab/Level/level0001.prefab @@ -1,5 +1,49 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &30834145142484100 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7799729231951818604} + - component: {fileID: 787486327684953329} + m_Layer: 0 + m_Name: monster (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7799729231951818604 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 30834145142484100} + 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_Children: [] + m_Father: {fileID: 422411188377810511} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &787486327684953329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 30834145142484100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3} + m_Name: + m_EditorClassIdentifier: + monsterIndex: 1 --- !u!1 &169782549301234160 GameObject: m_ObjectHideFlags: 0 @@ -363,6 +407,50 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1387826515511670101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5742363544180430465} + - component: {fileID: 1271243189086013901} + m_Layer: 0 + m_Name: monster (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5742363544180430465 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1387826515511670101} + 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_Children: [] + m_Father: {fileID: 422411188377810511} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1271243189086013901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1387826515511670101} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3} + m_Name: + m_EditorClassIdentifier: + monsterIndex: 1 --- !u!1 &1556447924790552866 GameObject: m_ObjectHideFlags: 0 @@ -416,6 +504,50 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1631293176666314167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2920886121554341743} + - component: {fileID: 3643547857282272240} + m_Layer: 0 + m_Name: monster (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2920886121554341743 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631293176666314167} + 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_Children: [] + m_Father: {fileID: 422411188377810511} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3643547857282272240 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631293176666314167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3} + m_Name: + m_EditorClassIdentifier: + monsterIndex: 1 --- !u!1 &1674865804504301320 GameObject: m_ObjectHideFlags: 0 @@ -811,50 +943,6 @@ Transform: m_Father: {fileID: 7911837490568511560} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3234634898719385381 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3254477044457468872} - - component: {fileID: 3856235524507855197} - m_Layer: 0 - m_Name: monster (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3254477044457468872 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3234634898719385381} - 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_Children: [] - m_Father: {fileID: 422411188377810511} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3856235524507855197 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3234634898719385381} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3} - m_Name: - m_EditorClassIdentifier: - monsterIndex: 1 --- !u!1 &3322088359762901533 GameObject: m_ObjectHideFlags: 0 @@ -992,51 +1080,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mDoorType: 9 ---- !u!1 &4581556439904104110 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8389348890710806827} - - component: {fileID: 1694526728335909140} - m_Layer: 0 - m_Name: monster (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8389348890710806827 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4581556439904104110} - 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_Children: [] - m_Father: {fileID: 422411188377810511} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1694526728335909140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4581556439904104110} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3} - m_Name: - m_EditorClassIdentifier: - monsterIndex: 1 ---- !u!1 &4634400554269772818 +--- !u!1 &4335303288400887109 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1044,36 +1088,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2954044273079394374} - - component: {fileID: 4481041229742391178} + - component: {fileID: 2397929541402937586} + - component: {fileID: 7151899505870402061} m_Layer: 0 - m_Name: monster (4) + m_Name: monster (3) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2954044273079394374 +--- !u!4 &2397929541402937586 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4634400554269772818} + m_GameObject: {fileID: 4335303288400887109} 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_Children: [] m_Father: {fileID: 422411188377810511} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4481041229742391178 +--- !u!114 &7151899505870402061 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4634400554269772818} + m_GameObject: {fileID: 4335303288400887109} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3} @@ -1181,6 +1225,50 @@ Transform: m_Father: {fileID: 6831744296642958531} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5145089212481034869 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6444462747433413740} + - component: {fileID: 153958754896607592} + m_Layer: 0 + m_Name: monster (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6444462747433413740 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5145089212481034869} + 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_Children: [] + m_Father: {fileID: 422411188377810511} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &153958754896607592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5145089212481034869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3} + m_Name: + m_EditorClassIdentifier: + monsterIndex: 1 --- !u!1 &5330121818569687434 GameObject: m_ObjectHideFlags: 0 @@ -1544,94 +1632,6 @@ Transform: m_Father: {fileID: 1481202640230017204} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6972578998458754430 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5225685835555599175} - - component: {fileID: 6644615115332678803} - m_Layer: 0 - m_Name: monster (6) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5225685835555599175 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6972578998458754430} - 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_Children: [] - m_Father: {fileID: 422411188377810511} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6644615115332678803 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6972578998458754430} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3} - m_Name: - m_EditorClassIdentifier: - monsterIndex: 1 ---- !u!1 &7118868507486790947 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3223138262897486307} - - component: {fileID: 7882157660524208659} - m_Layer: 0 - m_Name: monster (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3223138262897486307 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7118868507486790947} - 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_Children: [] - m_Father: {fileID: 422411188377810511} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7882157660524208659 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7118868507486790947} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3} - m_Name: - m_EditorClassIdentifier: - monsterIndex: 1 --- !u!1 &7346687885720875150 GameObject: m_ObjectHideFlags: 0 @@ -1676,50 +1676,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mDoorType: 10 ---- !u!1 &7412321576763905136 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8934120206787247597} - - component: {fileID: 3620117687675794872} - m_Layer: 0 - m_Name: monster (7) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8934120206787247597 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7412321576763905136} - 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_Children: [] - m_Father: {fileID: 422411188377810511} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3620117687675794872 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7412321576763905136} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3} - m_Name: - m_EditorClassIdentifier: - monsterIndex: 1 --- !u!1 &8314003230930499602 GameObject: m_ObjectHideFlags: 0 @@ -1797,50 +1753,6 @@ Transform: m_Father: {fileID: 2619096985406038671} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8581768233516720805 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 492654166974501278} - - component: {fileID: 8687282258885526353} - m_Layer: 0 - m_Name: monster (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &492654166974501278 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8581768233516720805} - 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_Children: [] - m_Father: {fileID: 422411188377810511} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8687282258885526353 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8581768233516720805} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3} - m_Name: - m_EditorClassIdentifier: - monsterIndex: 1 --- !u!1 &8606626814001829222 GameObject: m_ObjectHideFlags: 0 @@ -1870,13 +1782,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2232977687940307079} - - {fileID: 3254477044457468872} - - {fileID: 8389348890710806827} - - {fileID: 3223138262897486307} - - {fileID: 2954044273079394374} - - {fileID: 492654166974501278} - - {fileID: 5225685835555599175} - - {fileID: 8934120206787247597} + - {fileID: 6444462747433413740} + - {fileID: 5742363544180430465} + - {fileID: 2397929541402937586} + - {fileID: 7799729231951818604} + - {fileID: 2920886121554341743} m_Father: {fileID: 8635726989057596408} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/client/Assets/Resources/Timeline/bullet_hero0102.playable b/client/Assets/Resources/Timeline/bullet_hero0102.playable index 5ce8753..c6606f0 100644 --- a/client/Assets/Resources/Timeline/bullet_hero0102.playable +++ b/client/Assets/Resources/Timeline/bullet_hero0102.playable @@ -238,9 +238,6 @@ MonoBehaviour: m_Name: AttackClip(Clone)(Clone) m_EditorClassIdentifier: template: - isRaycast: 0 - center: {x: 0, y: 0, z: 0} - halfExtents: {x: 2, y: 3, z: 2} flowSpeed: {x: 4.5, y: 1.5, z: 0} flowTime: 0 isFlow: 1 @@ -249,6 +246,14 @@ MonoBehaviour: staggerLevel: 2 pauseTime: 0.02 hitId: 0 + hitType: 0 + Type: 1 + Offset: {x: 0, y: 0, z: 0} + Height: 2 + SizeX: 0 + SizeY: 0 + Radius: 3 + Angle: 0 --- !u!114 &2359698281133013487 MonoBehaviour: m_ObjectHideFlags: 1