From 571807a930c6d21c452f1af0fa5917a3bfe2bee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BD=AF=E4=BB=B6204=E5=BC=A0=E6=99=AF=E7=A8=8B?= <980269297@qq.com> Date: Thu, 4 Jul 2024 08:27:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=A6=BB=E6=95=8C=E4=BA=BA=E5=92=8C?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E7=9A=84=E9=AB=98=E4=BA=AE=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=95=8C=E4=BA=BA=E9=81=8D=E5=8E=86?= =?UTF-8?q?=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 + .../Assets/Image/enemyMark.png | Bin 0 -> 11340 bytes .../Assets/Image/enemyMark.png.meta | 127 +++++++++ .../Prefab/MapNodePrefab/MapUnity _2.prefab | 89 ++++++- .../Assets/Prefab/MapNodePrefab/enemyMark.mat | 137 ++++++++++ .../Prefab/MapNodePrefab/enemyMark.mat.meta | 8 + .../Assets/Scenes/SampleScene.unity | 57 ++++- .../Assets/Scripts/Card/CardDrag.cs | 240 +++--------------- .../Assets/Scripts/Card/CardEntity.cs | 3 +- .../Assets/Scripts/Card/TurnMaster.cs | 17 +- .../Assets/Scripts/Card/UsedCard.cs | 3 + .../Assets/Scripts/Enemy/EnemyManager.cs | 40 ++- .../Assets/Scripts/Enemy/EnemyNode.cs | 28 +- .../Assets/Scripts/GameManager.cs | 4 +- .../Scripts/Handler/EffectRangeHandler7_2.cs | 19 +- .../Scripts/Handler/EffectRangeHandler8_2.cs | 41 +-- .../Scripts/Handler/EffectRangeHandlerBase.cs | 6 - .../Assets/Scripts/MapUnity.cs | 18 +- .../Assets/Scripts/Player.cs | 3 +- .../Tool/CardData_SO/PlayerState_SO.cs | 5 + .../Assets/Scripts/Tool/EffectRange.cs | 3 + .../Assets/Scripts/Tool/MathTool.cs | 18 ++ .../Assets/Scripts/Tool/getNodeTools.cs | 114 ++++++++- .../Assets/Scripts/UI/EnemyPlanActionUI.cs | 14 +- .../Scripts/manager/DestructionManager.cs | 10 +- .../Assets/Scripts/manager/MapUnityManager.cs | 35 ++- .../Scripts/manager/SettlementManager.cs | 5 +- .../Assets/data/card_data.csv | 9 +- .../UserSettings/EditorUserSettings.asset | 3 - .../Layouts/CurrentMaximizeLayout.dwlt | 106 ++++---- .../UserSettings/Search.index | 13 - .../UserSettings/Search.settings | 76 +----- 32 files changed, 810 insertions(+), 445 deletions(-) create mode 100644 ColorlessWorld-2024-4-2/Assets/Image/enemyMark.png create mode 100644 ColorlessWorld-2024-4-2/Assets/Image/enemyMark.png.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/enemyMark.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/enemyMark.mat.meta delete mode 100644 ColorlessWorld-2024-4-2/UserSettings/Search.index diff --git a/.gitignore b/.gitignore index 790dc8f9..7d55b52e 100644 --- a/.gitignore +++ b/.gitignore @@ -149,3 +149,7 @@ DerivedDataCache/* ColorlessWorld-2024-4-2/Library/* ColorlessWorld-2024-4-2/Logs/* +ColorlessWorld-2024-4-2/UserSettings/* + + + diff --git a/ColorlessWorld-2024-4-2/Assets/Image/enemyMark.png b/ColorlessWorld-2024-4-2/Assets/Image/enemyMark.png new file mode 100644 index 0000000000000000000000000000000000000000..7117e8bd1c58896eb4cec894b65de6690ff5092b GIT binary patch literal 11340 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.blocksRaycasts = false; @@ -190,7 +193,6 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag //重新调用范围预览 //GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange); setCastingRangePreview(cardEntity.cardOriginalData.EffectRange); - Debug.Log(cardEntity.cardOriginalData.CastingRange); //预览影响范围 if (currentNode.influenced) { @@ -198,7 +200,6 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag Vector3 face = currentNode.transform.position - GameManager.Instance.playerOn.transform.position; float euler = Vector3.SignedAngle(-GameManager.Instance.playerOn.transform.forward, face, GameManager.Instance.playerOn.transform.up) + 180; - Debug.Log("角度是:" + euler); setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, euler, currentNode); //influencePreviewPool.Add(currentNode); @@ -213,13 +214,20 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag private void setCastingRangePreview(string effectRange) { + for (int i = 0; i < MapUnityManager.Instance.castPool.Count; i++) + { + MapUnityManager.Instance.castPool[i].influenced = false; + } + MapUnityManager.Instance.castPool.Clear(); if (effectRange == EffectRange.range1) { - GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange); + MapUnityManager.Instance.getCastPool(cardEntity.cardOriginalData.EffectRange, cardEntity.cardOriginalData.CastingRange); + //GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange); } else { - GameManager.Instance.player.StepPreviewInfluencedNode(1); + MapUnityManager.Instance.getCastPool(cardEntity.cardOriginalData.EffectRange, cardEntity.cardOriginalData.CastingRange); + //GameManager.Instance.player.StepPreviewInfluencedNode(1); /* MapUnity playerNode = GameManager.Instance.playerOn; MapUnity currentNode = GameManager.Instance.playerOn; castingPool.Clear(); @@ -236,7 +244,6 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag } private void setEffectRangePreview(string effectRange, float euler, MapUnity currentNode) { - Debug.Log("作用范围:" + effectRange); MapUnity playerOnNode = GameManager.Instance.playerOn.transform.GetComponent(); var handlers = new Dictionary { @@ -264,86 +271,9 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag { cardEntity.influencePreviewPool = handler.HandleAngleWithResult(euler); } + cardEntity.influencePreviewPool=MathTool.RemoveDuplicates(cardEntity.influencePreviewPool); } - /* private void showEffectRange3_2(float euler) - { - if (euler > 0 && euler < 45) - { - if (checkNodeInfluencedable(currentNode.unitPool[0])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[0]); - if (checkNodeInfluencedable(currentNode.unitPool[4])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[4]); - } - else if (euler > 45 && euler < 135) - { - if (checkNodeInfluencedable(currentNode.unitPool[1])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[1]); - if (checkNodeInfluencedable(currentNode.unitPool[5])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[5]); - } - else if (euler > 135 && euler < 180) - { - if (checkNodeInfluencedable(currentNode.unitPool[2])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[2]); - if (checkNodeInfluencedable(currentNode.unitPool[0])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[0]); - } - else if (euler > 180 && euler < 225) - { - if (checkNodeInfluencedable(currentNode.unitPool[1])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[1]); - if (checkNodeInfluencedable(currentNode.unitPool[3])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[3]); - } - else if (euler > 225 && euler < 315) - { - if (checkNodeInfluencedable(currentNode.unitPool[2])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[2]); - if (checkNodeInfluencedable(currentNode.unitPool[4])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[4]); - } - else if (euler > 315 && euler < 360) - { - if (checkNodeInfluencedable(currentNode.unitPool[3])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[3]); - if (checkNodeInfluencedable(currentNode.unitPool[5])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[5]); - } - }*/ - /* private void showEffectRange2(float euler) - { - if (euler > 0 && euler <= 45) - { - if (checkNodeInfluencedable(currentNode.unitPool[2])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[2]); - } - else if (euler > 45 && euler <= 135) - { - if (checkNodeInfluencedable(currentNode.unitPool[3])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[3]); - } - else if (euler > 135 && euler <= 180) - { - if (checkNodeInfluencedable(currentNode.unitPool[4])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[4]); - } - else if (euler > 180 && euler <= 225) - { - if (checkNodeInfluencedable(currentNode.unitPool[5])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[5]); - } - else if (euler > 225 && euler <= 315) - { - if (checkNodeInfluencedable(currentNode.unitPool[0])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[0]); - } - else if (euler > 315 && euler <= 360) - { - if (checkNodeInfluencedable(currentNode.unitPool[1])) - cardEntity.influencePreviewPool.Add(currentNode.unitPool[1]); - } - }*/ private void getInfluencePreviePoll(MapUnity currentNode, string effecctRange) @@ -359,7 +289,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag private void noAinPanleWork(PointerEventData eventData) { - Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value); + /*Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value); if (eventData.pointerCurrentRaycast.gameObject != null) { if (Physics.Raycast(ray, out RaycastHit raycastHit)) @@ -367,7 +297,8 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag currentNode = raycastHit.collider.transform.GetComponent(); cardEntity.influencePreviewPool.Add(currentNode); } - } + }*/ + setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, 30.0f, currentNode); } public void OnDrag(PointerEventData eventData) @@ -383,8 +314,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag } else { - //没有范围不需要射线吧，因为不需要指定目标点？ - // noAinPanleWork(eventData); + noAinPanleWork(eventData); } dyeing(); @@ -403,114 +333,9 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag public void OnEndDrag(PointerEventData eventData) { - StartCoroutine(OnDragIEnumerator(eventData)); - /* if (!cardEntity.costEnough) - { - return; - } - choosed = false; - if (canUse) - { - if (eventData.pointerCurrentRaycast.gameObject != null) - { - if (eventData.pointerCurrentRaycast.gameObject.name == "Card") - { - transform.SetParent(eventData.pointerCurrentRaycast.gameObject.transform.parent); - transform.position = eventData.pointerCurrentRaycast.gameObject.transform.position; - eventData.pointerCurrentRaycast.gameObject.transform.position = originalParent.position; - eventData.pointerCurrentRaycast.gameObject.transform.SetParent(originalParent); + GameManager.Instance.onDrag = false; - GetComponent().blocksRaycasts = true; - - ainPanle.SetActive(false);//关闭贝塞尔曲线 - //遍历范围预览池消除影响色 - for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++) - { - GameManager.Instance.player.influencePreviewPool[i].influenced = false; - } - //GameManager.Instance.player.influencePreviewPool.Clear(); - - return; - } - else if (eventData.pointerCurrentRaycast.gameObject.name == "cardSlot") - { - transform.SetParent(eventData.pointerCurrentRaycast.gameObject.transform); - transform.position = eventData.pointerCurrentRaycast.gameObject.transform.position; - GetComponent().blocksRaycasts = true; - - ainPanle.SetActive(false);//关闭贝塞尔曲线 - //遍历范围预览池消除影响色 - for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++) - { - GameManager.Instance.player.influencePreviewPool[i].influenced = false; - } - //GameManager.Instance.player.influencePreviewPool.Clear(); - - return; - } - } - if (ainPanle.activeSelf) - { - ainPanle.SetActive(false);//关闭贝塞尔曲线 - } - - //先判断该卡牌的类型是否是需要范围 - if (cardEntity.cardOriginalData.CastingRange != 0) - { - //检测碰撞的地图节点是否被影响（可释放） - if (currentNode == null || currentNode.influenced == false) - { - //遍历范围预览池消除影响色（红色，卡牌的释放范围） - for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++) - { - GameManager.Instance.player.influencePreviewPool[i].influenced = false; - } - //GameManager.Instance.player.influencePreviewPool.Clear(); - } - else if (currentNode.influenced) - { - - //卡牌释放效果 - Debug.Log("卡牌释放前影响格数:" + cardEntity.influencePreviewPool.Count); - cardEntity.use(); - Debug.Log("玩家盾量：" + Usermanager.Instance.Shield); - - - } - //遍历范围预览池消除影响色 - for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++) - { - GameManager.Instance.player.influencePreviewPool[i].influenced = false; - } - GameManager.Instance.player.influencePreviewPool.Clear(); - //遍历影响池变色 - for (int i = 0; i < cardEntity.influencePreviewPool.Count; i++) - { - cardEntity.influencePreviewPool[i].influenced = false; - } - cardEntity.influencePreviewPool.Clear(); - GetComponent().blocksRaycasts = true; - - //其他位置都归位 - transform.SetParent(originalParent); - transform.localPosition = originalpoint; - return; - }//范围类，需要指定被影响的节点才能释放 - else - { - //卡牌释放效果 - cardEntity.use(); - Debug.Log("玩家盾量：" + Usermanager.Instance.Shield); - - return; - - }//无范围类，直接释放 - - } - else - { - canUse = true; - }*/ + StartCoroutine(OnDragIEnumerator(eventData)); } private IEnumerator OnDragIEnumerator(PointerEventData eventData) @@ -551,10 +376,16 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag ainPanle.SetActive(false);//关闭贝塞尔曲线 //遍历范围预览池消除影响色 - for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++) + for (int i = 0; i < MapUnityManager.Instance.castPool.Count; i++) { - GameManager.Instance.player.influencePreviewPool[i].influenced = false; + MapUnityManager.Instance.castPool[i].influenced = false; + } + MapUnityManager.Instance.castPool.Clear(); + for (int i = 0; i < cardEntity.influencePreviewPool.Count; i++) + { + cardEntity.influencePreviewPool[i].influenced = false; } + cardEntity.influencePreviewPool.Clear(); //GameManager.Instance.player.influencePreviewPool.Clear(); yield break; @@ -572,18 +403,17 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag if (currentNode == null || currentNode.influenced == false) { //遍历范围预览池消除影响色（红色，卡牌的释放范围） - for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++) + for (int i = 0; i < MapUnityManager.Instance.castPool.Count; i++) { - GameManager.Instance.player.influencePreviewPool[i].influenced = false; + MapUnityManager.Instance.castPool[i].influenced = false; } - //GameManager.Instance.player.influencePreviewPool.Clear(); + MapUnityManager.Instance.castPool.Clear(); } else if (currentNode.influenced) { //卡牌释放效果 yield return StartCoroutine(cardEntity.settle(0)); - Debug.Log("玩家盾量：" + Usermanager.Instance.Shield); } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index 2123996e..038b38e0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs @@ -12,7 +12,7 @@ public class CardEntity : MonoBehaviour { public CardOriginalData cardOriginalData; //public CardOriginalData cardData; - public List influencePreviewPool;//卡牌的影响范围 + public List influencePreviewPool=new List();//卡牌的影响范围 public int cardId; @@ -155,7 +155,6 @@ public class CardEntity : MonoBehaviour } if (cardOriginalData.AdvantageDescription.Length != 0) { - Debug.Log("优势:" + cardOriginalData.AdvantageDescription + ";"); sb.Append("优势:" + cardOriginalData.AdvantageDescription + ";"); } if (sb.Length > 0) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs index 8b1d3b3f..a3175107 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs @@ -13,6 +13,7 @@ public class TurnMaster : Singleton public Text cardDeckNumberText; public Text usedCardNumberText; + public Text deleteCardNumberText; public int currentCost; public int totalCost; @@ -37,8 +38,8 @@ public class TurnMaster : Singleton } public void Start() { - totalCost = Usermanager.Instance.totalCost; - currentCost = totalCost; + /*totalCost = Usermanager.Instance.totalCost; + currentCost = totalCost;*/ } private void Update() @@ -62,8 +63,8 @@ public class TurnMaster : Singleton { //结算buff //结算技能冷却 - // EnemyManager.Instance.EnemySkillCoolDown_Observer(); - + // EnemyManager.Instance.EnemySkillCoolDown_Observer(); + EnemyManager.Instance.enemyTurnSettle(0); turn = Turn.enemyTurn; } @@ -74,7 +75,7 @@ public class TurnMaster : Singleton //敌人动作如移动，涂色 EnemyManager.Instance.EnemyTurn_Observer(); - EnemyManager.Instance.enemyTurnSettle(0); + turn = Turn.turnStop; // EndEnemyTurn();在enemyTurn里面调用 @@ -83,6 +84,7 @@ public class TurnMaster : Singleton //同步UI cardDeckNumberText.text = cardDeck.cardList.Count.ToString(); usedCardNumberText.text = usedCard.usedCardList.Count.ToString(); + deleteCardNumberText.text = usedCard.deleteCardList.Count.ToString(); } IEnumerator EndPlayerTurnBegin() { @@ -105,8 +107,9 @@ public class TurnMaster : Singleton //老吊写的函数 public void restoreResource(int settleTurn) { - totalCost = Usermanager.Instance.totalCost; - currentCost = totalCost; + //totalCost = Usermanager.Instance.totalCost; + //currentCost = totalCost; + GameManager.Instance.playerState.currentCost = GameManager.Instance.playerState.maxCost; Usermanager.Instance.Shield = 0; } IEnumerator ShuffleWithLosingCards() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/UsedCard.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/UsedCard.cs index e7a50223..4c0098cc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/UsedCard.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/UsedCard.cs @@ -5,5 +5,8 @@ using UnityEngine; public class UsedCard : MonoBehaviour { public GameObject cardPrefab; + [Header("墓地")] public List usedCardList; + [Header("销毁")] + public List deleteCardList; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs index 64fc4285..9355a65b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.UI; @@ -153,9 +154,8 @@ public class EnemyManager : Singleton } public void AttackRangePreviewInfluencedNode(MapUnity enemyNode, int step,List influencePreviewPool)//可移动格子预览 - { - - influencePreviewPool .Clear(); + { + influencePreviewPool .Clear(); //GameManager.Instance.playerOn.InfluencePool = GameManager.Instance.playerOn.unitPool; MapUnity playerNode = enemyNode; MapUnity currentNode = enemyNode; @@ -519,11 +519,14 @@ public class EnemyManager : Singleton } } + + List disInfluencePreviewPool = influencePreviewPool.Distinct(new MapUnityCompare()).ToList(); + //遍历影响池变色 - for (int i = 0; i < influencePreviewPool.Count; i++) + foreach ( var i in disInfluencePreviewPool) { - influencePreviewPool[i].influenced = true; - influencePreviewPool[i].choossedMark.GetComponent().material = influencePreviewPool[i].red; + i.markInfluenced = true; + i.hightLigtMark.GetComponent().material = i.enemyMark; } } @@ -896,5 +899,30 @@ public class EnemyManager : Singleton } } + List disInfluencePreviewPool = influencePreviewPool.Distinct(new MapUnityCompare()).ToList (); + influencePreviewPool.Clear(); + foreach (var i in disInfluencePreviewPool ) + { + influencePreviewPool.Add(i); + } + } + + + //比较类 + class MapUnityCompare : IEqualityComparer + { + public bool Equals(MapUnity x, MapUnity y) + { + if((x.locationX == y.locationX)&&(x.locationY == y.locationY)) + { + return true; + } + return false; + } + + public int GetHashCode(MapUnity obj) + { + return obj.locationX.GetHashCode() ^ obj.locationY.GetHashCode(); + } } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs index 443f3836..f28ae682 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs @@ -309,6 +309,18 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver if (EnemyState.currentHP <= 0) { OnDeath(); + }else + { + foreach (var key in EnemyState.abnormalCondition.Keys.ToList()) + { + Debug.Log(key); + switch (key) + { + case AbnormalCondition.sleep: + EnemyState.abnormalCondition.Remove(key); + break; + } + } } } @@ -338,9 +350,6 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver case AbnormalCondition.disarm: disarmSettle(EnemyState.abnormalCondition[key]); break; - case AbnormalCondition.sleep: - sleepSettle(EnemyState.abnormalCondition[key]); - break; case AbnormalCondition.bleed: //bleedSettle(EnemyState.abnormalCondition[key]); break; @@ -350,6 +359,18 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver } abnormalConditionEndCheck(); } + + foreach (var key in EnemyState.abnormalCondition.Keys.ToList()) + { + Debug.Log(key); + switch (key) + { + case AbnormalCondition.sleep: + sleepSettle(EnemyState.abnormalCondition[key]); + break; + } + abnormalConditionEndCheck(); + } /*for(int i=0;i< EnemyState.abnormalCondition.Count; i++) { switch (EnemyState.abnormalCondition[i].key) @@ -410,6 +431,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver { EnemyState.damageMultiplier = 0; EnemyState.stepRangeMultiplier = 0; + EnemyState.abnormalCondition[AbnormalCondition.sleep]--; } public void bleedSettle() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs index 6721d9cd..813fecad 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs @@ -16,6 +16,9 @@ public class GameManager : Singleton public PlayerState_SO templatePlayerState;//角色数据ScriptableObject模板 public PlayerState_SO playerState;//在游戏中实际使用的数据 + [Header("角色动作状态")] + public bool onDrag;//正在拖动卡牌 + [Header("角色状态数据UI")] public Text textMaxCost; public Text textCurrentCost; @@ -86,7 +89,6 @@ public class GameManager : Singleton public bool SyncColourCountUI() { bool result = false; - Debug.Log("Sync"); float playerCount = 0; float enemyCount = 0; float totalCount = 0; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler7_2.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler7_2.cs index 4d51a25d..2b3832c9 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler7_2.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler7_2.cs @@ -15,37 +15,37 @@ public class EffectRangeHandler7_2 : EffectRangeHandlerBase { { 30.0f, () => { - get7_2Node(currentNode,2); + get7_2Node(currentNode); return influencePreviewPool; } }, { 90.0f, () => { - get7_2Node(currentNode,3); + get7_2Node(currentNode); return influencePreviewPool; } }, { 150.0f, () => { - get7_2Node(currentNode,4); + get7_2Node(currentNode); return influencePreviewPool; } }, { 210.0f, () => { - get7_2Node(currentNode,5); + get7_2Node(currentNode); return influencePreviewPool; } }, { 270.0f, () => { - get7_2Node(currentNode,0); + get7_2Node(currentNode); return influencePreviewPool; } }, { 330.0f, () => { - get7_2Node(currentNode,1); + get7_2Node(currentNode); return influencePreviewPool; } } @@ -54,9 +54,9 @@ public class EffectRangeHandler7_2 : EffectRangeHandlerBase } - private void get7_2Node(MapUnity currentNode, int value) + private void get7_2Node(MapUnity currentNode) { - if (tryGetNodeInfluencedable(currentNode.unitPool[counter.Subtract(value, 1)])) + /*if (tryGetNodeInfluencedable(currentNode.unitPool[counter.Subtract(value, 1)])) { tryGetNodeInfluencedable(currentNode.unitPool[counter.Subtract(value, 1)].unitPool[value]); } @@ -64,7 +64,8 @@ public class EffectRangeHandler7_2 : EffectRangeHandlerBase { tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(value, 1)].unitPool[value]); } - getongNode(currentNode, value); + getongNode(currentNode, value);*/ + getNodeTools.getCircleNode(influencePreviewPool,1); } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_2.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_2.cs index 40ca3aab..3172b4c0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_2.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_2.cs @@ -54,48 +54,19 @@ public class EffectRangeHandler8_2 : EffectRangeHandlerBase } - public bool tryGetNodeInfluencedableList(MapUnity node,List nodeList) - { - bool canPass = true; - if (node == null) - { - canPass = false; - return canPass; - } - Debug.Log("坐标X" + node.locationX + "坐标Y" + node.locationY); - if (node.TryGetComponent(out EnemyNode enemyNode)) - { - Debug.Log("JJKK"); - if (enemyNode.enemyType == EnemyNode.EnemyType.block) - { - Debug.Log("AABB"); - canPass = false; - nodeList.Add(node); - } - Debug.Log("DDFF"); - } - - if (canPass) - { - nodeList.Add(node); - } - return canPass; - } - private void get8_2Node(MapUnity node, List influencePreviewPool) { + Debug.Log("进入8_2"); influencePreviewPool.Add(node); - getNearbyNode(influencePreviewPool); - getNearbyNode(influencePreviewPool); - getNearbyNode(influencePreviewPool); - while (influencePreviewPool.Contains(node)) + getNodeTools.getCircleNode(influencePreviewPool,3); + /*while (influencePreviewPool.Contains(node)) { influencePreviewPool.Remove(node); - } + }*/ } - public void getNearbyNode(List nodeList) +/* public void getNearbyNode(List nodeList) { // 创建一个副本以避免遍历时修改原集合 List nodesCopy = new List(nodeList); @@ -112,7 +83,7 @@ public class EffectRangeHandler8_2 : EffectRangeHandlerBase // 遍历完成后统一修改原集合 nodeList.AddRange(nodesToAdd); - } + }*/ } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandlerBase.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandlerBase.cs index a14d1d3b..53042a8d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandlerBase.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandlerBase.cs @@ -18,18 +18,14 @@ public class EffectRangeHandlerBase : EffectRangeHandler canPass = false; return canPass; } - Debug.Log("currentNode"+ currentNode.enemyNode); /*if (currentNode.TryGetComponent(out EnemyNode enemyNode))*/ if (currentNode.enemyNode!=null) { - Debug.Log("JJKK"); if (currentNode.enemyNode.enemyType.Equals(EnemyNode.EnemyType.block)) { - Debug.Log("AABB"); canPass = false; influencePreviewPool.Add(currentNode); } - Debug.Log("DDFF"); } if (canPass) @@ -41,7 +37,6 @@ public class EffectRangeHandlerBase : EffectRangeHandler public List HandleAngleWithResult(float angle) { - Debug.Log("角度大小" + angle); foreach (var kvp in angleActions) { if (Math.Abs(angle - kvp.Key) < Epsilon) @@ -49,7 +44,6 @@ public class EffectRangeHandlerBase : EffectRangeHandler return kvp.Value(); } } - Debug.Log("数组大小" + influencePreviewPool.Count); return influencePreviewPool; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs index d8ad3988..e242505c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs @@ -12,10 +12,14 @@ public class MapUnity : MonoBehaviour [Header("UI效果范围控件")] public bool influenced;//被选中 + public bool markInfluenced;//需要被高亮显示 + public GameObject choossedMark;//被选中激活 - // public List InfluencePool;//影响池 + public GameObject hightLigtMark;//被选中高亮 + public Material red; public Material yellow; + public Material enemyMark; [Header("涂色控件")] public Material plyerColour;//玩家颜色 @@ -77,9 +81,17 @@ public class MapUnity : MonoBehaviour { choossedMark.SetActive(false); } + if (markInfluenced) + { + hightLigtMark.SetActive(true); + } + else + { + hightLigtMark.SetActive(false); + } - //根据涂色角色改变颜色 - if(whoColour == WhoColour.playerColour ) + //根据涂色角色改变颜色 + if (whoColour == WhoColour.playerColour ) { colourGameObject.GetComponent().material = plyerColour; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs index 6623f053..ba25ac9d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs @@ -34,8 +34,7 @@ public class Player : MonoBehaviour if (Physics.Raycast(ray, out RaycastHit raycastHit, 500, playerLayerMask.value) && raycastHit.collider.gameObject.tag == "Player") { Debug.Log(raycastHit.collider.gameObject.name); - MapUnityManager mapUnityManager = new MapUnityManager(); - influencePreviewPool.AddRange(mapUnityManager.findReachableTiles(GameManager.Instance.playerOn, GameManager.Instance.playerState.currentStepRange)); + influencePreviewPool.AddRange(MapUnityManager.Instance.findReachableTiles(GameManager.Instance.playerOn, GameManager.Instance.playerState.currentStepRange)); //遍历影响池变色 for (int i = 0; i < influencePreviewPool.Count; i++) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardData_SO/PlayerState_SO.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardData_SO/PlayerState_SO.cs index 34e8f38c..64b73629 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardData_SO/PlayerState_SO.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardData_SO/PlayerState_SO.cs @@ -24,5 +24,10 @@ public class PlayerState_SO : ScriptableObject public float currentHP; + private void Start() + { + maxCost = 3; + } + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/EffectRange.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/EffectRange.cs index 1fbe378a..a1fe83a4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/EffectRange.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/EffectRange.cs @@ -40,4 +40,7 @@ public class EffectRange public const string range8_1 = "8_1"; public const string range8_2 = "8_2"; + + public static readonly List speRange = new List {range2, range3_1, range3_2, range3_3, range4_1, + range4_2, range4_3, range5_1, range5_2, range5_3, range6_1, range6_2, range6_3, range7_1, range7_2, range8_1 , range8_2}; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/MathTool.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/MathTool.cs index 30c62bd0..54dddb85 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/MathTool.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/MathTool.cs @@ -39,4 +39,22 @@ public class MathTool return numbers; } + + public static List RemoveDuplicates(List list) + { + List result = new List(); + HashSet set = new HashSet(); + + foreach (T item in list) + { + if (set.Add(item)) + { + result.Add(item); + } + } + + return result; + } } + + diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs index dfabdad3..9a12d39f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs @@ -1,10 +1,15 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; +using UnityEngine.UIElements; -public class getNodeTools +public class getNodeTools { - public bool tryGetNodeInfluencedable(MapUnity currentNode,List nodeList) + [Header("瞄准射线图层剔除")] + public LayerMask layerMask; + public bool tryGetNodeInfluencedable(MapUnity currentNode, List nodeList) { bool canPass = true; if (currentNode == null) @@ -23,5 +28,110 @@ public class getNodeTools return canPass; } + public static void getLongNodes(MapUnity currentNode, int angle, int range,List results) + { + List result = new List(); + MapUnity currentCheckNode = currentNode; + for (int i = 0; i < range; i++) + { + if (tryGetNode(currentCheckNode.unitPool[angle], results)) + { + currentCheckNode = currentCheckNode.unitPool[angle]; + } + else + { + return; + } + } + } + + public static bool tryGetNode(MapUnity currentNode, List results) + { + bool canPass = true; + if (currentNode == null) + { + canPass = false; + return canPass; + } + /*if (currentNode.TryGetComponent(out EnemyNode enemyNode))*/ + if (currentNode.enemyNode != null) + { + if (currentNode.enemyNode.enemyType.Equals(EnemyNode.EnemyType.block)) + { + canPass = false; + results.Add(currentNode); + } + } + + if (canPass) + { + results.Add(currentNode); + } + return canPass; + } + + public static void getCircleNode(List nodeList,int range) + { + for (int i = 0;i < range;i++) + { + getNearbyNode(nodeList); + } + } + public static void getNearbyNode(List nodeList) + { + // 创建一个副本以避免遍历时修改原集合 + List nodesCopy = new List(nodeList); + List nodesToAdd = new List(); // 临时列表存储要添加的节点 + + foreach (var node in nodesCopy) + { + for (int i = 0; i < 6; i++) + { + tryGetNode(node.unitPool[i], nodesToAdd); + } + } + + // 遍历完成后统一修改原集合 + nodeList.AddRange(nodesToAdd); + + } + + public static void checkListPass(List mapUnityList) + { + + for (int i = 0; i < mapUnityList.Count; i++) + { + if (!checkNodePass(mapUnityList[i])) + { + mapUnityList.RemoveAt(i); + } + + } + + } + + public static bool checkNodePass(MapUnity mapUnity) + { + LayerMask layerMask=new LayerMask(); + int blockLayer = LayerMask.NameToLayer("Block"); + layerMask |= (1 << blockLayer); + bool canPass=true; + //MapUnity playerOnNode = GameManager.Instance.playerOn.transform.GetComponent(); + var playerOnNode=GameManager.Instance.player; + float distance = Vector3.Distance(playerOnNode.transform.position, mapUnity.transform.position); + Vector3 dir = mapUnity.transform.position - playerOnNode.transform.position; + Ray ray = new Ray(playerOnNode.transform.position, dir); + if (Physics.Raycast(ray, out RaycastHit raycastHit, distance, layerMask.value)) + { + canPass = false; + } +/* if (!canPass) + {*/ + Debug.Log("距离是" + distance + ",结果是:" + canPass+",角度是:"+dir); + //} + return canPass; + + } + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs index 4f78b75e..4a28a7fc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs @@ -14,7 +14,7 @@ public class EnemyPlanActionUI : MonoBehaviour private void OnMouseEnter() { - if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn) + if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn &&GameManager .Instance .onDrag ==false ) { MapUnity currentMapUnity = GameManager.Instance.X[enemyNode.positionX].Y[enemyNode.positionY]; @@ -134,21 +134,21 @@ public class EnemyPlanActionUI : MonoBehaviour { for (int i = 0; i < step + 1; i++) { - enemyNode.pasth[i].choossedMark.GetComponent().material = enemyNode.pasth[i].yellow; + enemyNode.pasth[i].hightLigtMark.GetComponent().material = enemyNode.pasth[i].yellow; } } else if (enemyNode.pasth.Count - 1 == step) { for (int i = 0; i < step; i++) { - enemyNode.pasth[i].choossedMark.GetComponent().material = enemyNode.pasth[i].yellow; + enemyNode.pasth[i].hightLigtMark.GetComponent().material = enemyNode.pasth[i].yellow; } } else { for (int i = 0; i < enemyNode.pasth.Count; i++) { - enemyNode.pasth[i].choossedMark.GetComponent().material = enemyNode.pasth[i].yellow; + enemyNode.pasth[i].hightLigtMark.GetComponent().material = enemyNode.pasth[i].yellow; } } } @@ -160,7 +160,7 @@ public class EnemyPlanActionUI : MonoBehaviour { for (int i = 0; i < enemyNode.oppositePasth.Count; i++) { - enemyNode.oppositePasth[i].choossedMark.GetComponent().material = enemyNode.pasth[i].yellow; + enemyNode.oppositePasth[i].hightLigtMark.GetComponent().material = enemyNode.pasth[i].yellow; } } break; @@ -185,9 +185,9 @@ public class EnemyPlanActionUI : MonoBehaviour //遍历影响池变色 for (int i = 0; i < enemyNode.rangePool.Count; i++) { - enemyNode.rangePool[i].influenced = false; + enemyNode.rangePool[i].markInfluenced = false; } - enemyNode.rangePool.Clear(); + //enemyNode.rangePool.Clear(); } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs index e2f9204f..e70550f5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs @@ -22,11 +22,17 @@ public class DestructionManager : Singleton GameManager.Instance.SyncColourCountUI(); //遍历范围预览池消除影响色 Debug.Log("清除前红色格数:" + GameManager.Instance.player.influencePreviewPool.Count); - for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++) + /*for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++) { GameManager.Instance.player.influencePreviewPool[i].influenced = false; } - GameManager.Instance.player.influencePreviewPool.Clear(); + GameManager.Instance.player.influencePreviewPool.Clear();*/ + + for (int i = 0; i < MapUnityManager.Instance.castPool.Count; i++) + { + MapUnityManager.Instance.castPool[i].influenced = false; + } + MapUnityManager.Instance.castPool.Clear(); //GetComponent().blocksRaycasts = true; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs index 59b3f322..0f5b65a7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs @@ -1,9 +1,13 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; +using UnityEditor.Experimental.GraphView; using UnityEngine; -public class MapUnityManager : MonoBehaviour +public class MapUnityManager : Singleton { + + public List castPool=new List();//记录预览影响的对象池 public List findReachableTiles(MapUnity startNode, int movePoints) { List reachableNodes = new List(); @@ -38,4 +42,33 @@ public class MapUnityManager : MonoBehaviour return reachableNodes; } + + public void getCastPool(string effectRange,int castRange) + { + MapUnity playerOn = GameManager.Instance.playerOn; + if (EffectRange.speRange.Contains(effectRange)) + { + for (int i = 0; i < 6; i++) + { + getNodeTools.getLongNodes(playerOn, i, castRange, castPool); + } + } + else + { + castPool.Add(playerOn); + getNodeTools.getCircleNode(castPool, castRange); + while (castPool.Contains(playerOn)) + { + castPool.Remove(playerOn); + } + } + //castPool.Distinct().ToList(); + //getNodeTools.checkListPass(castPool); + //遍历影响池变色 + for (int i = 0; i < castPool.Count; i++) + { + castPool[i].influenced = true; + castPool[i].choossedMark.GetComponent().material = castPool[i].red; + } + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs index c4b9845d..3fe3438e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using Unity.VisualScripting; using UnityEngine; +using UnityEngine.Playables; public class SettlementManager : Singleton { @@ -46,6 +47,7 @@ public class SettlementManager : Singleton { Dictionary trueFunctionVal = new Dictionary(); bool canAdv = GameManager.Instance.SyncColourCountUI(); + GameManager.Instance.playerState.currentCost -= cardOriginalData.Cost; if (canAdv) { trueFunctionVal.AddRange(cardOriginalData.AdvantageFunctionVal); @@ -80,7 +82,7 @@ public class SettlementManager : Singleton abnormalConditionWork(kvp.Key, int.Parse(kvp.Value), influencePreviewPool); break; case CardFunction.costRestore: - TurnMaster.Instance.currentCost += int.Parse(kvp.Value); + GameManager.Instance.playerState.currentCost += int.Parse(kvp.Value); break; case CardFunction.dyeing: dyeingWork(influencePreviewPool); @@ -117,6 +119,7 @@ public class SettlementManager : Singleton } } + GameManager.Instance.SyncColourCountUI(); } diff --git a/ColorlessWorld-2024-4-2/Assets/data/card_data.csv b/ColorlessWorld-2024-4-2/Assets/data/card_data.csv index ef1e7510..40083150 100644 --- a/ColorlessWorld-2024-4-2/Assets/data/card_data.csv +++ b/ColorlessWorld-2024-4-2/Assets/data/card_data.csv @@ -1,8 +1,8 @@ 锘縄D,鍚嶇О,璐圭敤,绋鏈夊害,鍔熻兘,鏁板,鏂芥硶鑼冨洿,浣滅敤鑼冨洿,娑堣,浼樺娍鍔熻兘,鏁板,鍗＄墝绫诲瀷,浼樺娍鎻忚堪,鍥剧墖璺緞 -10001,灏勫嚮,1,1,1,7,1,1,0,1,7,1,,PlayerIcon -10002,鎶ょ浘,1,1,2,5,0,1,0,2,5,1,,PlayerIcon +10001,灏勫嚮,1,1,1,7,3,1,0,1,7,1,,PlayerIcon +10002,鎶ょ浘,1,1,2,5,0,0,0,2,5,1,,PlayerIcon 10003,姣掕嵂,1,1,4,6,3,1,0,4,10,1,鏂藉姞4灞備腑姣,PlayerIcon -10004,鏋彾鐐稿脊,2,2,9,2,1,7_2,0,9;4,2;4,1,鏂藉姞4灞備腑姣,PlayerIcon +10004,鏋彾鐐稿脊,2,2,9,2,2,7_2,0,9;4,2;4,1,鏂藉姞4灞備腑姣,PlayerIcon 10005,鑺辩矇,0,2,8,1,4,1,0,8,2,1,鏂藉姞1灞傛矇鐫,PlayerIcon 10006,鑷存畫,2,1,7,2,2,1,0,7;9,2;2,1,鏂藉姞2灞傛祦琛,PlayerIcon 10007,婊嬪吇,1,2,12;13,3;1,0,0,0,12,3,1,鏃犻渶涓㈠純,PlayerIcon @@ -12,4 +12,5 @@ 10011,鑽夊洟,2,1,1;14,5;0,1,6_2,1,1;14,8;0,1,閫犳垚3鐐逛激瀹,PlayerIcon 10012,绌垮埡灏勫嚮,2,1,1,8,1,5_1,0,1;4,8;4,1,鏂藉姞4灞備腑姣,PlayerIcon 10013,妫灄涔嬫,3,3,1,20,3,1,0,1;15,20;0,1,閫犳垚鍦哄湴宸激瀹,PlayerIcon -10014,宸ㄦ爲涔嬪紦,2,1,1;14,13;0,1,5_3,0,1;14;5,13;0;1,1,鏂藉姞1灞傝櫄寮,PlayerIcon +10014,宸ㄦ爲涔嬪紦,2,1,1;14,13;0,3,5_3,0,1;14;5,13;0;1,1,鏂藉姞1灞傝櫄寮,PlayerIcon +10015,鐐稿脊,0,1,1,5,0,8_2,0,1,5,1,,PlayerIcon diff --git a/ColorlessWorld-2024-4-2/UserSettings/EditorUserSettings.asset b/ColorlessWorld-2024-4-2/UserSettings/EditorUserSettings.asset index 4e2b5931..ef5c316a 100644 --- a/ColorlessWorld-2024-4-2/UserSettings/EditorUserSettings.asset +++ b/ColorlessWorld-2024-4-2/UserSettings/EditorUserSettings.asset @@ -6,9 +6,6 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 0052010304020f0b0858582012770844124f1929292d2068292a1b62e7b9313a - flags: 0 - RecentlyUsedSceneGuid-1: value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d flags: 0 vcSharedLogLevel: diff --git a/ColorlessWorld-2024-4-2/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/ColorlessWorld-2024-4-2/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 1ed346a6..e7098555 100644 --- a/ColorlessWorld-2024-4-2/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/ColorlessWorld-2024-4-2/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -46,10 +46,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 409.6 + x: 410.4 y: 73.6 - width: 769.99994 - height: 466.2 + width: 769.19995 + height: 465.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -102,10 +102,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 769.99994 - height: 445.2 - m_Scale: {x: 0.50130206, y: 0.50130206} - m_Translation: {x: 385, y: 222.6} + width: 769.19995 + height: 444.4 + m_Scale: {x: 0.50078124, y: 0.50078124} + m_Translation: {x: 384.59998, y: 222.2} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -113,12 +113,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -768 - y: -444.04367 + y: -443.70673 width: 1536 - height: 888.08734 + height: 887.41345 m_MinimalGUI: 1 - m_defaultScale: 0.50130206 - m_LastWindowPixelSize: {x: 962.49994, y: 582.75} + m_defaultScale: 0.50078124 + m_LastWindowPixelSize: {x: 961.49994, y: 581.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -169,7 +169,7 @@ MonoBehaviour: x: 0 y: 0 width: 1119.2 - height: 487.2 + height: 486.4 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 @@ -191,8 +191,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 347.2 - height: 487.2 + width: 348 + height: 486.4 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -223,8 +223,8 @@ MonoBehaviour: serializedVersion: 2 x: 62.4 y: 73.6 - width: 346.2 - height: 466.2 + width: 347 + height: 465.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -238,9 +238,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: be2bfcff062cfcff262dfcff72bbfffff0bbffff58bdffff2afbffffd46c0000426d0000f46d0000046f0000366f0000926f0000aa700000507100009a710000c2710000ea7100000472000060720000ba720000c47200000a7300002c730000 + m_SelectedIDs: e4cd0000 + m_LastClickedID: 52708 + m_ExpandedIDs: 0a80feff9681feffa0cc000086cd0000cace000014cf0000dcd00000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -279,10 +279,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 347.2 + x: 348 y: 0 - width: 771.99994 - height: 487.2 + width: 771.19995 + height: 486.4 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} @@ -312,10 +312,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 409.6 + x: 410.4 y: 73.6 - width: 769.99994 - height: 466.2 + width: 769.19995 + height: 465.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -356,9 +356,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -322, y: -280.8} + snapOffset: {x: -322, y: 24.8} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 + snapCorner: 1 id: unity-scene-view-toolbar index: 0 layout: 1 @@ -635,9 +635,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 2.4415243, y: -1.7079823, z: 2.0844522} + m_Target: {x: 3.9131052, y: -11.547329, z: 5.253002} speed: 2 - m_Value: {x: 2.4415243, y: -1.7079823, z: 2.0844522} + m_Value: {x: 3.9131052, y: -11.547329, z: 5.253002} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -683,13 +683,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.5857513, y: -0.0031634637, z: 0.0022860928, w: -0.81048596} speed: 2 - m_Value: {x: 0.2242356, y: -0.017523078, z: 0.0038708227, w: 0.9743697} + m_Value: {x: -0.5857492, y: -0.0031634523, z: 0.0022860847, w: -0.81048304} m_Size: - m_Target: 3.4315991 + m_Target: 11.411661 speed: 2 - m_Value: 3.4315991 + m_Value: 11.411661 m_Ortho: m_Target: 0 speed: 2 @@ -730,9 +730,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 487.2 + y: 486.4 width: 1119.2 - height: 283.59998 + height: 284.4 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 11} @@ -763,9 +763,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 62.4 - y: 560.8 + y: 560 width: 1118.2 - height: 262.59998 + height: 263.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -787,24 +787,24 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/UI + - Assets/Prefab/MapNodePrefab m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 m_FilterByTypeIntersection: 0 m_ViewMode: 1 - m_StartGridSize: 64 + m_StartGridSize: 62 m_LastFolders: - - Assets/Scripts/UI - m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\GitInventory_0330\test_45\ColorlessWorld-2024-4-2 + - Assets/Prefab/MapNodePrefab + m_LastFoldersGridSize: 62 + m_LastProjectPath: D:\GitInventory_0524\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: 58070000 + m_LastClickedID: 1880 + m_ExpandedIDs: 000000000c060000cc0600000c07000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -832,7 +832,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009a7400009c74000000ca9a3bffffff7f + m_ExpandedIDs: 000000000c06000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -857,9 +857,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 700d0000 - m_LastClickedInstanceID: 3440 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: 4ad00000 + m_LastClickedInstanceID: 53322 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000f06f00003a7b000058cc00005ecc00006ed400004e6e0000e07200000a7000000e7000000281000056cf00000000000094760000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -885,7 +885,7 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 + m_GridSize: 62 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 --- !u!114 &11 @@ -910,9 +910,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 62.4 - y: 560.8 + y: 560 width: 1118.2 - height: 262.59998 + height: 263.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 diff --git a/ColorlessWorld-2024-4-2/UserSettings/Search.index b/ColorlessWorld-2024-4-2/UserSettings/Search.index deleted file mode 100644 index dba62d53..00000000 --- a/ColorlessWorld-2024-4-2/UserSettings/Search.index +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "Assets", - "roots": ["Assets"], - "includes": [], - "excludes": [], - "options": { - "types": true, - "properties": true, - "extended": false, - "dependencies": false - }, - "baseScore": 999 -} \ No newline at end of file diff --git a/ColorlessWorld-2024-4-2/UserSettings/Search.settings b/ColorlessWorld-2024-4-2/UserSettings/Search.settings index 8d4fbd54..9e26dfee 100644 --- a/ColorlessWorld-2024-4-2/UserSettings/Search.settings +++ b/ColorlessWorld-2024-4-2/UserSettings/Search.settings @@ -1,75 +1 @@ -trackSelection = true -refreshSearchWindowsInPlayMode = false -fetchPreview = true -defaultFlags = 0 -keepOpen = false -queryFolder = "Assets" -onBoardingDoNotAskAgain = true -showPackageIndexes = false -showStatusBar = false -scopes = { -} -providers = { - packages = { - active = true - priority = 90 - defaultAction = null - } - profilermarkers = { - active = false - priority = 100 - defaultAction = null - } - store = { - active = true - priority = 100 - defaultAction = null - } - log = { - active = false - priority = 210 - defaultAction = null - } - scene = { - active = true - priority = 50 - defaultAction = null - } - find = { - active = true - priority = 25 - defaultAction = null - } - performance = { - active = false - priority = 100 - defaultAction = null - } - adb = { - active = false - priority = 2500 - defaultAction = null - } - asset = { - active = true - priority = 25 - defaultAction = null - } -} -objectSelectors = { -} -recentSearches = [ -] -searchItemFavorites = [ -] -savedSearchesSortOrder = 0 -showSavedSearchPanel = false -hideTabs = false -expandedQueries = [ -] -queryBuilder = false -ignoredProperties = "id;name;classname;imagecontentshash" -helperWidgetCurrentArea = "all" -disabledIndexers = "" -minIndexVariations = 2 -findProviderIndexHelper = true \ No newline at end of file +{} \ No newline at end of file