外交更新

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}

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"

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}

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

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:

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<Image>();
-						if(img != null)
+						var star = tr.Find("Coin");
+						var cost = tr.Find("Cost")?.GetComponent<TextMeshProUGUI>();
+						if(img != null && star != null && cost != null)
 							switch (stt)
 							{
 								case ActionShowState.Unavailable:
-									tr.GetComponent<Image>().sprite = ResourceCache.Instance.SpriteCache.ActionBGUnavailable; 
+									tr.GetComponent<Image>().sprite = ResourceCache.Instance.SpriteCache.ActionBGUnavailable;
+									star.gameObject.SetActive(false);
+									cost.gameObject.SetActive(false);
 									break;
 								case ActionShowState.Available:
-									tr.GetComponent<Image>().sprite = ResourceCache.Instance.SpriteCache.ActionBGAvailable; 
+									tr.GetComponent<Image>().sprite = ResourceCache.Instance.SpriteCache.ActionBGAvailable;
+									star.gameObject.SetActive(true);
+									cost.gameObject.SetActive(true);
+									cost.color = Color.white;
 									break;
 								case ActionShowState.Expensive:
-									tr.GetComponent<Image>().sprite = ResourceCache.Instance.SpriteCache.ActionBGExpensive; 
+									tr.GetComponent<Image>().sprite = ResourceCache.Instance.SpriteCache.ActionBGExpensive;
+									star.gameObject.SetActive(true);
+									cost.gameObject.SetActive(true);
+									cost.color = Color.red;
 									break;
 								case ActionShowState.Finished:
-									tr.GetComponent<Image>().sprite = ResourceCache.Instance.SpriteCache.TechCompleteBackground; 
+									tr.GetComponent<Image>().sprite = ResourceCache.Instance.SpriteCache.TechCompleteBackground;
+									star.gameObject.SetActive(false);
+									cost.gameObject.SetActive(false);
 									break;
 							}
 						//绑定点击事件