From ce443f18e1776d58840fe534cc0533870fed7082 Mon Sep 17 00:00:00 2001 From: yjm484 <171359351@qq.com> Date: Tue, 2 Jul 2024 00:22:13 +0800 Subject: [PATCH] 0702BUGFIX --- .../Assets/Scenes/SampleScene.unity | 48 +++- .../Assets/Scripts/Card/CardDrag.cs | 233 +++--------------- .../Assets/Scripts/Card/CardEntity.cs | 3 +- .../Assets/Scripts/Card/TurnMaster.cs | 9 +- .../Assets/Scripts/GameManager.cs | 1 - .../Scripts/Handler/EffectRangeHandler7_2.cs | 19 +- .../Scripts/Handler/EffectRangeHandler8_2.cs | 41 +-- .../Scripts/Handler/EffectRangeHandlerBase.cs | 6 - .../Assets/Scripts/Player.cs | 3 +- .../Tool/CardData_SO/PlayerState_SO.cs | 5 + .../Assets/Scripts/Tool/EffectRange.cs | 3 + .../Assets/Scripts/Tool/getNodeTools.cs | 114 ++++++++- .../Scripts/manager/DestructionManager.cs | 10 +- .../Assets/Scripts/manager/MapUnityManager.cs | 35 ++- .../Scripts/manager/SettlementManager.cs | 1 + .../Assets/data/card_data.csv | 9 +- .../UserSettings/Layouts/default-2022.dwlt | 184 +++++++------- 17 files changed, 359 insertions(+), 365 deletions(-) diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index bfb9cdb4..4f1b5e30 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -3249,6 +3249,7 @@ Transform: - {fileID: 1227255859} - {fileID: 14034787} - {fileID: 409697653} + - {fileID: 701699771} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &365854624 @@ -6861,6 +6862,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 681786807} m_CullTransparentMesh: 1 +--- !u!1 &701699770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 701699771} + - component: {fileID: 701699772} + m_Layer: 0 + m_Name: MapUnityManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &701699771 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 701699770} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 348176937} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &701699772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 701699770} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d344126aa8082fa48b7e5f19eff09202, type: 3} + m_Name: + m_EditorClassIdentifier: + castPool: [] --- !u!1 &723621925 GameObject: m_ObjectHideFlags: 0 @@ -10003,7 +10049,7 @@ MonoBehaviour: cardPrefab: {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3} cardList: 00000000 - cardDeck: 1127000012270000132700001427000015270000162700001727000018270000192700001a2700001b2700001c2700001d2700001e270000 + cardDeck: 1127000012270000132700001427000015270000162700001727000018270000192700001a2700001b2700001c2700001d2700001e2700001f270000 --- !u!4 &1190351098 Transform: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs index b9517d7f..2481732b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs @@ -8,6 +8,7 @@ using static EnemyNode; using static UnityEngine.Rendering.DebugUI; using System; using Unity.VisualScripting; +using System.Data; public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler { @@ -52,7 +53,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag { Debug.Log("当前费用：" + TurnMaster.Instance.currentCost); Debug.Log("总费用：" + Usermanager.Instance.totalCost); - if (TurnMaster.Instance.currentCost - cardEntity.cardOriginalData.Cost < 0) + if (GameManager.Instance.playerState.currentCost - cardEntity.cardOriginalData.Cost < 0) { Debug.Log("费用不足"); cardEntity.costEnough = false; @@ -102,11 +103,11 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag private void resetComponentPosition() { //遍历范围预览池消除影响色 - 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(); //遍历影响池变色 for (int i = 0; i < cardEntity.influencePreviewPool.Count; i++) { @@ -190,7 +191,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 +198,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 +212,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 +242,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 { @@ -266,84 +271,6 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag } } - /* 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 +286,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 +294,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 +311,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag } else { - //没有范围不需要射线吧，因为不需要指定目标点？ - // noAinPanleWork(eventData); + noAinPanleWork(eventData); } dyeing(); @@ -404,113 +331,6 @@ 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); - - 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; - }*/ } private IEnumerator OnDragIEnumerator(PointerEventData eventData) @@ -551,10 +371,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 +398,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 a5395985..afc88734 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs @@ -37,8 +37,8 @@ public class TurnMaster : Singleton } public void Start() { - totalCost = Usermanager.Instance.totalCost; - currentCost = totalCost; + /*totalCost = Usermanager.Instance.totalCost; + currentCost = totalCost;*/ } private void Update() @@ -105,8 +105,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/GameManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs index 6627d566..c3edb0e7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs @@ -77,7 +77,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/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/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/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 cf553dad..6f625a6d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs @@ -46,6 +46,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); 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/Layouts/default-2022.dwlt b/ColorlessWorld-2024-4-2/UserSettings/Layouts/default-2022.dwlt index 4c7bcf44..d0ebd47d 100644 --- a/ColorlessWorld-2024-4-2/UserSettings/Layouts/default-2022.dwlt +++ b/ColorlessWorld-2024-4-2/UserSettings/Layouts/default-2022.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 69.6 - y: 50.4 - width: 1459.2001 - height: 806.4 + x: 0 + y: 43 + width: 2560 + height: 1349 m_ShowMode: 4 - m_Title: "\u9879\u76EE" + m_Title: "\u6E38\u620F" m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 321} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1459.2 - height: 806.4 + width: 2560 + height: 1349 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1459.2 + width: 2560 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 786.4 - width: 1459.2 + y: 1329 + width: 2560 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1459.2 - height: 756.4 + width: 2560 + height: 1299 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 13675 + controlID: 129 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1108 - height: 756.4 + width: 1944 + height: 1299 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 13606 + controlID: 58 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1108 - height: 476.8 + width: 1944 + height: 820 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 13607 + controlID: 59 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,8 +187,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 344 - height: 476.8 + width: 604 + height: 820 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} @@ -211,10 +211,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 344 + x: 604 y: 0 - width: 764 - height: 476.8 + width: 1340 + height: 820 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 12} @@ -239,9 +239,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 476.8 - width: 1108 - height: 279.60004 + y: 820 + width: 1944 + height: 479 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -265,10 +265,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1108 + x: 1944 y: 0 - width: 351.19995 - height: 756.4 + width: 616 + height: 1299 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} @@ -292,15 +292,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: "\u6E38\u620F" - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 413.6 - y: 80.8 - width: 762 - height: 455.8 + x: 604 + y: 73 + width: 1338 + height: 799 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -332,10 +332,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -768 - m_HBaseRangeMax: 768 - m_VBaseRangeMin: -432 - m_VBaseRangeMax: 432 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -353,23 +353,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 762 - height: 434.8 - m_Scale: {x: 0.49609375, y: 0.49609375} - m_Translation: {x: 381, y: 217.4} + width: 1338 + height: 778 + m_Scale: {x: 0.696875, y: 0.696875} + m_Translation: {x: 669, y: 389} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -768 - y: -438.2236 - width: 1536 - height: 876.4472 + x: -960.00006 + y: -558.2063 + width: 1920.0001 + height: 1116.4126 m_MinimalGUI: 1 - m_defaultScale: 0.49609375 - m_LastWindowPixelSize: {x: 952.5, y: 569.75} + m_defaultScale: 0.696875 + m_LastWindowPixelSize: {x: 1338, y: 799} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -391,15 +391,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: "\u5C42\u7EA7" - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 69.6 - y: 80.8 - width: 343 - height: 455.8 + x: 0 + y: 73 + width: 603 + height: 799 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -412,10 +412,10 @@ MonoBehaviour: m_OverlaysVisible: 1 m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 445.2} - m_SelectedIDs: f4710000 - m_LastClickedID: 29172 - m_ExpandedIDs: a4a5ffff2afbffff9e6c00002a6d00005c6e0000c66e00001a7000006471000092710000d4710000f4710000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: b20b0000 + m_LastClickedID: 0 + m_ExpandedIDs: 2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -455,7 +455,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: "\u573A\u666F" - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -878,15 +878,15 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: "\u9879\u76EE" - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 69.6 - y: 557.60004 - width: 1107 - height: 258.60004 + x: 0 + y: 893 + width: 1943 + height: 458 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -908,24 +908,24 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/UI + - Assets/Scripts/manager m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 m_FilterByTypeIntersection: 0 m_ViewMode: 1 - m_StartGridSize: 64 + m_StartGridSize: 16 m_LastFolders: - - Assets/Scripts/UI - m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2 + - Assets/Scripts/manager + m_LastFoldersGridSize: 16 + m_LastProjectPath: F:\workspace\3\test_45\ColorlessWorld-2024-4-2 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 97.39996} - m_SelectedIDs: d2750000 - m_LastClickedID: 30162 - m_ExpandedIDs: 00000000fe7300000074000000ca9a3bffffff7f + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 20760000 + m_LastClickedID: 30240 + m_ExpandedIDs: 00000000527400005474000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -953,7 +953,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000fe7300000074000000ca9a3bffffff7f + m_ExpandedIDs: 000000005274000054740000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -980,22 +980,22 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000f06f00003a7b000058cc00005ecc00006ed400004e6e0000e07200000a7000000e7000000281000056cf00000000000094760000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: GameManager + m_OriginalName: GameManager m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 4274 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: @@ -1006,7 +1006,7 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 + m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 --- !u!114 &16 @@ -1025,15 +1025,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: "\u63A7\u5236\u53F0" - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 69.6 - y: 557.60004 - width: 1107 - height: 258.60004 + x: 0 + y: 893 + width: 1943 + height: 458 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1060,15 +1060,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: "\u68C0\u67E5\u5668" - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1177.6 - y: 80.8 - width: 350.19995 - height: 735.4 + x: 1944 + y: 73 + width: 615 + height: 1278 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1086,7 +1086,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 151.19995 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: