From 6b5a19ea62656a8b3337b21d7db64285d85d9754 Mon Sep 17 00:00:00 2001 From: kawagiri Date: Tue, 26 Aug 2025 21:22:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tools/Multilingual.xlsx | Bin 127705 -> 127705 bytes .../DataAssets/ActionDataAssets.asset | 20 ++--- Unity/Assets/Scenes/SampleScene.unity | 2 +- .../Scripts/TH1_Core/Managers/UIManager.cs | 2 +- .../TH1_Logic/Action/PlayerActionLogic.cs | 70 +----------------- Unity/Assets/Scripts/TH1_UI/DebugUI.cs | 15 ++-- .../TH1_UI/View/Info/UIInfoDiplomacyView.cs | 30 +++++--- 7 files changed, 40 insertions(+), 99 deletions(-) diff --git a/Tools/Multilingual.xlsx b/Tools/Multilingual.xlsx index d91d4bae9d28f27330e5a88a5f5278ea438ac1b5..c04b408912a77144d4616864af358afc045712d8 100644 GIT binary patch delta 428 zcmccll>O#YcAfxlW)=|!1_llWjujJm4svj;kcwWKc~WoURr&gZS%(dH+Txe~n0LZ2 zLgLujrK!t#*|c-sq~&bo?G;YWR;m4M896&IXS?j$|CiM{wI45i$!yntFL?pmzljl&CZ;3>f0E(B2nVg!Z|y)Ol;V`{P^_BpKD$!y*#I| zdaCIqmMd4qS{L@+xyOeX%Il1d^X6>0a`|Z2NtE~F(jOyl#UiF(Y zsaSK>_mf{2|5q#7oBQpoeNVXK+6UM7U!9K}2vX5AW9BFeurV-f{={g?#>BCrS(9VC zCI@5DLm+$m+?R~iOhCqTsW*(zK?2Ng8KW6N0txRJAA>2>>Z&x$yu1 delta 428 zcmccll>O#YcAfxlW)=|!1_lm>uEi614svuYmWuX}VmdkTs(ig~_F)5_w*OuqZ37=| z3i5e%`k0?CPuPtcXK!Rli`6G&tNi_5yvgkDjXdk9_lwwID0wgfEZ zma$M->r-H#c+ic=@BcUZLe*utTlEs_nQk6fUq5+1av(@W&y1O)EWpOVu=x|CDH~JQ;$}^b?V22n zMGt}O?Q>r;Rx<$^)1}@pJ_iXfzh#VO1PLU(V|)w}aDC6{0~VP4fzbvYp3|>?U^E9Q q6Zptz526D actionParam.PlayerData.PlayerWealth) - return false; - return true; - - } - - //确认unit是否有CP - protected bool UnitActionCheckUnitHasCP(CommonActionParams actionParam) - { - if (actionParam.UnitData == null || actionParam.UnitData.CP <= 0) - return false; - return true; - } - - //确认unit是否拥有这个skill - protected bool UnitActionCheckUnitHasSkill(CommonActionParams actionParam) - { - //将unitActionType转化为skillType - if (!Enum.TryParse(_actionId.UnitActionType.ToString(), out SkillType skillType)) return false; - if (actionParam.UnitData == null || !actionParam.UnitData.GetSkill(skillType, out var _)) return false; - return true; - } + } diff --git a/Unity/Assets/Scripts/TH1_UI/DebugUI.cs b/Unity/Assets/Scripts/TH1_UI/DebugUI.cs index b3b3b942b..e4aea8499 100644 --- a/Unity/Assets/Scripts/TH1_UI/DebugUI.cs +++ b/Unity/Assets/Scripts/TH1_UI/DebugUI.cs @@ -10,8 +10,6 @@ using UI; public class DebugUI { - private Main _main; - private MapData _mapData; public GameObject RODebugUI; private GameObject buttonGroup; @@ -22,11 +20,8 @@ public class DebugUI public bool NeedShow = false; private uint _turn = 999; - public DebugUI(Main main, MapData mapData) + public DebugUI() { - _main = main; - _mapData = mapData; - Transform root = UIManager.Instance.ROUIManager.transform; Transform panelRoot = root.Find("DebugPanel"); @@ -123,9 +118,9 @@ public class DebugUI if(UIManager.Instance.BottomInfoUI != null && RODebugUI.transform.Find("PanelGroup/Selected").gameObject.activeSelf) UIManager.Instance.BottomInfoUI.UpdateDebugInfo(); //return; - if (_mapData.PlayerMap.SelfPlayerData.Turn != _turn) + if (Main.MapData.PlayerMap.SelfPlayerData.Turn != _turn) { - _turn = _mapData.PlayerMap.SelfPlayerData.Turn; + _turn = Main.MapData.PlayerMap.SelfPlayerData.Turn; UpdateAllPlayerInfo(); } @@ -137,7 +132,7 @@ public class DebugUI var c = RODebugUI.transform.Find("PanelGroup/AllUnit/Scroll View/Viewport/Content"); foreach (Transform child in c) GameObject.Destroy(child.gameObject); - foreach (var unit in _mapData.UnitMap.UnitList) + foreach (var unit in Main.MapData.UnitMap.UnitList) { GameObject textObj = new GameObject("TMP_Child"); @@ -165,7 +160,7 @@ public class DebugUI foreach (Transform child in c) GameObject.Destroy(child.gameObject); - foreach (var player in _mapData.PlayerMap.PlayerDataList) + foreach (var player in Main.MapData.PlayerMap.PlayerDataList) { GameObject textObj = new GameObject("TMP_Child"); diff --git a/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs b/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs index 2d1464adb..fa502e960 100644 --- a/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs +++ b/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs @@ -125,30 +125,38 @@ namespace TH1_UI.View.Info var img = tr.GetComponent(); var star = tr.Find("Coin"); var cost = tr.Find("Cost")?.GetComponent(); - if(img != null && star != null && cost != null) + if(img != null) switch (stt) { case ActionShowState.Unavailable: tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.ActionBGUnavailable; - star.gameObject.SetActive(false); - cost.gameObject.SetActive(false); + if(star != null)star.gameObject.SetActive(false); + if(cost != null)cost.gameObject.SetActive(false); break; case ActionShowState.Available: tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.ActionBGAvailable; - star.gameObject.SetActive(true); - cost.gameObject.SetActive(true); - cost.color = Color.white; + if (star != null)star.gameObject.SetActive(true); + if (cost != null) + { + cost.gameObject.SetActive(true); + cost.color = Color.white; + } + break; case ActionShowState.Expensive: tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.ActionBGExpensive; - star.gameObject.SetActive(true); - cost.gameObject.SetActive(true); - cost.color = Color.red; + if (star != null)star.gameObject.SetActive(true); + if (cost != null) + { + cost.gameObject.SetActive(true); + cost.color = Color.red; + } + break; case ActionShowState.Finished: tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.TechCompleteBackground; - star.gameObject.SetActive(false); - cost.gameObject.SetActive(false); + if (star != null)star.gameObject.SetActive(false); + if (cost != null)cost.gameObject.SetActive(false); break; } //绑定点击事件