diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas index 8670a5a8..6c47d0b2 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas @@ -78,10 +78,22 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: [] + packedSpriteRenderDataKeys: + - 2b6f8d50ab114d448b03e8b7c279f230: 21300000 + - e0246e23c99b19945b74857ab2afc817: 21300000 + - 86ab5d2474d50d448a735fb340c904b4: 21300000 + - 771e7d7731b51d74f99f46460198d153: 21300000 m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: 2b6f8d50ab114d448b03e8b7c279f230, type: 3} + - {fileID: 21300000, guid: e0246e23c99b19945b74857ab2afc817, type: 3} + - {fileID: 21300000, guid: 86ab5d2474d50d448a735fb340c904b4, type: 3} + - {fileID: 21300000, guid: 771e7d7731b51d74f99f46460198d153, type: 3} + m_PackedSpriteNamesToIndex: + - 61d19805a4d9deb2bed3110b3b57c82 + - "\u53C2\u8003" + - zjm_tc_wmsp + - 7c55264c27b48fc5bd5eac56ef2c7e0 m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u65B0\u589E\u5185\u5BB9" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index b4d3c96e..6115c540 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -6126,7 +6126,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1749721053868374207 RectTransform: m_ObjectHideFlags: 0 @@ -6185,6 +6185,101 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1129384503306655097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3867149623288487914} + - component: {fileID: 660982271563128030} + - component: {fileID: 6454003487285229357} + - component: {fileID: 9060425053710550224} + m_Layer: 5 + m_Name: m_tmpValueNew + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3867149623288487914 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129384503306655097} + 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: 1814839733780877975} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -128.36664, y: -0.9686413} + m_SizeDelta: {x: 170.8668, y: 52.3371} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &660982271563128030 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129384503306655097} + m_CullTransparentMesh: 1 +--- !u!114 &6454003487285229357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129384503306655097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9a3b1b26302dc70428dabbfa552301af, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "1.\u738B\u6C0F\u6587\u660E" +--- !u!114 &9060425053710550224 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129384503306655097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 --- !u!1 &1161757631545458135 GameObject: m_ObjectHideFlags: 0 @@ -11371,6 +11466,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5414042312798935206} + - {fileID: 3867149623288487914} - {fileID: 688984147342290442} m_Father: {fileID: 8086681985000168470} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -37239,7 +37335,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1950349943801813264 RectTransform: m_ObjectHideFlags: 0 @@ -78294,7 +78390,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "1.\u738B\u6C0F\u6587\u660E" + m_Text: 1 --- !u!114 &9103571428655329021 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index dcc8de23..1043e224 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -21,6 +21,7 @@ namespace GameLogic private TextMeshProUGUI m_tmpSign; private Image m_imgValue; private Text m_tmpValue; + private Text m_tmpValueNew; private RectTransform m_rectCar; private TextMeshProUGUI m_tmpAllValue; private RectTransform m_rectNao; @@ -35,6 +36,7 @@ namespace GameLogic m_tmpSign = FindChildComponent("Mid/m_imgSign/m_tmpSign"); m_imgValue = FindChildComponent("Mid/m_imgValue"); m_tmpValue = FindChildComponent("Mid/m_imgValue/m_tmpValue"); + m_tmpValueNew = FindChildComponent("Mid/m_imgValue/m_tmpValueNew"); m_rectCar = FindChildComponent("Mid/m_imgValue/m_rectCar"); m_tmpAllValue = FindChildComponent("Mid/m_imgValue/m_rectCar/m_tmpAllValue"); m_rectNao = FindChildComponent("Mid/m_imgValue/m_rectCar/m_tmpAllValue/m_rectNao"); @@ -88,6 +90,7 @@ namespace GameLogic { m_Index = i; m_tmpValue.text = ((int)(i + 1)).ToString(); + m_tmpValueNew.text = ((int)(i + 1)).ToString() + DataGameSceneManager.Instance.GetStrs(m_Index) + "氏文明"; int assetsId = (i + 1) % 10 == 0 ? 1 : (i + 1) % 10; m_AssetID = assetsId; @@ -654,6 +657,10 @@ namespace GameLogic // 平滑过渡 m_CurrentFillAmount = Mathf.Lerp(m_CurrentFillAmount, targetFill, Time.deltaTime * 8f); m_imgValue.fillAmount = m_CurrentFillAmount; + + m_tmpValue.gameObject.SetActive(m_imgValue.fillAmount < 0.3f); + m_imgValue.gameObject.SetActive(m_imgValue.fillAmount > 0.3f); + AlignCarWithFillAmount(); }