diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 5eb9a0f3cc..992ca60a60 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -1690,10 +1690,10 @@ RectTransform: m_Father: {fileID: 1974730884724144738} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 75, y: -285} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &798130740508122842 CanvasRenderer: @@ -3805,10 +3805,10 @@ RectTransform: m_Father: {fileID: 1974730884724144738} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 75, y: -105} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1976417882928787122 CanvasRenderer: @@ -4085,7 +4085,7 @@ RectTransform: m_GameObject: {fileID: 1765209222427303518} 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_LocalScale: {x: 0.9, y: 0.9, z: 1} m_Children: - {fileID: 1245474673371832576} - {fileID: 800268742546211718} @@ -4102,7 +4102,7 @@ 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: -167.59999, y: -748.66406} + m_AnchoredPosition: {x: -141, y: -748.66406} m_SizeDelta: {x: 590.9, y: 382.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1976428042098195706 @@ -4148,7 +4148,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: 155.3, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1976861364944621614 @@ -5038,9 +5038,9 @@ RectTransform: m_Father: {fileID: 164915241442772717} m_RootOrder: 12 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: 450, y: 863} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -90, y: -97} m_SizeDelta: {x: 121, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6708122370429065882 @@ -5324,9 +5324,9 @@ RectTransform: m_Father: {fileID: 164915241442772717} m_RootOrder: 11 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: -449, y: 740.1} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -219.90002} m_SizeDelta: {x: 76, y: 317} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &874222423629139252 @@ -8141,7 +8141,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u4F20\u8BB0" + m_Text: "\u4F20\u8BF4" LanguageIndex: 10914 --- !u!1 &7622874607638461510 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab index ab6ade2625..0a658a291b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab @@ -1012,7 +1012,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -51.9, y: -37.3} + m_AnchoredPosition: {x: -51.899994, y: -37.299988} m_SizeDelta: {x: 154, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222017515014200724 @@ -1204,7 +1204,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224906100166258062 RectTransform: m_ObjectHideFlags: 0 @@ -1314,7 +1314,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 54.7, y: -9.799999} + m_AnchoredPosition: {x: 54.700012, y: -9.799999} m_SizeDelta: {x: 110, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222526055477903672 @@ -1389,7 +1389,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -82.1, y: 3.9} + m_AnchoredPosition: {x: -82.100006, y: 3.9} m_SizeDelta: {x: 132.71002, y: 132.71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222565429229178096 @@ -1654,7 +1654,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 56.9, y: -0.0003979206} + m_AnchoredPosition: {x: 56.899994, y: -0.0003979206} m_SizeDelta: {x: 110, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222838606412733606 @@ -1727,7 +1727,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 7952d7dae3..e14efed48c 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1097,7 +1097,7 @@ [11096] = "搜索进度:", [11097] = "情报", [11098] = "满星", - [11099] = "传记", + [11099] = "传说", [11100] = "内容未开放", [11101] = "该神将在主线阵容中已上阵", [11102] = "该神将在竞技场防守阵容中已上阵", diff --git a/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua b/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua index efdc795280..d4cbc41df4 100644 --- a/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua +++ b/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua @@ -166,7 +166,11 @@ end function this:SetPosition(type) if (type == 1) then - self.elementalResonanceBtn.transform.localPosition = Vector3.New(455, 783, 0) + -- self.elementalResonanceBtn.transform.localPosition = Vector3.New(455, 783, 0) + self.elementalResonanceBtn.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(1, 1) + self.elementalResonanceBtn.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(1, 1) + self.elementalResonanceBtn.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5) + self.elementalResonanceBtn.transform.localPosition = Vector3.New(400, 800, 0) elseif(type==2) then --self.elementalResonanceBtn.transform.localPosition = Vector3.New(-484, 876, 1) self.elementalResonanceBtn.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(58, 13)