From 3d7eb49b94d4a868a1b7593f4f2e33c85a14c9e6 Mon Sep 17 00:00:00 2001 From: kawagiri Date: Tue, 26 Aug 2025 20:36:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E4=BA=A4=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tools/Multilingual.xlsx | Bin 127706 -> 127705 bytes .../DataAssets/ActionDataAssets.asset | 6 ++-- .../Resources/DataAssets/TechDataAssets.asset | 32 +----------------- .../Resources/Export/ActionDataAssets.asset | 6 ++-- .../Resources/Export/TechDataAssets.asset | 32 +----------------- .../Prefab/UI/Info/UIInfoDiplomacy.prefab | 2 +- .../TH1_UI/View/Info/UIInfoDiplomacyView.cs | 22 +++++++++--- 7 files changed, 26 insertions(+), 74 deletions(-) diff --git a/Tools/Multilingual.xlsx b/Tools/Multilingual.xlsx index 7fbf7c0634713503f96082f534222825bfc86817..d91d4bae9d28f27330e5a88a5f5278ea438ac1b5 100644 GIT binary patch delta 552 zcmcchl>O#YcAfxlW)=|!1_lm>uEi614sv!amWuX}VmkS1;x+mD?862;ZU4PK+6F$_ z6y)>j^f5nOp0FD?&fdt97OPLlR{8tAc$3-P8+q1I?-#oZ<&_BBaM%%Ye81V312wZdZntx@bTM4x&D;w7no8P?#>bys=dMEltz#NSGR%mP1npXYk1^0 z&Sr6AF3Y$W*tBcS!(&2j^|Sxw%$PJ&CdfLt_Wtz0MUOtYneKVF?fm6WuCIkOmrp!- zEMuXv)~CQe@z&25Oh2r>5tCLgdO_zCi{tYK=`!EAY2W#OyQ@_meczQ8`{C-oXHDx_ z*WY)$-v4j*g{sSPx9TOS>0NWkqqqYqeM$_GXpM1W4e`GL_4 zq)zZ7qYUGn>3Sa-mE=LeJz-BwD4KoHvH!$)||L~Df3S<(` qC!p=$r)z#OFIcAfxlW)=|!1_lm>p4k(54s!O)mWs}B&zbmo;x+kt|HB46ZU0YAseWzN zoY}Q0#$k?wQ<6|e^puL|tT4hob!V_W~?~4=SA%6 z%?5>s`CI}SQi>gx7h4L{ag-}s`W`lZtC&@MrJ5x!RJ*|AR@Nm0u5JtIn~|Ak*YwD* zoXc{JVcUxf!EL+NJUk_&RzLlJ&WuSj-xM1M$6lX$x9Cw@Z&pQhRn5$4`cm^ftDAj1 zvs*k@XsVdTiTKxQKa38XmtHS=L9dOo$xqPy&7?hg@850b_xad$U+n6x2di^qx%Y|v zc~)EU_r-p$*bQgb{cQiJ6d+XhclIw9pswBcpm0DD*F}esl|BVqkFRVqo9}#taNJFiv{O$WW1^ zUtCg|lUl4-k((3X&B!Fe0E<4U={n1fvn^H1hnqQ rbd67pav-h;kjotUj&XY7J4R_fR0F3^0I9W_zV;KN8e7{3MxaRmwba+y diff --git a/Unity/Assets/Resources/DataAssets/ActionDataAssets.asset b/Unity/Assets/Resources/DataAssets/ActionDataAssets.asset index 5e0f96504..0c3e6b3f5 100644 --- a/Unity/Assets/Resources/DataAssets/ActionDataAssets.asset +++ b/Unity/Assets/Resources/DataAssets/ActionDataAssets.asset @@ -4370,7 +4370,7 @@ MonoBehaviour: IconList: [] Cost: 0 CityExp: 0 - NoNeedTech: 0 + NoNeedTech: 1 SpriteSize: {x: 0, y: 0} SpritePos: {x: 0, y: 0} - ActionId: @@ -4400,7 +4400,7 @@ MonoBehaviour: IconList: [] Cost: 0 CityExp: 0 - NoNeedTech: 0 + NoNeedTech: 1 SpriteSize: {x: 0, y: 0} SpritePos: {x: 0, y: 0} - ActionId: @@ -4430,6 +4430,6 @@ MonoBehaviour: IconList: [] Cost: 0 CityExp: 0 - NoNeedTech: 0 + NoNeedTech: 1 SpriteSize: {x: 0, y: 0} SpritePos: {x: 0, y: 0} diff --git a/Unity/Assets/Resources/DataAssets/TechDataAssets.asset b/Unity/Assets/Resources/DataAssets/TechDataAssets.asset index 497f24160..bc9b6ea25 100644 --- a/Unity/Assets/Resources/DataAssets/TechDataAssets.asset +++ b/Unity/Assets/Resources/DataAssets/TechDataAssets.asset @@ -202,36 +202,6 @@ MonoBehaviour: SkillType: 0 TechType: 0 PlayerActionType: 0 - - ActionType: 12 - WonderType: 0 - ResourceType: 0 - FeatureType: 0 - TerrainType: 0 - UnitType: 0 - GiantType: 0 - UnitLevel: 0 - Vegetation: 0 - UnitActionType: 0 - CityLevelUpActionType: 0 - GridMiscActionType: 0 - SkillType: 0 - TechType: 0 - PlayerActionType: 2 - - ActionType: 12 - WonderType: 0 - ResourceType: 0 - FeatureType: 0 - TerrainType: 0 - UnitType: 0 - GiantType: 0 - UnitLevel: 0 - Vegetation: 0 - UnitActionType: 0 - CityLevelUpActionType: 0 - GridMiscActionType: 0 - SkillType: 0 - TechType: 0 - PlayerActionType: 3 - TechType: 1 TechName: "\u722C\u5C71" Description: "\u53EF\u4EE5\u5728\u5C71\u5730\u79FB\u52A8\uFF0C\u5E76\u83B7\u5F97\u5C71\u5730\u9632\u5FA1" @@ -561,7 +531,7 @@ MonoBehaviour: GridMiscActionType: 0 SkillType: 0 TechType: 0 - PlayerActionType: 4 + PlayerActionType: 5 - TechType: 10 TechName: "\u8C37\u4ED3" Description: "\u53EF\u4EE5\u5EFA\u9020\u8C37\u4ED3\uFF0C\u53EF\u4EE5\u711A\u6797\u9020\u7530" diff --git a/Unity/Assets/Resources/Export/ActionDataAssets.asset b/Unity/Assets/Resources/Export/ActionDataAssets.asset index 53b26f16b..b86994f6c 100644 --- a/Unity/Assets/Resources/Export/ActionDataAssets.asset +++ b/Unity/Assets/Resources/Export/ActionDataAssets.asset @@ -4370,7 +4370,7 @@ MonoBehaviour: IconList: [] Cost: 0 CityExp: 0 - NoNeedTech: 0 + NoNeedTech: 1 SpriteSize: {x: 0, y: 0} SpritePos: {x: 0, y: 0} - ActionId: @@ -4400,7 +4400,7 @@ MonoBehaviour: IconList: [] Cost: 0 CityExp: 0 - NoNeedTech: 0 + NoNeedTech: 1 SpriteSize: {x: 0, y: 0} SpritePos: {x: 0, y: 0} - ActionId: @@ -4430,6 +4430,6 @@ MonoBehaviour: IconList: [] Cost: 0 CityExp: 0 - NoNeedTech: 0 + NoNeedTech: 1 SpriteSize: {x: 0, y: 0} SpritePos: {x: 0, y: 0} diff --git a/Unity/Assets/Resources/Export/TechDataAssets.asset b/Unity/Assets/Resources/Export/TechDataAssets.asset index 60914fd88..8f759d5b7 100644 --- a/Unity/Assets/Resources/Export/TechDataAssets.asset +++ b/Unity/Assets/Resources/Export/TechDataAssets.asset @@ -202,36 +202,6 @@ MonoBehaviour: SkillType: 0 TechType: 0 PlayerActionType: 0 - - ActionType: 12 - WonderType: 0 - ResourceType: 0 - FeatureType: 0 - TerrainType: 0 - UnitType: 0 - GiantType: 0 - UnitLevel: 0 - Vegetation: 0 - UnitActionType: 0 - CityLevelUpActionType: 0 - GridMiscActionType: 0 - SkillType: 0 - TechType: 0 - PlayerActionType: 2 - - ActionType: 12 - WonderType: 0 - ResourceType: 0 - FeatureType: 0 - TerrainType: 0 - UnitType: 0 - GiantType: 0 - UnitLevel: 0 - Vegetation: 0 - UnitActionType: 0 - CityLevelUpActionType: 0 - GridMiscActionType: 0 - SkillType: 0 - TechType: 0 - PlayerActionType: 3 - TechType: 1 TechName: 447 Description: 484 @@ -561,7 +531,7 @@ MonoBehaviour: GridMiscActionType: 0 SkillType: 0 TechType: 0 - PlayerActionType: 4 + PlayerActionType: 5 - TechType: 10 TechName: 58 Description: 1144 diff --git a/Unity/Assets/Resources/Prefab/UI/Info/UIInfoDiplomacy.prefab b/Unity/Assets/Resources/Prefab/UI/Info/UIInfoDiplomacy.prefab index d5f26a67f..e1c8199af 100644 --- a/Unity/Assets/Resources/Prefab/UI/Info/UIInfoDiplomacy.prefab +++ b/Unity/Assets/Resources/Prefab/UI/Info/UIInfoDiplomacy.prefab @@ -886,7 +886,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 356.425, y: -79} - m_SizeDelta: {x: 532.85, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7522110403647485899 CanvasRenderer: diff --git a/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs b/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs index 266707de6..2d1464adb 100644 --- a/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs +++ b/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs @@ -123,20 +123,32 @@ namespace TH1_UI.View.Info //决定具体显示按钮为什么颜色 var stt = actLogic.CheckShowState(actionParams); var img = tr.GetComponent(); - if(img != null) + var star = tr.Find("Coin"); + var cost = tr.Find("Cost")?.GetComponent(); + if(img != null && star != null && cost != null) switch (stt) { case ActionShowState.Unavailable: - tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.ActionBGUnavailable; + tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.ActionBGUnavailable; + star.gameObject.SetActive(false); + cost.gameObject.SetActive(false); break; case ActionShowState.Available: - tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.ActionBGAvailable; + tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.ActionBGAvailable; + star.gameObject.SetActive(true); + cost.gameObject.SetActive(true); + cost.color = Color.white; break; case ActionShowState.Expensive: - tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.ActionBGExpensive; + tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.ActionBGExpensive; + star.gameObject.SetActive(true); + cost.gameObject.SetActive(true); + cost.color = Color.red; break; case ActionShowState.Finished: - tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.TechCompleteBackground; + tr.GetComponent().sprite = ResourceCache.Instance.SpriteCache.TechCompleteBackground; + star.gameObject.SetActive(false); + cost.gameObject.SetActive(false); break; } //绑定点击事件