diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index c6cfea7a..86149cc5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -9367,7 +9367,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1153479992 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11180,7 +11180,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1387589236 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/SkeletonArcher.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/SkeletonArcher.cs index cd780d7c..3dc0728f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/SkeletonArcher.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/SkeletonArcher.cs @@ -78,6 +78,9 @@ public class SkeletonArcher : MonoBehaviour } + + enemyNode.enemyUIBar.RefreshEnemyBuffIcon(); + //重置时间标量 lastTime = time; } @@ -93,9 +96,11 @@ public class SkeletonArcher : MonoBehaviour IEnumerator JudgeActionCoroutine()//等移动到位置就判断是否还能走 { + for (int i = 0; i < enemyNode.EnemyState.stepRange * enemyNode.EnemyState.stepRangeMultiplier; i++) - { + { enemyNode.FindPath(); + Debug.Log(enemyNode.pasth.Count); if (enemyNode.pasth.Count > enemyNode.EnemyState .attackRange ) { MapUnity currentNode = enemyNode.pasth[0]; @@ -109,6 +114,25 @@ public class SkeletonArcher : MonoBehaviour } else if (enemyNode.pasth.Count == enemyNode.EnemyState.attackRange) { + /* Vector3 dir = GameManager.Instance.player.transform.position - this.transform.position; + Ray ray = new Ray(this.transform.position, dir); + if (Physics.Raycast(ray, out RaycastHit raycastHit, 500, layerMask.value)) + { + if(raycastHit .collider .tag != "Player") + { + float angleBlock = Vector3.SignedAngle (GameManager.Instance.playerOn.transform.position-this.transform.position, raycastHit.collider.transform.position-this.transform.position,enemyNode .pasth [0].transform .up); + float anglePlayer= Vector3.SignedAngle(this.transform.position - GameManager.Instance.playerOn.transform.position, GameManager.Instance.playerOn.transform.forward, GameManager.Instance.playerOn.transform.up); + if(angleBlock <=0) + { + + } + else + { + + } + } + } + */ SkeletonArcherAction(); yield break; } diff --git a/ColorlessWorld-2024-4-2/UserSettings/Layouts/default-2022.dwlt b/ColorlessWorld-2024-4-2/UserSettings/Layouts/default-2022.dwlt index da9a35fd..e364d9c2 100644 --- a/ColorlessWorld-2024-4-2/UserSettings/Layouts/default-2022.dwlt +++ b/ColorlessWorld-2024-4-2/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1473.6 height: 820.8 m_ShowMode: 4 - m_Title: "\u63A7\u5236\u53F0" + m_Title: "\u6E38\u620F" m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 321} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 19737 + controlID: 102 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 19692 + controlID: 57 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 19693 + controlID: 58 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -297,8 +297,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 348.2 - y: 19 + x: 409.6 + y: 73.6 width: 769.99994 height: 466.2 m_SerializedDataModeController: @@ -353,23 +353,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1473.6 - height: 730.8 - m_Scale: {x: 0.8458333, y: 0.8458333} - m_Translation: {x: 736.8, y: 365.4} + width: 769.99994 + height: 445.2 + m_Scale: {x: 0.50130206, y: 0.50130206} + m_Translation: {x: 385, y: 222.6} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -871.0936 - y: -432 - width: 1742.1873 - height: 864 + x: -768 + y: -444.04367 + width: 1536 + height: 888.08734 m_MinimalGUI: 1 - m_defaultScale: 0.8458333 - m_LastWindowPixelSize: {x: 1842, y: 939.75} + m_defaultScale: 0.50130206 + m_LastWindowPixelSize: {x: 962.49994, y: 582.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -412,10 +412,10 @@ MonoBehaviour: m_OverlaysVisible: 1 m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: be2bfcff062cfcff262dfcff72bbfffff0bbffff58bdffff2afbffffd46c0000426d0000f46d0000046f0000366f0000926f0000aa700000507100009a710000c2710000ea7100000472000060720000ba720000c47200000a7300002c730000 + scrollPos: {x: 0, y: 50.799988} + m_SelectedIDs: 9a700000 + m_LastClickedID: 28826 + m_ExpandedIDs: cad4ffff2afbffff566d0000f2710000be720000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -783,9 +783,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 2.4415243, y: -1.7079823, z: 2.0844522} + m_Target: {x: 5.5093155, y: -0.42277336, z: 0.17112803} speed: 2 - m_Value: {x: 2.4415243, y: -1.7079823, z: 2.0844522} + m_Value: {x: 5.5093155, y: -0.42277336, z: 0.17112803} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -831,13 +831,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.22429028, y: -0.017527353, z: 0.0038717669, w: 0.97460735} + m_Target: {x: 0.6080199, y: -0.0055915867, z: 0.0044526323, w: 0.79420465} speed: 2 - m_Value: {x: -0.22429028, y: 0.017527353, z: -0.003871767, w: -0.97460735} + m_Value: {x: 0.60786784, y: -0.005590189, z: 0.004451519, w: 0.79400605} m_Size: - m_Target: 3.4315991 + m_Target: 5.2445374 speed: 2 - m_Value: 3.4315991 + m_Value: 5.2445374 m_Ortho: m_Target: 0 speed: 2 @@ -908,7 +908,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/UI + - Assets/GameDate/Enemy m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -916,16 +916,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts/UI + - Assets/GameDate/Enemy m_LastFoldersGridSize: -1 m_LastProjectPath: D:\GitInventory_0330\test_45\ColorlessWorld-2024-4-2 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 141.40002} - m_SelectedIDs: 6e760000 - m_LastClickedID: 30318 - m_ExpandedIDs: 000000009a7400009c74000000ca9a3bffffff7f + scrollPos: {x: 0, y: 79} + m_SelectedIDs: f8760000 + m_LastClickedID: 30456 + m_ExpandedIDs: 00000000b0740000b2740000b676000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -953,7 +953,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009a7400009c74000000ca9a3bffffff7f + m_ExpandedIDs: 00000000b0740000b2740000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -978,8 +978,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 700d0000 - m_LastClickedInstanceID: 3440 + m_SelectedInstanceIDs: b06b0000 + m_LastClickedInstanceID: 27568 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000f06f00003a7b000058cc00005ecc00006ed400004e6e0000e07200000a7000000e7000000281000056cf00000000000094760000 m_RenameOverlay: