diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab index df85486513..5313fb0514 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab @@ -248,7 +248,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 28.46, y: -15.96} - m_SizeDelta: {x: 700, y: 29.51} + m_SizeDelta: {x: 700, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &981572259 CanvasRenderer: @@ -278,8 +278,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 56fac6a71666a884ab673e0440500d73, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 5bdca19fb28f9f1468c35182708ba170, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2732,7 +2732,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 28.46, y: -15.96} - m_SizeDelta: {x: 700, y: 29.51} + m_SizeDelta: {x: 700, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3793732066942345727 CanvasRenderer: @@ -2762,8 +2762,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 56fac6a71666a884ab673e0440500d73, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 5bdca19fb28f9f1468c35182708ba170, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6456,7 +6456,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 28.46, y: -15.96} - m_SizeDelta: {x: 700, y: 29.51} + m_SizeDelta: {x: 700, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2382190453578309415 CanvasRenderer: @@ -6486,8 +6486,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 56fac6a71666a884ab673e0440500d73, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 5bdca19fb28f9f1468c35182708ba170, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6532,7 +6532,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 28.46, y: -15.96} - m_SizeDelta: {x: 700, y: 29.51} + m_SizeDelta: {x: 700, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2146080904045285557 CanvasRenderer: @@ -6562,8 +6562,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 56fac6a71666a884ab673e0440500d73, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 5bdca19fb28f9f1468c35182708ba170, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab index d06fb07b2f..eaa62b7494 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab @@ -20519,7 +20519,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6037736, g: 0.3684011, b: 0.08259169, a: 1} + m_Color: {r: 0.35686275, g: 0.15294118, b: 0.050980393, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -20599,7 +20599,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6039216, g: 0.36862746, b: 0.08627451, a: 1} + m_Color: {r: 0.35686275, g: 0.15294118, b: 0.050980393, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua index 7acfc65a78..6dea90741f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua @@ -54,7 +54,7 @@ function this:OnShow(_parent,...) _Con_Recharge = tonumber(con[1]) _Con_Star = tonumber(con[2]) this.titleText.text=Language[11587] - this.text1.text=string.format("消耗%s点仙缘积分\n开启一次仙缘汇聚箱必得5星神将!",_CostItem) + this.text1.text=string.format("消耗%s点仙缘积分\n开启一次仙缘汇聚箱必得5星神将!",_CostItem) this.text2.text=""--Language[11589] --后续改成读表 this.text3.text= string.format("充值%s或山河社稷图累计星数到达%s开启", string.format(MoneyUtil.GetMoneyUnitName(), _Con_Recharge), _Con_Star) --Language[11590]..string.format(MoneyUtil.GetMoneyUnitName(),_Con_Recharge)..Language[11591]