diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab index 38349556..4213cbcb 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab @@ -376,6 +376,6 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -13.299999, y: 0.53699994} + m_AnchoredPosition: {x: 0, y: 0.53699994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullWarlock.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullWarlock.prefab index cd4c3096..fc3ec338 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullWarlock.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullWarlock.prefab @@ -139,7 +139,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -13.299999, y: 0.53699994} + m_AnchoredPosition: {x: 0, y: 0.53699994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5203260511037192244 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index b71b6922..1c3c9729 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -27070,7 +27070,7 @@ MonoBehaviour: lineOffSet: {x: 1, y: 0, z: 0} columnOffSet: {x: 0, y: 0, z: 0.865} enemyGenerateDataList: - - enemyPrefab: {fileID: 4894115461753618931, guid: 324f36d654c1ae14fa302874c914d861, + - enemyPrefab: {fileID: 1880325291853289959, guid: 5c61e2225184e76439df52aa53207c18, type: 3} locationX: 4 locationY: 4 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Bone.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Bone.cs index 0089e6a9..f1ce3592 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Bone.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Bone.cs @@ -23,6 +23,14 @@ public class Bone : MonoBehaviour { enemyNode = GetComponent(); actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.nothing), 1.0f); + + if(enemyNode .enemyUIBar== null ) + { + enemyNode.CreatEnemyUIBar(enemyNode); + ChooseAction(); + + } + } private void Update() @@ -33,6 +41,7 @@ public class Bone : MonoBehaviour public void ChooseAction() { enemyAction = new EnemyAction_Nothing(); + enemyAction = enemyNode.GetRandomAction(actionPool); Debug.Log("行动是:" + enemyAction); enemyNode.enemyUIBar.SwitchIntention(enemyAction); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs index 47dea659..9b868443 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs @@ -112,14 +112,13 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver EnemyManager.Instance.enemySpeedSortingList.Remove(this); } } - private void Start() { - - enemyUI = Instantiate(EnemyManager.Instance.enemyUIBar,followPoint .position , EnemyManager.Instance.enemyUIBar.transform .rotation ); - enemyUI.transform.SetParent(transform); - enemyUIBar = enemyUI.GetComponent(); - enemyUIBar.enemyNode = this; + if(enemyUIBar ==null ) + { + CreatEnemyUIBar(this); + } + } private void Update() @@ -150,7 +149,13 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver } } - + public void CreatEnemyUIBar(EnemyNode enemyNode ) + { + enemyUI = Instantiate(EnemyManager.Instance.enemyUIBar,enemyNode. followPoint.position, EnemyManager.Instance.enemyUIBar.transform.rotation); + enemyUI.transform.SetParent(enemyNode . transform); + enemyUIBar = enemyUI.GetComponent(); + enemyUIBar.enemyNode = enemyNode; + } public void StartPosition() { //this.transform.position = GameManager.Instance.X[positionX].Y[positionY].transform.position; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs index 7c1e7564..aee0b645 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs @@ -26,15 +26,19 @@ public class EnemyAction public virtual void ShowAttackRange(EnemyNode enemyNode) { //遍历影响池变色 - foreach (var mapNode in enemyNode.rangePool) + if (enemyNode.rangePool!= null ) { - mapNode.markInfluenced = true; - mapNode.hightLigtMark.GetComponent().material = mapNode.enemyMark; - } - foreach (var mapNode in enemyNode.aoeRangePool) - { - mapNode.aoeInfluenced = true; + foreach (var mapNode in enemyNode.rangePool) + { + mapNode.markInfluenced = true; + mapNode.hightLigtMark.GetComponent().material = mapNode.enemyMark; + } + foreach (var mapNode in enemyNode.aoeRangePool) + { + mapNode.aoeInfluenced = true; + } } + } public virtual void ShowAttackRangeAoe(EnemyNode enemyNode) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs index 806d09a8..63ddc9cc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs @@ -451,6 +451,7 @@ public class SettlementManager : Singleton break; case CardFunction.clearAllAbnormalConditons: clearAllAbnormalConditons(); + Usermanager.Instance.RefreshPlayerBuffIcon(); break; case CardFunction.damageForNextNode: damageForNextNode(influencePreviewPool, int.Parse(kvp.Value), pierceNum);