diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab index 536d4f0c4a..54250aa99d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab @@ -6225,7 +6225,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 155.3, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2932693287766199764 @@ -6586,8 +6586,8 @@ RectTransform: 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: -149.8, y: 643.4} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -77.32507, y: 649.49} + m_SizeDelta: {x: 929.94, y: 83.19} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2456284832218853865 CanvasRenderer: @@ -6618,7 +6618,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/ManagedResources/Prefabs/UI/Shop/ShopBuyPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Shop/ShopBuyPopup.prefab index c2fca04a13..fbb705c3b7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Shop/ShopBuyPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Shop/ShopBuyPopup.prefab @@ -3156,8 +3156,8 @@ RectTransform: 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: -120, y: 305} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -60.8, y: 308.02} + m_SizeDelta: {x: 901.1, y: 77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2077671653931858611 CanvasRenderer: @@ -3188,7 +3188,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index a3a3eb689b..13cb74f421 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua @@ -13,25 +13,25 @@ local mirrors = { id = Language[10331], --人杰 bg = "LZH175", tip = string.format("%s", GetLanguageStrById(specialConfig[71].Value)), - name="海军宝藏" + name="灼烧宝藏" }, [2] = { id = Language[10332], --佛禅 bg = "LZH62", tip = string.format("%s", GetLanguageStrById(specialConfig[74].Value)), - name="海贼宝藏" + name="爆伤宝藏" }, [3] = { id = Language[10333], --妖灵 bg = "LZH377", tip = string.format("%s", GetLanguageStrById(specialConfig[73].Value)), - name="四皇宝藏" + name="永动宝藏" }, [4] = { id = Language[10334], --道玄 bg = "LZS338", tip = string.format("%s", GetLanguageStrById(specialConfig[72].Value)), - name="强者宝藏" + name="控怒宝藏" } } local curType = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua index dcf93192f9..7c958a1c7c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua @@ -74,7 +74,7 @@ function RoleGetInfoPopup:InitComponent() this.talismanBtn=Util.GetGameObject(self.transform,"RoleInfo/Panel/Other/TalismanBtn") -- this.talismanFrame=Util.GetGameObject(self.transform,"RoleInfo/Panel/Other/TalismanBtn"):GetComponent("Image") this.talismanIcon=Util.GetGameObject(self.transform,"RoleInfo/Panel/Other/TalismanBtn/Icon"):GetComponent("Image") - Util.GetGameObject(self.transform,"RoleInfo/Panel/Other/TalismanBtn/Text"):GetComponent("Text").text="生命卡" + Util.GetGameObject(self.transform,"RoleInfo/Panel/Other/TalismanBtn/Text"):GetComponent("Text").text="意念" this.talentBtn=Util.GetGameObject(self.transform,"RoleInfo/Panel/Other/talentBtn") this.talentProgress=Util.GetGameObject(self.transform,"RoleInfo/Panel/Other/talentBtn/progress"):GetComponent("Text")